fixed background drawing for opaque controls

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 672b7eb6ff3683e90aa7e18e0a6464234b5401d6..6cd10ee393be23c3c66bcb0b98d45a6b607d00bd 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -36,9 +36,15 @@
 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

+#include "wx/notebook.h"

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+// this is for Win CE
+#ifndef WS_EX_TRANSPARENT
+    #define WS_EX_TRANSPARENT 0
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -114,7 +120,8 @@ bool wxStaticBox::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 

-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label, 0) )
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
+                           WS_EX_TRANSPARENT) )

         return false;
 
     return true;
         return false;
 
     return true;


@@ -134,4 +141,18 @@ wxSize wxStaticBox::DoGetBestSize() const
     return wxSize(wBox, hBox);
 }
 
     return wxSize(wBox, hBox);
 }
 

+WXHBRUSH
+wxStaticBox::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC WXUNUSED(pDC))
+{
+    // we can't use pattern brushes because, apparently, the window proc of our
+    // class does something which invalidates the brush origin before drawing
+    // with it and so any patetrn brush is used incorrectly as can be seen by
+    // putting a static box inside a (themed) notebook
+    //
+    // so always use solid brush for painting the background (note that this
+    // only applies to the background of the box label, not the insides of the
+    // box itself)
+    return parent->MSWGetSolidBgBrushForChild(this);
+}
+

 #endif // wxUSE_STATBOX
 #endif // wxUSE_STATBOX