X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/887935485423bba2e7eb2b63e933b055af3670da..6e204d57c44bdaaace6b0a45409c00a2af43d8ab:/src/motif/control.cpp

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index e6d45853c9..13b8146af7 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/motif/control.cpp
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -9,15 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "control.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/control.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -40,7 +40,7 @@ wxControl::wxControl()
     m_backgroundColour = *wxWHITE;
     m_foregroundColour = *wxBLACK;
 
-    m_inSetValue = FALSE;
+    m_inSetValue = false;
 }
 
 bool wxControl::Create( wxWindow *parent,
@@ -70,13 +70,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)
@@ -111,3 +111,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);
+}