Fix crash when using a proxy (m_protocol already gets cleaned up via CleanData())

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 11cfb4793c15939e6a90639cc617cb024364441f..2f503b86ae1f75de14e5bff5a7c853cdcafe0124 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -43,7 +43,7 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
-    m_inSetValue = FALSE;
+    m_inSetValue = false;
 }
 
 bool wxControl::Create( wxWindow *parent,
@@ -73,13 +73,13 @@ bool wxControl::CreateControl(wxWindow *parent,
 {
     if( !wxControlBase::CreateControl( parent, id, pos, size, style,
                                        validator, name ) )
-        return FALSE;
+        return false;
 
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_font = parent->GetFont();
 
-    return TRUE;
+    return true;
 }
 
 void wxControl::SetLabel(const wxString& label)
@@ -114,3 +114,16 @@ bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
     return GetEventHandler()->ProcessEvent(event);
 }
+
+wxSize wxControl::DoGetBestSize() const
+{
+    Widget w = (Widget)GetTopWidget();
+
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG (w, wxT("DoGetBestSize called before creation"));
+
+    XtWidgetGeometry preferred;
+    XtQueryGeometry (w, NULL, &preferred);
+
+    return wxSize(preferred.width, preferred.height);
+}