Crash fix under VC++

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 6b5b4c916288a0fb68cab47cf01ea4109a57d10a..2f503b86ae1f75de14e5bff5a7c853cdcafe0124 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -13,6 +13,9 @@
 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/defs.h"
 
 #include "wx/control.h"
 #include "wx/defs.h"
 
 #include "wx/control.h"


@@ -40,7 +43,7 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 bool wxControl::Create( wxWindow *parent,
 }
 
 bool wxControl::Create( wxWindow *parent,


@@ -70,13 +73,13 @@ bool wxControl::CreateControl(wxWindow *parent,
 {
     if( !wxControlBase::CreateControl( parent, id, pos, size, style,
                                        validator, name ) )
 {
     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();
 
 
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_font = parent->GetFont();
 

-    return TRUE;
+    return true;

 }
 
 void wxControl::SetLabel(const wxString& label)
 }
 
 void wxControl::SetLabel(const wxString& label)


@@ -99,7 +102,7 @@ wxString wxControl::GetLabel() const
     if (!widget)
         return wxEmptyString;
 
     if (!widget)
         return wxEmptyString;
 

-    XmString text;
+    XmString text = NULL;

     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);


@@ -111,3 +114,16 @@ bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
     return GetEventHandler()->ProcessEvent(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);
+}