another small error

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 69e7a9a0b2313bed46d693d94b4dfb682d5e6f1c..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -13,49 +13,69 @@
 
 #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(void)
+wxControl::wxControl()
 {
     m_needParent = TRUE;
 }
 
-wxControl::wxControl( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name ) :
-  wxWindow( parent, id, pos, size, style, name )
+bool wxControl::Create( wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint &pos,
+                      const wxSize &size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString &name )
 {
-}
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+    
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
 
-void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
-{
+    return ret;
 }
 
 void wxControl::SetLabel( const wxString &label )
 {
-    m_label = _T("");
-    for ( const wxChar *pc = label; *pc != _T('\0'); pc++ ) 
+    m_label.Empty();
+    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
+{
+    // 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_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+