Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation in !wxUSE_MENUS case.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-02-24 13:48:26 +00:00
parent f4f4c3aca4
commit de6e6d08b2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/framecmn.cpp
View File

@@ -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) BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
EVT_MENU_OPEN(wxFrameBase::OnMenuOpen) EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
EVT_MENU_CLOSE(wxFrameBase::OnMenuClose) EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight) EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
END_EVENT_TABLE() END_EVENT_TABLE()
#endif // wxUSE_STATUSBAR
#endif // wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
/* static */ /* static */
bool wxFrameBase::ShouldUpdateMenuFromIdle() bool wxFrameBase::ShouldUpdateMenuFromIdle()
@@ -67,6 +68,8 @@ bool wxFrameBase::ShouldUpdateMenuFromIdle()
return wxUSE_IDLEMENUUPDATES != 0; return wxUSE_IDLEMENUUPDATES != 0;
} }
#endif // wxUSE_MENUS
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================