simplifications and corrections to background drawing:

1. removed ApplyParentThemeBackground() not used any longer
2. removed ProvidesBackground() which is synonymous with
   !HasTransparentBackground()
3. removed a whole bunch of unused MSWXXX() methods
4. moved MSWControlColor() from wxWindow up to wxControl

results:

1. the gradient is still shown properly for static/radio boxes in notebooks
2. correct background colour is used for the static boxes
3. code is shorter and better commented


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-04-10 15:23:08 +00:00
parent 47561b0dc5
commit c3732409ac
32 changed files with 340 additions and 496 deletions

View File

@@ -126,27 +126,6 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
return msStyle;
}
WXHBRUSH wxStaticText::DoMSWControlColor(WXHDC pDC, wxColour colBg)
{
// If this control has a non-standard fg colour but still has the standard
// bg then we need to also give it a non-standard bg otherwise the fg
// setting has no effect.
WXHBRUSH hbr = wxControl::DoMSWControlColor(pDC, colBg);
if (!hbr && m_hasFgCol)
{
hbr = MSWGetBgBrushForChild(pDC, this);
if (!hbr)
{
HDC hdc = (HDC)pDC;
wxColour bg = GetBackgroundColour();
::SetBkColor(hdc, wxColourToRGB(bg));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(bg, wxSOLID);
hbr = (WXHBRUSH)brush->GetResourceHandle();
}
}
return hbr;
}
wxSize wxStaticText::DoGetBestSize() const
{
wxClientDC dc(wx_const_cast(wxStaticText *, this));