Fix compilation in !wxUSE_MENUS case.

wxFrameBase::ShouldUpdateMenuFromIdle() should be defined inside "#if
wxUSE_MENUS" as it's only declared when wxUSE_MENUS==1.

Closes #15062.

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index f050c1eb8403799505cc8feb6574f6aa48f397b4..3e96a8291ba2bc3d8bbe5abdce8d3d588c80235c 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -41,15 +41,16 @@ extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-#if wxUSE_MENUS && wxUSE_STATUSBAR
+#if wxUSE_MENUS
+
+#if wxUSE_STATUSBAR

 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
     EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
     EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
 
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
 END_EVENT_TABLE()

-
-#endif // wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+#endif // wxUSE_STATUSBAR

 
 /* static */
 bool wxFrameBase::ShouldUpdateMenuFromIdle()
 
 /* static */
 bool wxFrameBase::ShouldUpdateMenuFromIdle()


@@ -67,6 +68,8 @@ bool wxFrameBase::ShouldUpdateMenuFromIdle()
     return wxUSE_IDLEMENUUPDATES != 0;
 }
 
     return wxUSE_IDLEMENUUPDATES != 0;
 }
 

+#endif // wxUSE_MENUS
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================