missing commit

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 74ff3fde6969c916e9b00b613559cd91df4103a9..686761a6bee70638d6d9f10b78095ab83770f1cd 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) )
         {
         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;

         }
     }
 
         }
     }
 


@@ -151,6 +152,18 @@ wxMenuBar::wxMenuBar()
 namespace
 {
 
 namespace
 {
 

+// This should be called when detaching menus to ensure that they don't keep
+// focus grab, because if they do, they continue getting all GTK+ messages
+// which they can't process any more in their (soon to be) unrealized state.
+void
+EnsureNoGrab(GtkWidget* widget)
+{
+#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+    gtk_widget_hide(widget);
+    gtk_grab_remove(widget);
+#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+}
+

 void
 DetachFromFrame(wxMenu* menu, wxFrame* frame)
 {
 void
 DetachFromFrame(wxMenu* menu, wxFrame* frame)
 {


@@ -172,6 +185,8 @@ DetachFromFrame(wxMenu* menu, wxFrame* frame)
             DetachFromFrame(menuitem->GetSubMenu(), frame);
         node = node->GetNext();
     }
             DetachFromFrame(menuitem->GetSubMenu(), frame);
         node = node->GetNext();
     }

+
+    EnsureNoGrab(menu->m_menu);

 }
 
 void
 }
 
 void


@@ -259,6 +274,8 @@ void wxMenuBar::Detach()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

+    EnsureNoGrab(m_widget);
+

     wxMenuBarBase::Detach();
 }
 
     wxMenuBarBase::Detach();
 }
 


@@ -536,6 +553,14 @@ static void menuitem_activate(GtkWidget*, wxMenuItem* item)
 
     wxMenu* menu = item->GetMenu();
     menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);
 
     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();

 }
 }
 
 }
 }