Fixed style glitches

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 24498607f2248ba88465d0bcf3480a1f69df83b5..b12a323c5a1a5e4064f34097e715cea519323b1b 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -141,7 +141,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     WXDWORD msflags = wxWindow::MSWGetStyle
                       (
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
-                      ) & ~WS_CHILD;
+                      ) & ~WS_CHILD & ~WS_VISIBLE;
 
     // first select the kind of window being created
     //

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 5cb28ac35483fb770e43d8ca3a1f7f0234362971..c715296bcfb8b70b30e07db40aab52277c8af175 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1171,7 +1171,8 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     // is a more neutral term, we don't necessarily get a sunken effect in
     // Windows XP. Instead we get the appropriate style for the theme.
 
-    if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && GetParent() &&
+    if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && 
+        GetParent() && GetParent()->IsKindOf(CLASSINFO(wxPanel)) &&
         ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
     {
         border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);