}
#endif // Win95
-WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
{
HDC hdc = (HDC)pDC;
if ( m_hasFgCol )
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
}
+ WXHBRUSH hbr = 0;
+ if ( !colBg.Ok() )
+ {
+ hbr = MSWGetBgBrush(pDC, hWnd);
+
+ // if the control doesn't have any bg colour, foreground colour will be
+ // ignored as the return value would be 0 -- so forcefully give it a
+ // non default background brush in this case
+ if ( !hbr && m_hasFgCol )
+ colBg = GetBackgroundColour();
+ }
+
// use the background colour override if a valid colour is given
- WXHBRUSH hbr;
if ( colBg.Ok() )
{
::SetBkColor(hdc, wxColourToRGB(colBg));
hbr = (WXHBRUSH)brush->GetResourceHandle();
}
- else // use our own background colour and recurse upwards if necessary
- {
- hbr = MSWGetBgBrush(pDC);
- }
return hbr;
}
-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
{
- // by default consider that the controls text shouldn't erase the
- // background under it (this is true for all static controls, check boxes,
- // radio buttons, ...)
- ::SetBkMode((HDC)pDC, TRANSPARENT);
+ wxColour colBg;
+
+ if ( HasTransparentBackground() )
+ ::SetBkMode((HDC)pDC, TRANSPARENT);
+ else // if the control is opaque it shouldn't use the parents background
+ colBg = GetBackgroundColour();
- return DoMSWControlColor(pDC, wxNullColour);
+ return DoMSWControlColor(pDC, colBg, hWnd);
}
WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
{
return DoMSWControlColor(pDC,
- wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+ wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+ GetHWND());
}
// ---------------------------------------------------------------------------