Consistently set wxMenuBar parent in all ports.

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 74ff3fde6969c916e9b00b613559cd91df4103a9..09fecd8a14dff94d74241e3925363db4f4dec1c8 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -62,7 +62,8 @@ static bool IsMenuEventAllowed(wxMenu* menu)
         wxWindow* tlw = wxGetTopLevelParent(menu->GetWindow());
         if ( !tlw || !wxDynamicCast(tlw, wxDialog) )
         {
-            return true;
+            // This must be an event from a menu bar of one of the frames.
+            return false;
         }
     }
 
@@ -536,6 +537,14 @@ static void menuitem_activate(GtkWidget*, wxMenuItem* item)
 
     wxMenu* menu = item->GetMenu();
     menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
+
+    // A lot of existing code, including any program that closes its main
+    // window from a menu handler and expects the program to exit -- as our own
+    // minimal sample -- relies on getting an idle event after a menu event.
+    // But when using Ubuntu Unity detached menus, we get called from a DBUS
+    // handler called from g_timeout_dispatch() and Glib doesn't send us any
+    // idle events after it. So ask explicitly for an idle event to get one.
+    wxWakeUpIdle();
 }
 }