Revised #ifndef WX_PRECOMP headers, added missing #include wx/wxcrtvararg.h

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 38ad2f2c38049a072983ee15d0c245ffbd7c50c8..61efbb6cf699a34e54616384468517978f817bb7 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -170,56 +170,49 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
     return pt;
 }
 
-
-void wxFrameBase::SendSizeEvent()
-{
-    wxSizeEvent event( GetSize(), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->AddPendingEvent( event );
-}
-
-
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
+#if wxUSE_MENUS
+
 bool wxFrameBase::ProcessCommand(int id)
 {
-#if wxUSE_MENUS
     wxMenuBar *bar = GetMenuBar();
     if ( !bar )
         return false;
 
-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    wxMenuItem *item = bar->FindItem(id);
+    if ( !item )
+        return false;
+
+    return ProcessCommand(item);
+}
+
+bool wxFrameBase::ProcessCommand(wxMenuItem *item)
+{
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, item->GetId());
     commandEvent.SetEventObject(this);
 
-    wxMenuItem *item = bar->FindItem(id);
-    if (item)
-    {
-        if (!item->IsEnabled())
-            return true;
+    if (!item->IsEnabled())
+        return true;
 
-        if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
-            return true;
+    if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
+        return true;
 
-        if (item->IsCheckable())
-        {
-            item->Toggle();
+    if (item->IsCheckable())
+    {
+        item->Toggle();
 
-            // use the new value
-            commandEvent.SetInt(item->IsChecked());
-        }
+        // use the new value
+        commandEvent.SetInt(item->IsChecked());
     }
 
-    GetEventHandler()->ProcessEvent(commandEvent);
-    return true;
-#else // !wxUSE_MENUS
-    wxUnusedVar(id);
-
-    return false;
-#endif // wxUSE_MENUS/!wxUSE_MENUS
+    return HandleWindowEvent(commandEvent);
 }
 
+#endif // wxUSE_MENUS
+
 // Do the UI update processing for this window. This is
 // provided for the application to call if it wants to
 // force a UI update, particularly for the menus and toolbar.
@@ -361,7 +354,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 +432,7 @@ void wxFrameBase::DoGiveHelp(const wxString& help, bool show)
 
     statbar->SetStatusText(text, m_statusBarPane);
 #else
-    wxUnusedVar(text);
+    wxUnusedVar(help);
     wxUnusedVar(show);
 #endif // wxUSE_STATUSBAR
 }