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

modified GetLastMenuItem() to also take into account the popup menu items

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-08-28 13:17:29 +00:00
parent 7c7f4cff9f
commit 030f50ef4a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/menu/menu.cpp
View File

@@ -547,11 +547,13 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
void MyFrame::LogMenuEvent(const wxCommandEvent& event) void MyFrame::LogMenuEvent(const wxCommandEvent& event)
{ {
int id = event.GetId(); int id = event.GetId();
if ( !GetMenuBar()->FindItem(id) )
return;
wxString msg = wxString::Format(_T("Menu command %d"), id); wxString msg = wxString::Format(_T("Menu command %d"), id);
if ( GetMenuBar()->FindItem(id)->IsCheckable() )
// catch all checkable menubar items and also the check item from the popup
// menu
wxMenuItem *item = GetMenuBar()->FindItem(id);
if ( (item && item->IsCheckable()) || id == Menu_Popup_ToBeChecked )
{ {
msg += wxString::Format(_T(" (the item is currently %schecked)"), msg += wxString::Format(_T(" (the item is currently %schecked)"),
event.IsChecked() ? _T("") : _T("not ")); event.IsChecked() ? _T("") : _T("not "));