we don't need to use solid colour for background drawing when we're inside notebook...

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index ec93e0c97af52379fdafd488b71a2091c01798a3..23735739d2dcc007db49ea533d67a9866cc2b5d1 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.h
+// Name:        wx/msw/statbox.h
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
@@ -43,7 +43,6 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-    virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
 
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 606b929536e2cdeb6b3866e8b5871ebe14c7adb5..eede3a9705d8a0b4154d835177a994050eff76c2 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -151,18 +151,4 @@ wxSize wxStaticBox::DoGetBestSize() const
     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