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

Fixed MSW/Univ compilation of toplevel.cpp.

Browse Source 
MSW-only functions were compiled in, disabled their usage by adding #ifndef __WXUNIVERSAL__ blocks.

Closes #13399 (again, after r68723 already should have closed it but its commit message contained a typo).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-08-25 21:52:55 +00:00
parent 0e1d0c5373
commit fe62518e7c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/toplevel.cpp
View File

@@ -361,6 +361,10 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
#endif // __SMARTPHONE__ || __POCKETPC__ #endif // __SMARTPHONE__ || __POCKETPC__
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
// Keep the #ifdef block inside the case to fix a potential MSVC
// warning regarding switch statement containing no case or
// default labels (or a default only).
#ifndef __WXUNIVERSAL__
// We may need to generate events for the items added to the system // We may need to generate events for the items added to the system
// menu if it had been created (and presumably modified). // menu if it had been created (and presumably modified).
if ( m_menuSystem ) if ( m_menuSystem )
@@ -382,6 +386,7 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
processed = true; processed = true;
} }
} }
#endif // #ifndef __WXUNIVERSAL__
break; break;
} }
@@ -1264,6 +1269,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const
{ {
#ifndef __WXUNIVERSAL__
if ( !m_menuSystem ) if ( !m_menuSystem )
{ {
HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE); HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE);
@@ -1289,6 +1295,7 @@ wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const
// correct but doesn't seem to have any serious drawbacks. // correct but doesn't seem to have any serious drawbacks.
m_menuSystem->SetInvokingWindow(self); m_menuSystem->SetInvokingWindow(self);
} }
#endif // #ifndef __WXUNIVERSAL__
return m_menuSystem; return m_menuSystem;
} }