Calling a virtual function from a destructor is not good:

rearranged code to avoid it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-03-26 22:22:55 +00:00
parent d8d1818419
commit 2187eef5bb
4 changed files with 17 additions and 6 deletions

View File

@@ -310,15 +310,19 @@ wxFrame::~wxFrame()
delete m_frameStatusBar;
m_frameStatusBar = NULL;
}
PreDestroy();
DoDestroy();
}
void wxFrame::DoDestroy()
{
Widget frameShell = (Widget)GetShellWidget();
XtRemoveEventHandler( frameShell, StructureNotifyMask,
False, (XtEventHandler)wxFrameMapProc,
(XtPointer)this );
if( frameShell )
XtRemoveEventHandler( frameShell, StructureNotifyMask,
False, (XtEventHandler)wxFrameMapProc,
(XtPointer)this );
if( m_clientArea )
{