X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3bf7524f394af039efe196a186f7969cbabcc19..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 6b5b4c9162..e783854df5 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -9,9 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "control.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/defs.h" @@ -40,7 +39,7 @@ wxControl::wxControl() m_backgroundColour = *wxWHITE; m_foregroundColour = *wxBLACK; - m_inSetValue = FALSE; + m_inSetValue = false; } bool wxControl::Create( wxWindow *parent, @@ -70,13 +69,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) @@ -99,7 +98,7 @@ wxString wxControl::GetLabel() const if (!widget) return wxEmptyString; - XmString text; + XmString text = NULL; XtVaGetValues (widget, XmNlabelString, &text, NULL); @@ -111,3 +110,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); +}