interface additions (mostly for new generic/toolwin)

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index d8f6b14c9d4072fee1fd8a99d6ce8b5b2d99f783..ca1b3a199d36c5f2d8a78ca9aed53876aa30e73d 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -26,30 +26,23 @@ 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
 #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);
     SetValidator(validator);

-}

 #endif
 
 #endif
 

+    return ret;
+}
+

 void wxControl::SetLabel( const wxString &label )
 {
     m_label.Empty();
 void wxControl::SetLabel( const wxString &label )
 {
     m_label.Empty();


@@ -80,7 +73,7 @@ wxSize wxControl::DoGetBestSize() const
     GtkRequisition req;
     req.width = 2;
     req.height = 2;
     GtkRequisition req;
     req.width = 2;
     req.height = 2;

-    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request )
+    (* 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);