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

Compilation fix for wxUniv/MSW in wxTLW code dealing with menus.

Browse Source 
The code used by WM_INITMENUPOPUP and WM_EXITMENULOOP handlers shouldn't be
used in wxUniv build as it's not used there anyhow and doesn't even compile.

Closes #16039.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-04 14:07:43 +00:00
parent 356f8409bf
commit a46fbf1bcd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/toplevel.h
View File

@@ -121,7 +121,7 @@ public:
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const { return false; }
#if wxUSE_MENUS #if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
// handle WM_EXITMENULOOP message for Win95 only // handle WM_EXITMENULOOP message for Win95 only
@@ -135,7 +135,7 @@ public:
// Find the menu corresponding to the given handle. // Find the menu corresponding to the given handle.
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
#endif // wxUSE_MENUS #endif // wxUSE_MENUS && !__WXUNIVERSAL__
protected: protected:
// common part of all ctors // common part of all ctors

4
src/msw/toplevel.cpp
View File

@@ -1481,7 +1481,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
} }
} }
#if wxUSE_MENUS #if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
bool bool
wxTopLevelWindowMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) wxTopLevelWindowMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
@@ -1588,7 +1588,7 @@ wxMenu* wxTopLevelWindowMSW::MSWFindMenuFromHMENU(WXHMENU WXUNUSED(hMenu))
return NULL; return NULL;
} }
#endif // wxUSE_MENUS #endif // wxUSE_MENUS && !__WXUNIVERSAL__