X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d854e1536ef0c520bfb8cd0e72d5d5e92026cf0..d9307d006e88025e28457290c9997f7c0f7c4fdc:/src/gtk/menu.cpp diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 999894eeb4..09fecd8a14 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -17,6 +17,7 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/dialog.h" #include "wx/frame.h" #include "wx/bitmap.h" #include "wx/app.h" @@ -46,10 +47,32 @@ 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) ) + { + // This must be an event from a menu bar of one of the frames. + return false; + } + } + + return true; +} + +static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) +{ + if ( !IsMenuEventAllowed(menu) ) return; event.SetEventObject( menu ); @@ -101,8 +124,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st } PostCreation(); - - GTKApplyWidgetStyle(); #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 g_object_ref_sink(m_widget); @@ -291,6 +312,7 @@ void wxMenuBar::GtkAppend(wxMenu* menu, const wxString& title, int pos) gtk_menu_item_set_submenu( GTK_MENU_ITEM(menu->m_owner), menu->m_menu ); } + g_object_ref(menu->m_owner); gtk_widget_show( menu->m_owner ); @@ -336,9 +358,14 @@ wxMenu *wxMenuBar::Remove(size_t pos) // warnings from Ubuntu libdbusmenu gtk_container_remove(GTK_CONTAINER(m_menubar), menu->m_owner); // remove submenu to avoid destroying it when item is destroyed +#ifdef __WXGTK3__ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu->m_owner), NULL); +#else + gtk_menu_item_remove_submenu(GTK_MENU_ITEM(menu->m_owner)); +#endif gtk_widget_destroy( menu->m_owner ); + g_object_unref(menu->m_owner); menu->m_owner = NULL; if ( m_menuBarFrame ) @@ -480,14 +507,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(); @@ -517,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(); } } @@ -591,9 +619,20 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, wxMenuItem::~wxMenuItem() { + if (m_menuItem) + g_object_unref(m_menuItem); // don't delete menu items, the menus take care of that } +void wxMenuItem::SetMenuItem(GtkWidget* menuItem) +{ + if (m_menuItem) + g_object_unref(m_menuItem); + m_menuItem = menuItem; + if (menuItem) + g_object_ref(menuItem); +} + void wxMenuItem::SetItemLabel( const wxString& str ) { #if wxUSE_ACCEL @@ -726,8 +765,6 @@ void wxMenu::Init() m_accel = gtk_accel_group_new(); m_menu = gtk_menu_new(); - // NB: keep reference to the menu so that it is not destroyed behind - // our back by GTK+ e.g. when it is removed from menubar: g_object_ref_sink(m_menu); m_owner = NULL; @@ -762,14 +799,15 @@ wxMenu::~wxMenu() g_signal_handlers_disconnect_matched(m_menu, GSignalMatchType(G_SIGNAL_MATCH_DATA), 0, 0, NULL, NULL, this); - // see wxMenu::Init - g_object_unref(m_menu); - - // if the menu is inserted in another menu at this time, there was - // one more reference to it: if (m_owner) - gtk_widget_destroy(m_owner); + { + gtk_widget_destroy(m_owner); + g_object_unref(m_owner); + } + else + gtk_widget_destroy(m_menu); + g_object_unref(m_menu); g_object_unref(m_accel); } @@ -930,20 +968,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) #ifdef __WXGTK3__ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); #else - if (!gtk_check_version(2,12,0)) - { - // gtk_menu_item_remove_submenu() is deprecated since 2.12, but - // gtk_menu_item_set_submenu() can now be used with NULL submenu now so - // just do use it. - gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL); - } - else // GTK+ < 2.12 - { - // In 2.10 calling gtk_menu_item_set_submenu() with NULL submenu - // results in critical GTK+ error messages so use the old function - // instead. - gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem)); - } + gtk_menu_item_remove_submenu(GTK_MENU_ITEM(mitem)); #endif gtk_widget_destroy(mitem);