X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93488eee91771528926ec2ef0664bc4d2f15a100..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/motif/control.cpp?ds=sidebyside diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 6413b92103..2f503b86ae 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#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" #include "wx/control.h" @@ -27,6 +30,8 @@ #pragma message enable nosimpint #endif +#include "wx/motif/private.h" + IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) @@ -38,11 +43,7 @@ wxControl::wxControl() m_backgroundColour = *wxWHITE; m_foregroundColour = *wxBLACK; -#if WXWIN_COMPATIBILITY - m_callback = 0; -#endif // WXWIN_COMPATIBILITY - - m_inSetValue = FALSE; + m_inSetValue = false; } bool wxControl::Create( wxWindow *parent, @@ -62,12 +63,23 @@ bool wxControl::Create( wxWindow *parent, return ret; } -wxControl::~wxControl() +bool wxControl::CreateControl(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - // If we delete an item, we should initialize the parent panel, - // because it could now be invalid. - if ( GetParent()->panel->GetDefaultItem() == this) - panel->SetDefaultItem(NULL); + if( !wxControlBase::CreateControl( parent, id, pos, size, style, + validator, name ) ) + return false; + + m_backgroundColour = parent->GetBackgroundColour(); + m_foregroundColour = parent->GetForegroundColour(); + m_font = parent->GetFont(); + + return true; } void wxControl::SetLabel(const wxString& label) @@ -76,14 +88,12 @@ void wxControl::SetLabel(const wxString& label) if (!widget) return; - wxStripMenuCodes((char*) (const char*) label, wxBuffer); + wxXmString label_str(wxStripMenuCodes(label)); - XmString text = XmStringCreateSimple (wxBuffer); XtVaSetValues (widget, - XmNlabelString, text, + XmNlabelString, label_str(), XmNlabelType, XmSTRING, NULL); - XmStringFree (text); } wxString wxControl::GetLabel() const @@ -92,37 +102,28 @@ wxString wxControl::GetLabel() const if (!widget) return wxEmptyString; - XmString text; - char *s; + XmString text = NULL; XtVaGetValues (widget, XmNlabelString, &text, NULL); - if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) - { - wxString str(s); - XtFree (s); - XmStringFree(text); - return str; - } - else - { - // XmStringFree(text); - return wxEmptyString; - } + return wxXmStringToString( text ); } bool wxControl::ProcessCommand(wxCommandEvent & event) { -#if WXWIN_COMPATIBILITY - if ( m_callback ) - { - (void)(*m_callback)(this, event); + return GetEventHandler()->ProcessEvent(event); +} + +wxSize wxControl::DoGetBestSize() const +{ + Widget w = (Widget)GetTopWidget(); - return TRUE; - } - else -#endif // WXWIN_COMPATIBILITY + // Do not return any arbitrary default value... + wxASSERT_MSG (w, wxT("DoGetBestSize called before creation")); - return GetEventHandler()->ProcessEvent(event); + XtWidgetGeometry preferred; + XtQueryGeometry (w, NULL, &preferred); + + return wxSize(preferred.width, preferred.height); }