Added workaround for life crashing in toolbar deletion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -420,14 +420,19 @@ wxWindow::~wxWindow()
|
|||||||
if (m_hScrollBar)
|
if (m_hScrollBar)
|
||||||
{
|
{
|
||||||
wxDeleteWindowFromTable((Widget) m_hScrollBar);
|
wxDeleteWindowFromTable((Widget) m_hScrollBar);
|
||||||
|
XtUnmanageChild((Widget) m_hScrollBar);
|
||||||
}
|
}
|
||||||
if (m_vScrollBar)
|
if (m_vScrollBar)
|
||||||
{
|
{
|
||||||
wxDeleteWindowFromTable((Widget) m_vScrollBar);
|
wxDeleteWindowFromTable((Widget) m_vScrollBar);
|
||||||
|
XtUnmanageChild((Widget) m_vScrollBar);
|
||||||
}
|
}
|
||||||
|
|
||||||
UnmanageAndDestroy(m_hScrollBar);
|
if (m_hScrollBar)
|
||||||
UnmanageAndDestroy(m_vScrollBar);
|
XtDestroyWidget((Widget) m_hScrollBar);
|
||||||
|
if (m_vScrollBar)
|
||||||
|
XtDestroyWidget((Widget) m_vScrollBar);
|
||||||
|
|
||||||
UnmanageAndDestroy(m_scrolledWindow);
|
UnmanageAndDestroy(m_scrolledWindow);
|
||||||
|
|
||||||
if (m_borderWidget)
|
if (m_borderWidget)
|
||||||
|
Reference in New Issue
Block a user