toolbar tooltips fix

[wxWidgets.git] / src / motif / choice.cpp

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index a70bef64bfe99e52e998b66fb369956c491dff02..566dc1ea491b55f2d7723c78464c3bb728e22d0b 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -145,14 +145,17 @@ wxChoice::~wxChoice()
     if (m_widgetList)
         delete[] m_widgetList;
 
     if (m_widgetList)
         delete[] m_widgetList;
 

-    DetachWidget(GetMainWidget()); // Removes event handlers
+    if (GetMainWidget())
+    {
+        DetachWidget(GetMainWidget()); // Removes event handlers

 
 

-    XtDestroyWidget((Widget) m_formWidget);
-    m_formWidget = (WXWidget) 0;
+        XtDestroyWidget((Widget) m_formWidget);
+        m_formWidget = (WXWidget) 0;

 
 

-    // Presumably the other widgets have been deleted now, via the form
-    m_mainWidget = (WXWidget) 0;
-    m_buttonWidget = (WXWidget) 0;
+        // Presumably the other widgets have been deleted now, via the form
+        m_mainWidget = (WXWidget) 0;
+        m_buttonWidget = (WXWidget) 0;
+    }

 }
 
 void wxChoice::Append(const wxString& item)
 }
 
 void wxChoice::Append(const wxString& item)