don't set WS_POPUP for all windows (fix for my last fix)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 449a0973ff46a4f1a5433fdc982acd1e90bfae90..6530437b9454f039d50e61e4c85b1d7374d2e7b6 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -106,6 +106,10 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
     long style = GetWindowStyle();
 
     // first select the kind of window being created
     long style = GetWindowStyle();
 
     // first select the kind of window being created

+    //
+    // note that if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and
+    // creates a window with both caption and border, hence we also test it
+    // below in some other cases

     long msflags;
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags = WS_POPUP;
     long msflags;
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags = WS_POPUP;


@@ -117,16 +121,13 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
         msflags |= WS_THICKFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
         msflags |= WS_THICKFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;

+    else
+        msflags |= WS_POPUP;

 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;

-
-    // if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and creates a
-    // window with both caption and border
-    if ( msflags & (WS_CAPTION | WS_BORDER) != WS_CAPTION | WS_BORDER )
-    {
+    else

         msflags |= WS_POPUP;
         msflags |= WS_POPUP;

-    }

 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )