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

(blind) wxUniv compilation fix: define the method using wxWindow out of line, i.e. after wxWindow is defined

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-13 19:42:35 +00:00
parent 3ad70d312e
commit bdd1a35ddc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/window.h
View File

@@ -394,10 +394,7 @@ public:
// normally just calls MSWGetBgBrushForChild() on the parent window but may // normally just calls MSWGetBgBrushForChild() on the parent window but may
// be overridden if the default background brush is not suitable for some // be overridden if the default background brush is not suitable for some
// reason (e.g. wxStaticBox uses MSWGetSolidBgBrushForChild() instead) // reason (e.g. wxStaticBox uses MSWGetSolidBgBrushForChild() instead)
virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC) virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);
{
return parent->MSWGetBgBrushForChild(hDC, this);
}
// return the background brush to use for this window by quering the parent // return the background brush to use for this window by quering the parent
// windows via their MSWGetBgBrushForChild() recursively // windows via their MSWGetBgBrushForChild() recursively

5
src/msw/window.cpp
View File

@@ -4049,6 +4049,11 @@ wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow * WXUNUSED(child))
return m_hasBgCol ? GetBackgroundColour() : wxNullColour; return m_hasBgCol ? GetBackgroundColour() : wxNullColour;
} }
WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
{
return parent->MSWGetBgBrushForChild(hDC, this);
}
WXHBRUSH wxWindow::MSWGetBgBrush(WXHDC hDC) WXHBRUSH wxWindow::MSWGetBgBrush(WXHDC hDC)
{ {
for ( wxWindow *win = this; win; win = win->GetParent() ) for ( wxWindow *win = this; win; win = win->GetParent() )