X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9abe166a3073d9e9ceb0110429a45adc6517d76f..d3e90957cf70726bba42af977632223ff37439e1:/src/gtk/control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index bbd5ac2fd8..d8f6b14c9d 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/control.h"
 
-#include "gtk/gtkfeatures.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxControl
@@ -36,6 +36,20 @@ wxControl::wxControl( wxWindow *parent,
     (void)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
+
 void wxControl::SetLabel( const wxString &label )
 {
     m_label.Empty();
@@ -58,3 +72,17 @@ 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 );
+
+    return wxSize(req.width, req.height);
+}
+