X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51181d291194b7ae616cfb17c984fd8927e4a977..5bf3b6fe48580853044132c381d3548535ca7ad1:/src/msw/frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 15c9e2bb59..2559981536 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -890,8 +890,9 @@ bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
     return false;
 }
 
-bool wxFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
+#if wxUSE_MENUS
     // we only need to handle the menu and accelerator commands from the items
     // of our menu bar, base wxWindow class already handles the rest
     if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
@@ -900,21 +901,14 @@ bool wxFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
         if ( !wxCurrentPopupMenu )
 #endif // wxUSE_MENUS_NATIVE
         {
-            wxMenuBar * const mbar = GetMenuBar();
-            if ( mbar )
-            {
-                // sign extend to int from short before comparing with the
-                // other int ids
-                const int id = (signed short)id_;
-
-                wxMenuItem * const mitem = mbar->FindItem(id);
-                if ( mitem )
-                    return ProcessCommand(mitem);
-            }
+            wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
+            if ( mitem )
+                return ProcessCommand(mitem);
         }
     }
+#endif // wxUSE_MENUS
 
-    return wxFrameBase::HandleCommand(id_, cmd, control);;
+    return wxFrameBase::HandleCommand(id, cmd, control);;
 }
 
 #if wxUSE_MENUS