Fixed wxHTML code in a Watcom Win32 DLL

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index c150c147eec3f1dcd0b3f8c3cef857de35e411f4..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -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 )


@@ -60,8 +67,13 @@ wxString wxControl::GetLabel() const
 
 wxSize wxControl::DoGetBestSize() const
 {
 
 wxSize wxControl::DoGetBestSize() const
 {

+    // Do not return any arbitrary default value...
+    wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+

     GtkRequisition req;
     GtkRequisition req;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    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);
         (m_widget, &req );
 
     return wxSize(req.width, req.height);