Committing in .

[wxWidgets.git] / src / gtk1 / control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 12cc6a70df5651805ab84a1d7797f631f15b4d81..c150c147eec3f1dcd0b3f8c3cef857de35e411f4 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -13,13 +13,13 @@
 
 #include "wx/control.h"
 
-#include "gtk/gtkfeatures.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
@@ -32,8 +32,8 @@ wxControl::wxControl( wxWindow *parent,
                       const wxSize &size,
                       long style,
                       const wxString &name )
-         : wxWindow( parent, id, pos, size, style, name )
 {
+    (void)Create(parent, id, pos, size, style, name);
 }
 
 void wxControl::SetLabel( const wxString &label )
@@ -52,9 +52,18 @@ void wxControl::SetLabel( const wxString &label )
     }
 }
 
-wxString wxControl::GetLabel(void) const
+wxString wxControl::GetLabel() const
 {
     return m_label;
 }
 
 
+wxSize wxControl::DoGetBestSize() const
+{
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+