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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 63d0569d6f43d60d015639f8fd6e77348bb5e114..cb221b82fbcba33c58fde790b640daf0c46a8bde 100644 (file)
--- 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 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();
 
     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 63d0569d6f43d60d015639f8fd6e77348bb5e114..cb221b82fbcba33c58fde790b640daf0c46a8bde 100644 (file)
--- 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 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();
 
     virtual void WarpPointer(int x, int y);
     virtual void CaptureMouse();

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5b0eb48f98d048b9737a53170aa069944fe507bf..b4e5416019238d8777296197ff70f76f24b7767a 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2554,11 +2554,12 @@ bool wxWindow::AcceptsFocus() const
     return m_acceptsFocus && wxWindowBase::AcceptsFocus();
 }
 
     return m_acceptsFocus && wxWindowBase::AcceptsFocus();
 }
 

-bool wxWindow::Reparent( wxWindow *newParent )
+bool wxWindow::Reparent( wxWindowBase *newParentBase )

 {
     wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") );
 
 {
     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;
 
     if ( !wxWindowBase::Reparent(newParent) )
         return FALSE;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 5b0eb48f98d048b9737a53170aa069944fe507bf..b4e5416019238d8777296197ff70f76f24b7767a 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2554,11 +2554,12 @@ bool wxWindow::AcceptsFocus() const
     return m_acceptsFocus && wxWindowBase::AcceptsFocus();
 }
 
     return m_acceptsFocus && wxWindowBase::AcceptsFocus();
 }
 

-bool wxWindow::Reparent( wxWindow *newParent )
+bool wxWindow::Reparent( wxWindowBase *newParentBase )

 {
     wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") );
 
 {
     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;
 
     if ( !wxWindowBase::Reparent(newParent) )
         return FALSE;