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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index e73c756d2eeb9d99fda45b2fac2969d9ddb5c5f7..4ec50c783906d6989e9fadaaf826ad121dc650f6 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -420,14 +420,19 @@ wxWindow::~wxWindow()
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);
         if (m_hScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_hScrollBar);

+           XtUnmanageChild((Widget) m_hScrollBar);

         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);
         }
         if (m_vScrollBar)
         {
             wxDeleteWindowFromTable((Widget) m_vScrollBar);

+           XtUnmanageChild((Widget) m_vScrollBar);

         }
 
         }
 

-        UnmanageAndDestroy(m_hScrollBar);
-        UnmanageAndDestroy(m_vScrollBar);
+        if (m_hScrollBar)
+           XtDestroyWidget((Widget) m_hScrollBar);
+        if (m_vScrollBar)
+           XtDestroyWidget((Widget) m_vScrollBar);
+

         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)
         UnmanageAndDestroy(m_scrolledWindow);
 
         if (m_borderWidget)