X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0279e8448266e474d07bf7e3b0635f2a53fcc8b8..307fc8d5821e4dcffd7f2975ce62791c5f37982d:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 959092087b..a167406a88 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -26,30 +26,23 @@ 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 -wxControl::wxControl( 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); SetValidator(validator); -} #endif + return ret; +} + void wxControl::SetLabel( const wxString &label ) { m_label.Empty(); @@ -78,6 +71,8 @@ wxSize wxControl::DoGetBestSize() const 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 );