we don't need to use solid colour for background drawing when we're inside notebook any longer, so no need to override MSWGetBgBrushForSelf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: statbox.h
|
// Name: wx/msw/statbox.h
|
||||||
// Purpose: wxStaticBox class
|
// Purpose: wxStaticBox class
|
||||||
// Author: Julian Smart
|
// Author: Julian Smart
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -43,7 +43,6 @@ protected:
|
|||||||
virtual wxSize DoGetBestSize() const;
|
virtual wxSize DoGetBestSize() const;
|
||||||
|
|
||||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||||
virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
|
|
||||||
|
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
|
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
|
||||||
|
@@ -151,18 +151,4 @@ 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
|
||||||
|
Reference in New Issue
Block a user