use HasTransparentBackground() to correctly draw the background of static text/box on a window with non-inheritable (== own) background set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4138,9 +4138,17 @@ WXHBRUSH wxWindowMSW::MSWGetSolidBgBrushForChild(wxWindow *child)
|
|||||||
|
|
||||||
wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow *child)
|
wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow *child)
|
||||||
{
|
{
|
||||||
return m_inheritBgCol || (m_hasBgCol && child == this)
|
if ( m_hasBgCol )
|
||||||
? GetBackgroundColour()
|
{
|
||||||
: wxNullColour;
|
if ( m_inheritBgCol ||
|
||||||
|
child == this ||
|
||||||
|
child->HasTransparentBackground() )
|
||||||
|
{
|
||||||
|
return GetBackgroundColour();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return wxNullColour;
|
||||||
}
|
}
|
||||||
|
|
||||||
WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
|
WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
|
||||||
|
Reference in New Issue
Block a user