Implemented wxBitmapDataObject.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4167197fda0182e42841f1a7233f83475c900d48..c715296bcfb8b70b30e07db40aab52277c8af175 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1156,7 +1156,7 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
     // translate the style
-    WXDWORD style = WS_CHILD;
+    WXDWORD style = WS_CHILD | WS_VISIBLE;
 
     if ( flags & wxCLIP_CHILDREN )
         style |= WS_CLIPCHILDREN;
@@ -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);