X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..b5435dccd098ae153c3b7b3b8fca8dd0d763986c:/src/msw/toplevel.cpp?ds=sidebyside

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 961cd90c52..6bc345507e 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -156,7 +156,12 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags |= WS_POPUP;
     else
-        msflags |= WS_OVERLAPPED;
+    {
+#ifdef __WXWINCE__
+        if (msflags & WS_BORDER)
+#endif
+            msflags |= WS_OVERLAPPED;
+    }
 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
@@ -167,13 +172,17 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
+#ifndef __WXWINCE__
     else
         msflags |= WS_POPUP;
+#endif
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
+#ifndef __WXWINCE__
     else
         msflags |= WS_POPUP;
+#endif
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )