Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'menu_highlight_event' of https://github.com/imciner2/wxWidgets

Browse Source 
Set menu object for the menu highlight events too.

See https://github.com/wxWidgets/wxWidgets/pull/1506
This commit is contained in:
Vadim Zeitlin
2019-08-27 13:13:23 +02:00
parent 6596f5a98d d846b24450
commit 83134174fa
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/menu.cpp
View File

@@ -560,7 +560,7 @@ static void menuitem_select(GtkWidget*, wxMenuItem* item)
if (!item->IsEnabled())
return;
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId());
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item->GetId(), item->GetMenu());
DoCommonMenuCallbackCode(item->GetMenu(), event);
}
}
@@ -575,7 +575,7 @@ static void menuitem_deselect(GtkWidget*, wxMenuItem* item)
if (!item->IsEnabled())
return;
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, -1 );
wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, -1, item->GetMenu());
DoCommonMenuCallbackCode(item->GetMenu(), event);
}
}