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

reordering in destructor, cursor adaptions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-04 12:18:31 +00:00
parent 71658b2fde
commit 7777a461c3
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/window.cpp
View File

@@ -187,10 +187,23 @@ wxWindowMac::~wxWindowMac()
gFocusWindow = NULL ; gFocusWindow = NULL ;
} }
// CS: copied from MSW :
// VS: destroy children first and _then_ detach *this from its parent.
// If we'd do it the other way around, children wouldn't be able
// find their parent frame (see above).
DestroyChildren();
if ( m_parent ) if ( m_parent )
m_parent->RemoveChild(this); m_parent->RemoveChild(this);
DestroyChildren(); // delete our drop target if we've got one
#if wxUSE_DRAG_AND_DROP
if ( m_dropTarget != NULL )
{
delete m_dropTarget;
m_dropTarget = NULL;
}
#endif // wxUSE_DRAG_AND_DROP
} }
// Constructor // Constructor
@@ -1491,7 +1504,6 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa
return FALSE ; return FALSE ;
} }
extern int wxBusyCursorCount ;
static wxWindow *gs_lastWhich = NULL; static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacSetupCursor( const wxPoint& pt) bool wxWindowMac::MacSetupCursor( const wxPoint& pt)

16
src/mac/window.cpp
View File

@@ -187,10 +187,23 @@ wxWindowMac::~wxWindowMac()
gFocusWindow = NULL ; gFocusWindow = NULL ;
} }
// CS: copied from MSW :
// VS: destroy children first and _then_ detach *this from its parent.
// If we'd do it the other way around, children wouldn't be able
// find their parent frame (see above).
DestroyChildren();
if ( m_parent ) if ( m_parent )
m_parent->RemoveChild(this); m_parent->RemoveChild(this);
DestroyChildren(); // delete our drop target if we've got one
#if wxUSE_DRAG_AND_DROP
if ( m_dropTarget != NULL )
{
delete m_dropTarget;
m_dropTarget = NULL;
}
#endif // wxUSE_DRAG_AND_DROP
} }
// Constructor // Constructor
@@ -1491,7 +1504,6 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa
return FALSE ; return FALSE ;
} }
extern int wxBusyCursorCount ;
static wxWindow *gs_lastWhich = NULL; static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacSetupCursor( const wxPoint& pt) bool wxWindowMac::MacSetupCursor( const wxPoint& pt)