From: Vadim Zeitlin Date: Sat, 12 Jan 2013 03:09:06 +0000 (+0000) Subject: Relax Unity menu interdiction hack to allow popup menus in modal dialogs. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/68a335b43ba9358c29801a638313c826a2c96c90 Relax Unity menu interdiction hack to allow popup menus in modal dialogs. The changes of r73007 fixed the problem with menus remaining active while a modal dialog was shown (see #14823) but also disabled processing of the events from any popup menus shown by the dialog itself. Reallow the latter while still forbidding the former now by checking whether the window associated with the menu is the dialog itself. Closes #14961. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index b1c72ada50..01bdcfaaea 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -46,10 +46,31 @@ extern "C" static void wxGetGtkAccel(const wxMenuItem*, guint*, GdkModifierType*); #endif -static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) +// Unity hack: under Ubuntu Unity the global menu bar is not affected by a +// modal dialog being shown, so the user can select a menu item before hiding +// the dialog and, in particular, a new instance of the same dialog can be +// shown again, breaking a lot of programs not expecting this. +// +// So explicitly ignore any menu events generated while any modal dialogs +// are opened except for the events generated by a context menu within the +// modal dialog itself that should have a dialog as their invoking window. +static bool IsMenuEventAllowed(wxMenu* menu) { - // See the comment about Ubuntu Unity in menuitem_activate(). if ( wxOpenModalDialogsCount ) + { + wxWindow* tlw = wxGetTopLevelParent(menu->GetWindow()); + if ( !tlw || !wxDynamicCast(tlw, wxDialog) ) + { + return true; + } + } + + return true; +} + +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) +{ + if ( !IsMenuEventAllowed(menu) ) return; event.SetEventObject( menu ); @@ -484,14 +505,7 @@ static void menuitem_activate(GtkWidget*, wxMenuItem* item) if (!item->IsEnabled()) return; - // Unity hack: under Ubuntu Unity the global menu bar is not affected by a - // modal dialog being shown, so the user can select a menu item before - // hiding the dialog and, in particular, a new instance of the same dialog - // can be shown again, breaking a lot of programs not expecting this. - // - // So explicitly ignore any menu events generated while any modal dialogs - // are opened. - if ( wxOpenModalDialogsCount ) + if ( !IsMenuEventAllowed(item->GetMenu()) ) return; int id = item->GetId();