X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..d3bfec747ddf7b27e6f41f0117cd5cd6755fe021:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 12cc6a70df..72e2da93ef 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -11,29 +11,40 @@ #pragma implementation "control.h" #endif +#include "wx/defs.h" + +#if wxUSE_CONTROLS + #include "wx/control.h" -#include "gtk/gtkfeatures.h" +#include //----------------------------------------------------------------------------- // wxControl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { m_needParent = TRUE; } -wxControl::wxControl( wxWindow *parent, +bool wxControl::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, + const wxValidator& validator, const wxString &name ) - : wxWindow( parent, id, pos, size, style, name ) { + bool ret = wxWindow::Create(parent, id, pos, size, style, name); + +#if wxUSE_VALIDATORS + SetValidator(validator); +#endif + + return ret; } void wxControl::SetLabel( const wxString &label ) @@ -52,9 +63,25 @@ void wxControl::SetLabel( const wxString &label ) } } -wxString wxControl::GetLabel(void) const +wxString wxControl::GetLabel() const { return m_label; } +wxSize wxControl::DoGetBestSize() const +{ + // Do not return any arbitrary default value... + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); + + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); + + return wxSize(req.width, req.height); +} + +#endif // wxUSE_CONTROLS +