X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/071a2d78147df569d57b1ef138ab126a586b594d..f5ba273ecd799f652736ce2bc830283787302a56:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index c150c147ee..a167406a88 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -26,14 +26,21 @@ 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 ) { - (void)Create(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 ) @@ -60,7 +67,12 @@ wxString wxControl::GetLabel() const 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(m_widget)->klass )->size_request ) (m_widget, &req );