You break it, you pay for it. Fix submenus again. Lars please check menus still work...

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 6872786a18972486137e8c2b63c98a8ac0779fcd..14bc906fc9030cadf94789ffa7d16623b8a9d346 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-13  John Levon  <levon@movementarian.org>
+
+       * Menubar_pimpl.C:
+       * QLPopupMenu.C: fix submenus again
+ 
 2002-09-12  John Levon  <levon@movementarian.org>
 
        * qscreen.h:

diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C
index 3a0c64348ff516bd39c653f1c78e744acd2651d3..1dbe51efa0f268f7d150d65073bcf59d0a21f81d 100644 (file)
--- a/src/frontends/qt2/Menubar_pimpl.C
+++ b/src/frontends/qt2/Menubar_pimpl.C
@@ -48,8 +48,6 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
                pair<int, QLPopupMenu *> menu =
                        createMenu(owner_->menuBar(), &(*m), this, true);
                name_map_[m->submenuname()] = menu.second;
-               QObject::connect(menu.second, SIGNAL(activated(int)),
-                       owner_, SLOT(activated(int)));
        }
 }
 

diff --git a/src/frontends/qt2/QLPopupMenu.C b/src/frontends/qt2/QLPopupMenu.C
index 795b85d64668b3a3d9f04900138f27ffdbaa6f66..751715b93c4fd16c8272779d4a5331316d1af989 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.C
+++ b/src/frontends/qt2/QLPopupMenu.C
@@ -56,6 +56,8 @@ QLPopupMenu::QLPopupMenu(Menubar::Pimpl * owner, string const & name, bool tople
 {
        if (toplevel)
                connect(this, SIGNAL(aboutToShow()), this, SLOT(showing()));
+       connect(this, SIGNAL(activated(int)),
+               owner_->view(), SLOT(activated(int)));
 }