[ 1936700 ] wxCAL_SHOW_WEEK_NUMBERS, slightly modified

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index bbd09bf8b478a725d8840665171cb89f38096e6a..710742fd715ccd3d82a35593801574fcfa9025a8 100644 (file)
--- 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);
 
 #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 ( 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
             helpString = item->GetHelp();
 
         // notice that it's ok if we don't find the item because it might