From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 14 Nov 2008 23:26:55 +0000 (+0000)
Subject: make code dealing with wxUSE_IDLEMENUUPDATES a bit more clear and avoid warning due... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a22895511a250173cf7dd4403fc89f293a898067?ds=sidebyside

make code dealing with wxUSE_IDLEMENUUPDATES a bit more clear and avoid warning due to use of this constant in logical boolean expression

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 61efbb6cf6..206c959dfb 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -228,14 +228,12 @@ void wxFrameBase::UpdateWindowUI(long flags)
 #if wxUSE_MENUS
     if (GetMenuBar())
     {
-        if ((flags & wxUPDATE_UI_FROMIDLE) && !wxUSE_IDLEMENUUPDATES)
-        {
-            // If coming from an idle event, we only
-            // want to update the menus if we're
-            // in the wxUSE_IDLEMENUUPDATES configuration:
-            // so if we're not, do nothing
-        }
-        else
+        // If coming from an idle event, we only want to update the menus if
+        // we're in the wxUSE_IDLEMENUUPDATES configuration, otherwise they
+        // will be update when the menu is opened later
+#if !wxUSE_IDLEMENUUPDATES
+        if ( !(flags & wxUPDATE_UI_FROMIDLE) )
+#endif // wxUSE_IDLEMENUUPDATES
             DoMenuUpdates();
     }
 #endif // wxUSE_MENUS
@@ -254,15 +252,14 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 #endif // wxUSE_STATUSBAR
 }
 
-#if !wxUSE_IDLEMENUUPDATES
 void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
-#else
-void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
-#endif
 {
-#if !wxUSE_IDLEMENUUPDATES
+#if wxUSE_IDLEMENUUPDATES
+    wxUnusedVar(event);
+#else // !wxUSE_IDLEMENUUPDATES
+    // as we didn't update the menus from idle time, do it now
     DoMenuUpdates(event.GetMenu());
-#endif // !wxUSE_IDLEMENUUPDATES
+#endif // wxUSE_IDLEMENUUPDATES/!wxUSE_IDLEMENUUPDATES
 }
 
 void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))