X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bb6408c2631988fab9925014c6619358bf867de..fc32630a5e03e60a67d4ef53fc59985ea087b451:/src/motif/control.cpp?ds=inline diff --git a/src/motif/control.cpp b/src/motif/control.cpp index aa0baba9eb..0924e49ef4 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -1,95 +1,119 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: src/motif/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "control.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/control.h" -#if !USE_SHARED_LIBRARY +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/panel.h" +#endif + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif +#include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +#include "wx/motif/private.h" + IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) BEGIN_EVENT_TABLE(wxControl, wxWindow) END_EVENT_TABLE() -#endif // Item members wxControl::wxControl() { - m_backgroundColour = *wxWHITE; - m_foregroundColour = *wxBLACK; - m_callback = 0; + m_inSetValue = false; } -wxControl::~wxControl() +bool wxControl::Create( 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. - wxWindow *parent = (wxWindow *)GetParent(); - if (parent) - { - if (parent->GetDefaultItem() == (wxButton*) this) - parent->SetDefaultItem(NULL); - } + bool ret = wxWindow::Create(parent, id, pos, size, style, name); + +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif + + return ret; +} + +bool wxControl::CreateControl(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) +{ + if( !wxControlBase::CreateControl( parent, id, pos, size, style, + validator, name ) ) + return false; + + return true; } void wxControl::SetLabel(const wxString& label) { - // TODO + Widget widget = (Widget) GetLabelWidget() ; + if (!widget) + return; + + wxXmString label_str(GetLabelText(label)); + + XtVaSetValues (widget, + XmNlabelString, label_str(), + XmNlabelType, XmSTRING, + NULL); } wxString wxControl::GetLabel() const { - // TODO - return wxString(""); + Widget widget = (Widget) GetLabelWidget() ; + if (!widget) + return wxEmptyString; + + XmString text = NULL; + XtVaGetValues (widget, + XmNlabelString, &text, + NULL); + + return wxXmStringToString( text ); } -void wxControl::ProcessCommand (wxCommandEvent & event) +bool wxControl::ProcessCommand(wxCommandEvent & event) { - // Tries: - // 1) A callback function (to become obsolete) - // 2) OnCommand, starting at this window and working up parent hierarchy - // 3) OnCommand then calls ProcessEvent to search the event tables. - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - } - else - { - GetEventHandler()->OnCommand(*this, event); - } + return HandleWindowEvent(event); } -void wxControl::Centre (int direction) +wxSize wxControl::DoGetBestSize() const { - int x, y, width, height, panel_width, panel_height, new_x, new_y; - - wxWindow *parent = (wxWindow *) GetParent (); - if (!parent) - return; - - parent->GetClientSize (&panel_width, &panel_height); - GetSize (&width, &height); - GetPosition (&x, &y); + Widget w = (Widget)GetTopWidget(); - new_x = x; - new_y = y; + // Do not return any arbitrary default value... + wxASSERT_MSG (w, wxT("DoGetBestSize called before creation")); - if (direction & wxHORIZONTAL) - new_x = (int) ((panel_width - width) / 2); + XtWidgetGeometry preferred; + XtQueryGeometry (w, NULL, &preferred); - if (direction & wxVERTICAL) - new_y = (int) ((panel_height - height) / 2); - - SetSize (new_x, new_y, width, height); + return wxSize(preferred.width, preferred.height); } -