X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d22935dcb05670708c818ee01ca072f1792ff13..88684daa70085522a07302c4cb1ab8346a8102ea:/src/common/framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 38ad2f2c38..710742fd71 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -211,8 +211,7 @@ bool wxFrameBase::ProcessCommand(int id)
         }
     }
 
-    GetEventHandler()->ProcessEvent(commandEvent);
-    return true;
+    return HandleWindowEvent(commandEvent);
 #else // !wxUSE_MENUS
     wxUnusedVar(id);
 
@@ -361,7 +360,7 @@ bool wxFrameBase::ShowMenuHelp(int menuId)
     if ( menuId != wxID_SEPARATOR && menuId != -3 /* wxID_TITLE */ )
     {
         const wxMenuItem * const item = FindItemInMenuBar(menuId);
-        if ( item )
+        if ( item && !item->IsSeparator() )
             helpString = item->GetHelp();
 
         // notice that it's ok if we don't find the item because it might
@@ -439,7 +438,7 @@ void wxFrameBase::DoGiveHelp(const wxString& help, bool show)
 
     statbar->SetStatusText(text, m_statusBarPane);
 #else
-    wxUnusedVar(text);
+    wxUnusedVar(help);
     wxUnusedVar(show);
 #endif // wxUSE_STATUSBAR
 }