X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/msw/statbox.cpp?ds=sidebyside

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index f08e16db70..fb017bd219 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STATBOX
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
@@ -41,7 +43,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 // ============================================================================
 // implementation
@@ -59,12 +61,27 @@ bool wxStaticBox::Create(wxWindow *parent,
                          long style,
                          const wxString& name)
 {
-    if ( !CreateControl(parent, id, pos, size, style, name) )
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, 0) )
+    // as wxStaticBox doesn't draw its own background, we make it transparent
+    // to force redrawing its background which could have been overwritten by
+    // the other controls inside it
+    //
+    // FIXME: I still think that it isn't the right solution because the static
+    //        boxes shouldn't have to be transparent if the redrawing was done
+    //        right elsewhere - who ever had to make them transparent in non
+    //        wxWindows programs, after all? But for now it does fix a serious
+    //        problem (try resizing the sizers test screen in the layout sample
+    //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
+    //        we fix the real underlying problem
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
+                           WS_EX_TRANSPARENT) )
         return FALSE;
 
+    // to be transparent we should have the same colour as the parent as well
+    SetBackgroundColour(GetParent()->GetBackgroundColour());
+
     return TRUE;
 }
 
@@ -102,8 +119,6 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
-            // VZ: I will remove (or change) this soon... (15.11.99)
-#if 0
         case WM_ERASEBKGND:
             // prevent wxControl from processing this message because it will
             // erase the background incorrectly and there is no way for us to
@@ -112,9 +127,9 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             // without painting over other controls - and if we don't,
             // wxControl still gets it)
             return MSWDefWindowProc(nMsg, wParam, lParam);
-#endif
     }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
+#endif // wxUSE_STATBOX