From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Mar 2000 18:28:19 +0000 (+0000)
Subject: call wxMenubarSetInvokingWindow for submenus appended during run-time
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e72007907ac8507a63b7a8849c7c48e336f6545d

call wxMenubarSetInvokingWindow for submenus appended during run-time


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 12185fcd39..5c17e2c985 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -872,6 +872,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 #endif // GTK 1.2/1.0
 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
+
+        // if adding a submenu to a menu already existing in the menu bar, we
+        // must set invoking window to allow processing events from this
+        // submenu
+        if ( m_invokingWindow )
+            wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
     }
     else // a normal item
     {
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 12185fcd39..5c17e2c985 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -872,6 +872,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 #endif // GTK 1.2/1.0
 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
+
+        // if adding a submenu to a menu already existing in the menu bar, we
+        // must set invoking window to allow processing events from this
+        // submenu
+        if ( m_invokingWindow )
+            wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
     }
     else // a normal item
     {