From 90659535455086c0870d23a4eebba031453dadd2 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 31 Oct 2008 05:25:59 +0000 Subject: [PATCH] make sure update UI handlers are called for accelerators, #10130 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index bbbd626e99..299de20d54 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -695,6 +695,16 @@ static void menu_hide(GtkWidget*, wxMenu* menu) } } +// "can_activate_accel" from menu item +extern "C" { +static gboolean can_activate_accel(GtkWidget*, guint, wxMenu* menu) +{ + menu->UpdateUI(); + // always allow our "activate" handler to be called + return true; +} +} + IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler) void wxMenu::Init() @@ -832,6 +842,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos) } else { + g_signal_connect(menuItem, "can_activate_accel", + G_CALLBACK(can_activate_accel), this); g_signal_connect (menuItem, "activate", G_CALLBACK(menuitem_activate), mitem); -- 2.47.2