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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index e147f5c5a13b371cd4caab4194fd00b7f89c3fc0..5d1c12e335b3ac80559481eeb3a00c49734ba74c 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -547,11 +547,13 @@ wxMenuItem *MyFrame::GetLastMenuItem() const
 void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 {
     int id = event.GetId();
 void MyFrame::LogMenuEvent(const wxCommandEvent& event)
 {
     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)"),
                                 event.IsChecked() ? _T("") : _T("not "));
     {
         msg += wxString::Format(_T(" (the item is currently %schecked)"),
                                 event.IsChecked() ? _T("") : _T("not "));