From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Sat, 17 May 2008 09:40:37 +0000 (+0000)
Subject: Fixed wxWindowOS2::Reparent.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a289b10d2ce67a39d5e18d49716afdbcfce2c188

Fixed wxWindowOS2::Reparent.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 70474ba32a..4aeb845c43 100644
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -85,7 +85,7 @@ public:
     virtual void     DoEnable(bool bEnable);
     virtual void     SetFocus(void);
     virtual void     SetFocusFromKbd(void);
-    virtual bool     Reparent(wxWindow* pNewParent);
+    virtual bool     Reparent(wxWindowBase* pNewParent);
     virtual void     WarpPointer( int x
                                  ,int y
                                 );
@@ -536,12 +536,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
     DECLARE_NO_COPY_CLASS(wxWindowOS2)
     DECLARE_EVENT_TABLE()
-
-    //
-    // Virtual function hiding supression
-    //
-    inline virtual bool Reparent(wxWindowBase* pNewParent)
-    { return(wxWindowBase::Reparent(pNewParent));}
 }; // end of wxWindow
 
 class wxWindowCreationHook
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 4a631a8452..444a0756c2 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1094,7 +1094,7 @@ void wxWindowOS2::OnIdle(
 //
 // Set this window to be the child of 'parent'.
 //
-bool wxWindowOS2::Reparent( wxWindow* pParent)
+bool wxWindowOS2::Reparent( wxWindowBase* pParent)
 {
     if (!wxWindowBase::Reparent(pParent))
         return false;