corrected use of Print Manager Session APIs for Carbon targets

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index bbd5ac2fd8e5bd86b269943f5faea7df1eb7deb4..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-#include "gtk/gtkfeatures.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxControl
 
 //-----------------------------------------------------------------------------
 // wxControl


@@ -26,14 +26,21 @@ wxControl::wxControl()
     m_needParent = TRUE;
 }
 
     m_needParent = TRUE;
 }
 

-wxControl::wxControl( wxWindow *parent,
+bool wxControl::Create( wxWindow *parent,

                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,
                       long style,
                       wxWindowID id,
                       const wxPoint &pos,
                       const wxSize &size,
                       long style,

+                      const wxValidator& validator,

                       const wxString &name )
 {
                       const wxString &name )
 {

-    (void)Create(parent, id, pos, size, style, name);
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+    
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    return ret;

 }
 
 void wxControl::SetLabel( const wxString &label )
 }
 
 void wxControl::SetLabel( const wxString &label )


@@ -58,3 +65,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_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+