From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Thu, 25 Aug 2011 21:52:55 +0000 (+0000)
Subject: Fixed MSW/Univ compilation of toplevel.cpp.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fe62518e7c989b18653b9d07e19ba8a187f24cf1

Fixed MSW/Univ compilation of toplevel.cpp.

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
---

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 3d7ccb58b2..909d29bb87 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -361,6 +361,10 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
 #endif // __SMARTPHONE__ || __POCKETPC__
 
         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
             // menu if it had been created (and presumably modified).
             if ( m_menuSystem )
@@ -382,6 +386,7 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
                         processed = true;
                 }
             }
+#endif // #ifndef __WXUNIVERSAL__
             break;
     }
 
@@ -1264,6 +1269,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
 
 wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const
 {
+#ifndef __WXUNIVERSAL__
     if ( !m_menuSystem )
     {
         HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE);
@@ -1289,6 +1295,7 @@ wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const
         // correct but doesn't seem to have any serious drawbacks.
         m_menuSystem->SetInvokingWindow(self);
     }
+#endif // #ifndef __WXUNIVERSAL__
 
     return m_menuSystem;
 }