Re-added XtDestroyWidget call in ~wxWindow - hopefully fixed the problem
with scrolledWindow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -408,10 +408,9 @@ wxWindow::~wxWindow()
|
|||||||
if (w)
|
if (w)
|
||||||
{
|
{
|
||||||
XtDestroyWidget(w);
|
XtDestroyWidget(w);
|
||||||
|
m_drawingArea = (WXWidget) 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_mainWidget = (WXWidget) 0;
|
|
||||||
|
|
||||||
// Only if we're _really_ a canvas (not a dialog box/panel)
|
// Only if we're _really_ a canvas (not a dialog box/panel)
|
||||||
if (m_scrolledWindow)
|
if (m_scrolledWindow)
|
||||||
{
|
{
|
||||||
@@ -451,7 +450,8 @@ wxWindow::~wxWindow()
|
|||||||
// wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
|
// wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
|
||||||
// that this call crashed wxMotif under OS/2, so it seems
|
// that this call crashed wxMotif under OS/2, so it seems
|
||||||
// that leaving it out is the right thing to do.
|
// that leaving it out is the right thing to do.
|
||||||
// XtDestroyWidget((Widget) GetMainWidget());
|
// SN, Feb/2000: newgrid/griddemo shows why it is needed :-(
|
||||||
|
XtDestroyWidget((Widget) GetMainWidget());
|
||||||
SetMainWidget((WXWidget) NULL);
|
SetMainWidget((WXWidget) NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user