X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e0d88570a0605c9254d4f188dfb9d9ee9268e5a..5ea6dbbfff67d1dfad08044ab721ba56425ef6e1:/src/gtk/spinctrl.cpp

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 15775b251e..d7bbb53e30 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -17,11 +17,11 @@
 #if wxUSE_SPINCTRL
 
 #include "wx/utils.h"
-#include "wx/spinbutt.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -30,14 +30,14 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
+static const float sensitivity = 0.02;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 
-static const float sensitivity = 0.02;
-
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
@@ -49,34 +49,10 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    float diff = win->m_adjust->value - win->m_oldPos;
-    if (fabs(diff) < sensitivity) return;
-    win->m_oldPos = win->m_adjust->value;
-
-    wxEventType command = wxEVT_NULL;
-
-    float line_step = win->m_adjust->step_increment;
-
-    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
-    else command = wxEVT_SCROLL_THUMBTRACK;
-
-    int value = (int)ceil(win->m_adjust->value);
-
-    wxSpinEvent event( command, win->GetId());
-    event.SetPosition( value );
+    wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
     event.SetEventObject( win );
+    event.SetInt( win->GetValue() );
     win->GetEventHandler()->ProcessEvent( event );
-
-    /* always send a thumbtrack event */
-    if (command != wxEVT_SCROLL_THUMBTRACK)
-    {
-        command = wxEVT_SCROLL_THUMBTRACK;
-        wxSpinEvent event2( command, win->GetId());
-        event2.SetPosition( value );
-        event2.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( event2 );
-    }
 }
 
 //-----------------------------------------------------------------------------
@@ -244,3 +220,4 @@ void wxSpinCtrl::ApplyWidgetStyle()
 }
 
 #endif
+   // wxUSE_SPINCTRL