From 341d8cb2cfd80d288f596b65a41d7578cd13ead3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Apr 2010 15:07:51 +0000 Subject: [PATCH] Avoid code duplication in wxGTK menu events generation code. Reuse the existing DoCommonMenuCallbackCode() function instead of duplicating its code in menuitem_select() and menuitem_deselect() GTK callbacks. No changes in behaviour. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index ebf2073c79..55fc27dbca 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -501,16 +501,8 @@ static void menuitem_select(GtkWidget*, wxMenuItem* item) if (!item->IsEnabled()) return; - wxMenu* menu = item->GetMenu(); wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId()); - event.SetEventObject( menu ); - - wxEvtHandler* handler = menu->GetEventHandler(); - if (handler && handler->SafelyProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) win->HandleWindowEvent( event ); + DoCommonMenuCallbackCode(item->GetMenu(), event); } } @@ -524,17 +516,8 @@ static void menuitem_deselect(GtkWidget*, wxMenuItem* item) if (!item->IsEnabled()) return; - wxMenu* menu = item->GetMenu(); wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 ); - event.SetEventObject( menu ); - - wxEvtHandler* handler = menu->GetEventHandler(); - if (handler && handler->SafelyProcessEvent(event)) - return; - - wxWindow *win = menu->GetInvokingWindow(); - if (win) - win->HandleWindowEvent( event ); + DoCommonMenuCallbackCode(item->GetMenu(), event); } } -- 2.45.2