Moved the check for page scrolling with the wheel into wxMouseEvent so

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

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index b369c4d8c11ac1527db2a57fe5de03b41f440fde..72e2da93ef4b857bc10f17ab66735f2cf17a6f3b 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -11,6 +11,10 @@
 #pragma implementation "control.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_CONTROLS
+
 #include "wx/control.h"
 
 #include <gtk/gtk.h>
@@ -26,30 +30,23 @@ wxControl::wxControl()
     m_needParent = TRUE;
 }
 
-wxControl::wxControl( wxWindow *parent,
+bool wxControl::Create( 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);
-}
-
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+    
 #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);
-}
 #endif
 
+    return ret;
+}
+
 void wxControl::SetLabel( const wxString &label )
 {
     m_label.Empty();
@@ -74,10 +71,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;
-    (* 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);
 }
 
+#endif // wxUSE_CONTROLS
+