From fdb7dadb6e077fe4ce8e5676f0dfcc24b7093fc6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 29 Sep 1999 17:35:52 +0000 Subject: [PATCH] param type of wxWindow::Reparent() fixed in wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/window.h | 2 +- include/wx/gtk1/window.h | 2 +- src/gtk/window.cpp | 5 +++-- src/gtk1/window.cpp | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 63d0569d6f..cb221b82fb 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -62,7 +62,7 @@ public: virtual void SetFocus(); virtual bool AcceptsFocus() const; - virtual bool Reparent( wxWindow *newParent ); + virtual bool Reparent( wxWindowBase *newParent ); virtual void WarpPointer(int x, int y); virtual void CaptureMouse(); diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 63d0569d6f..cb221b82fb 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -62,7 +62,7 @@ public: virtual void SetFocus(); virtual bool AcceptsFocus() const; - virtual bool Reparent( wxWindow *newParent ); + virtual bool Reparent( wxWindowBase *newParent ); virtual void WarpPointer(int x, int y); virtual void CaptureMouse(); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 5b0eb48f98..b4e5416019 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2554,11 +2554,12 @@ bool wxWindow::AcceptsFocus() const return m_acceptsFocus && wxWindowBase::AcceptsFocus(); } -bool wxWindow::Reparent( wxWindow *newParent ) +bool wxWindow::Reparent( wxWindowBase *newParentBase ) { wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") ); - wxWindow *oldParent = m_parent; + wxWindow *oldParent = m_parent, + *newParent = (wxWindow *)newParentBase; if ( !wxWindowBase::Reparent(newParent) ) return FALSE; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 5b0eb48f98..b4e5416019 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2554,11 +2554,12 @@ bool wxWindow::AcceptsFocus() const return m_acceptsFocus && wxWindowBase::AcceptsFocus(); } -bool wxWindow::Reparent( wxWindow *newParent ) +bool wxWindow::Reparent( wxWindowBase *newParentBase ) { wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") ); - wxWindow *oldParent = m_parent; + wxWindow *oldParent = m_parent, + *newParent = (wxWindow *)newParentBase; if ( !wxWindowBase::Reparent(newParent) ) return FALSE;