don't use border styles for windows in wxUniversal

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index a189e89dccbd407f523ab1d297be7413060de97d..b3e1b3f174f187dd07ce47e2ab9c235f3c453bd0 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -391,8 +391,9 @@ bool wxWindowMSW::Create(wxWindow *parent,
     DWORD msflags = WS_VISIBLE | MSWGetCreateWindowFlags(&exstyle);
 
 #ifdef __WXUNIVERSAL__
     DWORD msflags = WS_VISIBLE | MSWGetCreateWindowFlags(&exstyle);
 
 #ifdef __WXUNIVERSAL__

-    // no 3d effects, we draw them ourselves
-    exStyle = 0;
+    // no borders, we draw them ourselves
+    exstyle = 0;
+    msflags &= ~WS_BORDER;

 #endif // wxUniversal
 
     if ( style & wxPOPUP_WINDOW )
 #endif // wxUniversal
 
     if ( style & wxPOPUP_WINDOW )