From: John Levon <levon@movementarian.org>
Date: Fri, 13 Sep 2002 00:04:22 +0000 (+0000)
Subject: You break it, you pay for it. Fix submenus again. Lars please check menus still work... 
X-Git-Tag: 1.6.10~18279
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b77165653d7735bd484ceb5cc8d1397d17aa3a7f;p=lyx.git

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


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 6872786a18..14bc906fc9 100644
--- 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 3a0c64348f..1dbe51efa0 100644
--- 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 795b85d646..751715b93c 100644
--- 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)));
 }