Renamed GSocket_SetBlocking to GSocket_SetNonBlocking and *Fallback to *Callback

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 7b3b20428351ed2f6f98c418f9d32920f235ff2b..e4ef0744ed0a6392a402629b274f8a6eb1b4d705 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -13,6 +13,9 @@
 #endif
 
 #include "wx/spinbutt.h"
+
+#ifdef wxUSE_SPINBTN
+
 #include "wx/utils.h"
 #include <math.h>
 
@@ -64,7 +67,6 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
-    event.SetOrientation( wxVERTICAL );
     event.SetEventObject( win );
 
     win->GetEventHandler()->ProcessEvent( event );
@@ -75,17 +77,18 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
 
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
 
-wxSpinButton::wxSpinButton()
-{
-}
-
-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name)
 {
     m_needParent = TRUE;
 
@@ -94,9 +97,12 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     if (new_size.y == -1)
         new_size.y = 30;
 
-    PreCreation( parent, id, pos, new_size, style, name );
-
-//  SetValidator( validator );
+    if (!PreCreation( parent, pos, new_size ) ||
+        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( _T("wxXX creation failed") );
+       return FALSE;
+    }
 
     m_oldPos = 0.0;
 
@@ -198,13 +204,4 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
-//-----------------------------------------------------------------------------
-// wxSpinEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
-{
-}
+#endif