X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9ea011f4d7f66c9728593c5ee10ce2c34964545..fb10f04c957b3712c04ddec92d083209e127b011:/src/gtk1/control.cpp

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 578b12cb9f..c150c147ee 100644
--- 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,29 +32,38 @@ 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 )
 {
     m_label.Empty();
-    for ( const wxChar *pc = label; *pc != _T('\0'); pc++ )
+    for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ )
     {
-        if ( *pc == _T('&') )
+        if ( *pc == wxT('&') )
         {
             pc++; // skip it
 #if 0 // it would be unused anyhow for now - kbd interface not done yet
-            if ( *pc != _T('&') ) m_chAccel = *pc;
+            if ( *pc != wxT('&') ) m_chAccel = *pc;
 #endif
         }
         m_label << *pc;
     }
 }
 
-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);
+}
+