AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxMSW compilation fix for wxCompositeWindow.

Browse Source 
Not all ports override SetXXX() methods in their wxWindow class so use the
versions from wxWindowBase which are definitely known to exist. Notice that
the call itself is still virtual so it doesn't matter which base class do we
use.

Closes #12840.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2011-01-04 11:33:19 +00:00
parent cc72cde0ea
commit a1061906dd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/compositewin.h
View File

@ -49,7 +49,7 @@ public:
if ( !BaseWindowClass::SetForegroundColour(colour) )
return false;
DoSetForAllParts(&wxWindow::SetForegroundColour, colour);
DoSetForAllParts(&wxWindowBase::SetForegroundColour, colour);
return true;
}
@ -59,7 +59,7 @@ public:
if ( !BaseWindowClass::SetBackgroundColour(colour) )
return false;
DoSetForAllParts(&wxWindow::SetBackgroundColour, colour);
DoSetForAllParts(&wxWindowBase::SetBackgroundColour, colour);
return true;
}
@ -69,7 +69,7 @@ public:
if ( !BaseWindowClass::SetFont(font) )
return false;
DoSetForAllParts(&wxWindow::SetFont, font);
DoSetForAllParts(&wxWindowBase::SetFont, font);
return true;
}
@ -79,7 +79,7 @@ public:
if ( !BaseWindowClass::SetCursor(cursor) )
return false;
DoSetForAllParts(&wxWindow::SetCursor, cursor);
DoSetForAllParts(&wxWindowBase::SetCursor, cursor);
return true;
}
@ -90,7 +90,7 @@ private:
virtual wxWindowList GetCompositeWindowParts() const = 0;
template <class T>
void DoSetForAllParts(bool (wxWindow::*func)(const T&), const T& arg)
void DoSetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg)
{
// Simply call the setters for all parts of this composite window.
const wxWindowList parts = GetCompositeWindowParts();