fixed USE_CONTEXT_MENU tests

[wxWidgets.git] / src / msw / toplevel.cpp

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index e3dccf8050a619f3c2e6b42e8de601dee2530663..1153dde708cd0bd56e17b822dec59648b6e1cf3e 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -163,10 +163,15 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         if (msflags & WS_BORDER)
             msflags |= WS_OVERLAPPED;
     }
+    
 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
+#ifndef WS_THICKFRAME
+        msflags = msflags;
+#else
         msflags |= WS_THICKFRAME;
+#endif
     else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
@@ -175,10 +180,16 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_POPUP;
 
     if ( style & wxCAPTION )
+#ifdef __WXWINCE__
+        msflags = msflags;
+#else
         msflags |= WS_CAPTION;
+#endif
     else
         msflags |= WS_POPUP;
 
+    return msflags;
+
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
         msflags |= WS_MINIMIZEBOX;
@@ -200,7 +211,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     // Keep this here because it saves recoding this function in wxTinyFrame
     if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
         msflags |= WS_CAPTION;
-
+        
     if ( exflags )
     {
         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )