From: Vadim Zeitlin Date: Thu, 8 May 2008 14:15:07 +0000 (+0000) Subject: correct the signature of the overriden Reparent() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7f0cbaaa4ab3037587fa796d38e7eaf16ed54933?ds=inline correct the signature of the overriden Reparent() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 89a0501f0d..bdd0d4e55e 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -80,7 +80,7 @@ public: // forward these functions to all subcontrols virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); - virtual bool Reparent(wxWindow *newParent); + virtual bool Reparent(wxWindowBase *newParent); // get the subcontrols wxTextCtrl *GetText() const { return m_textCtrl; } diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index b80e54ddb3..1235d9819c 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -306,7 +306,7 @@ bool wxSpinCtrlGenericBase::Show(bool show) return true; } -bool wxSpinCtrlGenericBase::Reparent(wxWindow *newParent) +bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent) { if ( m_spinButton ) {