corrected pragma interface/implementation for Mac OS X

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index d8f6b14c9d4072fee1fd8a99d6ce8b5b2d99f783..72e2da93ef4b857bc10f17ab66735f2cf17a6f3b 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -11,6 +11,10 @@
 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_CONTROLS
+

 #include "wx/control.h"
 
 #include <gtk/gtk.h>
 #include "wx/control.h"
 
 #include <gtk/gtk.h>


@@ -26,30 +30,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,9 +77,11 @@ 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);
 }
 

+#endif // wxUSE_CONTROLS
+