]> git.saurik.com Git - wxWidgets.git/commitdiff
no real changes; just a very minor cleanup in wxFrame::MSWTranslateMessage()
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 23 Jan 2006 15:43:26 +0000 (15:43 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 23 Jan 2006 15:43:26 +0000 (15:43 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/frame.cpp

index ee8d22fd521de400bedd78861c1a139ba52383c0..b9c2e1c30da364cbab6df56e06d7795518da733c 100644 (file)
@@ -734,14 +734,14 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
-    if ( !menuBar )
-        return false;
+    if ( menuBar )
+    {
+        const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+        return acceleratorTable.Translate(this, pMsg);
+    }
+#endif // wxUSE_MENUS && wxUSE_ACCEL
 
-    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
-    return acceleratorTable.Translate(this, pMsg);
-#else
     return false;
-#endif // wxUSE_MENUS && wxUSE_ACCEL
 }
 
 // ---------------------------------------------------------------------------