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

param type of wxWindow::Reparent() fixed in wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-09-29 17:35:52 +00:00
parent 4a0253b82b
commit fdb7dadb6e
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/window.h
View File

@@ -62,7 +62,7 @@ public:
virtual void SetFocus(); virtual void SetFocus();
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const;
virtual bool Reparent( wxWindow *newParent ); virtual bool Reparent( wxWindowBase *newParent );
virtual void WarpPointer(int x, int y); virtual void WarpPointer(int x, int y);
virtual void CaptureMouse(); virtual void CaptureMouse();

2
include/wx/gtk1/window.h
View File

@@ -62,7 +62,7 @@ public:
virtual void SetFocus(); virtual void SetFocus();
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const;
virtual bool Reparent( wxWindow *newParent ); virtual bool Reparent( wxWindowBase *newParent );
virtual void WarpPointer(int x, int y); virtual void WarpPointer(int x, int y);
virtual void CaptureMouse(); virtual void CaptureMouse();

5
src/gtk/window.cpp
View File

@@ -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) ) if ( !wxWindowBase::Reparent(newParent) )
return FALSE; return FALSE;

5
src/gtk1/window.cpp
View File

@@ -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) ) if ( !wxWindowBase::Reparent(newParent) )
return FALSE; return FALSE;