*** empty log message ***

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index cf1e437da661b143a10be1d71e3087fb7fa1f6bb..d7bbb53e30baffad4e1ace13c2fa3f6f3323cc91 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -14,14 +14,14 @@
 
 #include "wx/spinctrl.h"
 
 
 #include "wx/spinctrl.h"
 

-#ifdef wxUSE_SPINBTN
+#if wxUSE_SPINCTRL

 
 #include "wx/utils.h"
 
 #include "wx/utils.h"

-#include "wx/spinbutt.h"
+

 #include <math.h>
 
 #include <math.h>
 

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

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -30,14 +30,14 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

+static const float sensitivity = 0.02;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 

-static const float sensitivity = 0.02;
-

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "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;
 
     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.SetEventObject( win );

+    event.SetInt( win->GetValue() );

     win->GetEventHandler()->ProcessEvent( event );
     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 );
-    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -205,7 +181,7 @@ void wxSpinCtrl::SetRange(int minVal, int maxVal)
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

-    
+

     // these two calls are required due to some bug in GTK
     Refresh();
     SetFocus();
     // these two calls are required due to some bug in GTK
     Refresh();
     SetFocus();


@@ -221,7 +197,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
             top_frame = top_frame->GetParent();
        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
         while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
             top_frame = top_frame->GetParent();
        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

-       
+

        if (window->default_widget)
         {
             gtk_widget_activate (window->default_widget);
        if (window->default_widget)
         {
             gtk_widget_activate (window->default_widget);


@@ -244,3 +220,4 @@ void wxSpinCtrl::ApplyWidgetStyle()
 }
 
 #endif
 }
 
 #endif

+   // wxUSE_SPINCTRL