AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index a0b88f5944d1e0b7ba7c1a4139d5d38c0c8dc40a..72e2da93ef4b857bc10f17ab66735f2cf17a6f3b 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -11,9 +11,13 @@
 #pragma implementation "control.h"
 #endif
 
 #pragma implementation "control.h"
 #endif
 

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

 #include "wx/control.h"
 
 #include "wx/control.h"
 

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

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


@@ -26,14 +30,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,10 +71,17 @@ 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);
 }
 

+#endif // wxUSE_CONTROLS
+