QLPopupMenu.[Ch]: renamed topLevelMenu to topLevelMenu_

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13377 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog
index 26329469eb251b8cbc0f5bfda1e8c548f8cbb233..229cac6d607d2d96ecee531ba94eac778d309004 100644 (file)
--- a/src/frontends/qt4/ChangeLog
+++ b/src/frontends/qt4/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-15  Abdelrazak Younes  <younes.a@free.fr>\r
+\r
+       * QLPopupMenu.[Ch]: renamed topLevelMenu to topLevelMenu_\r
+\r
+2006-03-15  Abdelrazak Younes  <younes.a@free.fr>\r
+\r
+       * QLMenubar.C: MACX menubar initialisation crash fix\r
+\r
 2006-03-14  Abdelrazak Younes  <younes.a@free.fr>\r
 \r
        * QWorkArea.[Ch]: Wheel one-liner mouse fix\r

diff --git a/src/frontends/qt4/QLPopupMenu.C b/src/frontends/qt4/QLPopupMenu.C
index 4f03b7ba75aef2f24e3ea1a8c7826f0ead462300..9c3409e937841d16a8fce559b0b90faab06936dd 100644 (file)
--- a/src/frontends/qt4/QLPopupMenu.C
+++ b/src/frontends/qt4/QLPopupMenu.C
@@ -52,7 +52,7 @@ namespace frontend {
 
 QLPopupMenu::QLPopupMenu(QLMenubar * owner, 
                                                 MenuItem const & mi, bool topLevelMenu)
-       : owner_(owner), topLevelMenu_(topLevelMenu)
+       : owner_(owner)
 {
        name_ = mi.submenuname();
 
@@ -70,18 +70,18 @@ void QLPopupMenu::update()
        lyxerr[Debug::GUI] << "\tTriggered menu: " << name_ << endl;
 
        clear();
-       topLevelMenu.clear();
+       topLevelMenu_.clear();
 
        if (name_.empty())
                return;
 
        Menu const & fromLyxMenu = owner_->backend().getMenu(name_);
-       owner_->backend().expand(fromLyxMenu, topLevelMenu, owner_->view());
+       owner_->backend().expand(fromLyxMenu, topLevelMenu_, owner_->view());
        
-       if (!owner_->backend().hasMenu(topLevelMenu.name())) {
-               lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << topLevelMenu.name() << endl;
+       if (!owner_->backend().hasMenu(topLevelMenu_.name())) {
+               lyxerr[Debug::GUI] << "\tWARNING: menu seems empty" << topLevelMenu_.name() << endl;
        }
-       populate(this, &topLevelMenu);
+       populate(this, &topLevelMenu_);
 
        specialMacXmenuHack();
 }

diff --git a/src/frontends/qt4/QLPopupMenu.h b/src/frontends/qt4/QLPopupMenu.h
index 1938509ba7eb3ba60ec314d467267610026f463f..cf8b2193448b1617634f95c20f763ca81a82d47e 100644 (file)
--- a/src/frontends/qt4/QLPopupMenu.h
+++ b/src/frontends/qt4/QLPopupMenu.h
@@ -56,14 +56,12 @@ private:
        /// \todo Mac specific binding handling.
        void addBinding(std::string & label, MenuItem const & mi);
 
-       bool topLevelMenu_;
-
-       /// Mac specific menu hack
-       /// \todo Fix it
-       void specialMacXmenuHack();
-
        /// Top Level Menu
-       Menu topLevelMenu;
+       Menu topLevelMenu_;
+\r
+       /// Mac specific menu hack\r
+       /// \todo Fix it\r
+       void specialMacXmenuHack();\r
 };
 
 } // namespace frontend