Casting to GdkColormapPrivate is neither possible nor necessary in

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 959092087b2c1bc732a1eb0622be9c842f926afb..a167406a882b05d64d5dc1a5740e49b3b51b727e 100644 (file)
--- 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 );