X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f79eb791ac98442e4813fd06b884ce91cab2e67..5f3565a2fb3d678b03cf8547f37e56b1efe786f5:/src/msw/toplevel.cpp?ds=sidebyside

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index af3dd67586..a600836ce6 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -145,7 +145,7 @@ void wxTopLevelWindowMSW::Init()
 
     m_winLastFocused = (wxWindow *)NULL;
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     m_MenuBarHWND = 0;
 #endif
 }
@@ -174,7 +174,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
     //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
 
-#ifndef __SMARTPHONE__
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;
@@ -529,7 +529,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     }
 #endif
 
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetRightMenu(); // to nothing for initialization
 #endif
 
@@ -907,7 +907,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
     // check if we can use FlashWindowEx(): unfortunately an explicit test for
     // FLASHW_STOP, for example, doesn't work because MSVC6 headers do #define
     // it but don't provide FlashWindowEx() declaration
-#if WINVER >= 0x0500
+#if (WINVER >= 0x0500 && (defined FLASHW_STOP))
     // available in the headers, check if it is supported by the system
     typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi);
     FlashWindowEx_t s_pfnFlashWindowEx = NULL;