cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wxWindowOS2::Reparent.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2008-05-17 09:40:37 +00:00
parent 34deb5cdfe
commit a289b10d2c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/os2/window.h
View File

@ -85,7 +85,7 @@ public:
virtual void DoEnable(bool bEnable); virtual void DoEnable(bool bEnable);
virtual void SetFocus(void); virtual void SetFocus(void);
virtual void SetFocusFromKbd(void); virtual void SetFocusFromKbd(void);
virtual bool Reparent(wxWindow* pNewParent); virtual bool Reparent(wxWindowBase* pNewParent);
virtual void WarpPointer( int x virtual void WarpPointer( int x
,int y ,int y
); );
@ -536,12 +536,6 @@ private:
DECLARE_DYNAMIC_CLASS(wxWindowOS2); DECLARE_DYNAMIC_CLASS(wxWindowOS2);
DECLARE_NO_COPY_CLASS(wxWindowOS2) DECLARE_NO_COPY_CLASS(wxWindowOS2)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
//
// Virtual function hiding supression
//
inline virtual bool Reparent(wxWindowBase* pNewParent)
{ return(wxWindowBase::Reparent(pNewParent));}
}; // end of wxWindow }; // end of wxWindow
class wxWindowCreationHook class wxWindowCreationHook

2
src/os2/window.cpp
View File

@ -1094,7 +1094,7 @@ void wxWindowOS2::OnIdle(
// //
// Set this window to be the child of 'parent'. // Set this window to be the child of 'parent'.
// //
bool wxWindowOS2::Reparent( wxWindow* pParent) bool wxWindowOS2::Reparent( wxWindowBase* pParent)
{ {
if (!wxWindowBase::Reparent(pParent)) if (!wxWindowBase::Reparent(pParent))
return false; return false;