Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last fix resulted in wrongly inheriting bg colour from the parent with m_inheritBgCol == false, fixed the fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-22 23:27:49 +00:00
parent 63ec176495
commit 48d597ed96
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/window.cpp
View File

@@ -4048,9 +4048,11 @@ WXHBRUSH wxWindowMSW::MSWGetSolidBgBrushForChild(wxWindow *child)
return 0; return 0;
} }
wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow * WXUNUSED(child)) wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow *child)
{ {
return m_hasBgCol ? GetBackgroundColour() : wxNullColour; return m_inheritBgCol || (m_hasBgCol && child == this)
? GetBackgroundColour()
: wxNullColour;
} }
WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC) WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)