From a1061906dd3e6594753bf99fdedde7c72d9ca12e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Jan 2011 11:33:19 +0000 Subject: [PATCH] wxMSW compilation fix for wxCompositeWindow. 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 --- include/wx/compositewin.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h index f5110ba9b9..a4477e03f2 100644 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@ -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 - 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(); -- 2.45.2