wxSpinButton works ok with negative values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 4b77d0f7b7700c2b4c82f2f44fdfdfa065e0a3c5..f0bb51550bbcc95e0c48ea4642bd26ab1951320f 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -549,7 +549,8 @@ m_text(NULL), m_notebook(NULL)
     m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
 #ifndef __WIN16__
     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
-    m_spinbutton->SetRange(0,100);
+    m_spinbutton->SetRange(-10,30);
+    m_spinbutton->SetValue(-5);
 #endif
     m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
@@ -885,8 +886,14 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 void MyPanel::OnSpinUpdate( wxSpinEvent &event )
 {
     wxString value;
-    value.sprintf( "%d", (int)event.GetPosition() );
+    value.Printf( "%d", event.GetPosition() );
     m_spintext->SetValue( value );
+
+    value.Printf("Spin control range: (%d, %d), current = %d\n",
+                 m_spinbutton->GetMin(), m_spinbutton->GetMax(),
+                 m_spinbutton->GetValue());
+
+    m_text->AppendText(value);
 }
 #endif
 

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 392310c3f9f1635a29c0bf7cadf8847b9e7b697c..044f6270e369fcda3b37199f35761ef31354fc49 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -25,37 +25,39 @@
 
 extern bool   g_blockEventsOnDrag;
 
+static const float sensitivity = 0.2;
+
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
-{ 
+{
     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
 
     float diff = win->m_adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;
     win->m_oldPos = win->m_adjust->value;
-  
+
     wxEventType command = wxEVT_NULL;
-  
+
     float line_step = win->m_adjust->step_increment;
     float page_step = win->m_adjust->page_increment;
-  
-    if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+
+    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
+    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+    else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
+    else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
-    int value = (int)(win->m_adjust->value+0.5);
-      
+    int value = ceil(win->m_adjust->value);
+
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     event.SetOrientation( wxVERTICAL );
     event.SetEventObject( win );
-  
+
     win->GetEventHandler()->ProcessEvent( event );
 }
 
@@ -77,38 +79,39 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
             long style, const wxString& name)
 {
     m_needParent = TRUE;
-  
+
     wxSize new_size = size;
     new_size.x = 16;
-    if (new_size.y == -1) new_size.y = 30;
-  
+    if (new_size.y == -1)
+        new_size.y = 30;
+
     PreCreation( parent, id, pos, new_size, style, name );
-  
+
 //  SetValidator( validator );
 
     m_oldPos = 0.0;
 
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
-  
+
     m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
-    
+
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
-       
-    gtk_signal_connect( GTK_OBJECT (m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",
-                       (GtkSignalFunc) gtk_spinbutt_callback, 
-                       (gpointer) this );
-  
+                        (GtkSignalFunc) gtk_spinbutt_callback,
+                        (gpointer) this );
+
     m_parent->AddChild( this );
 
     (m_parent->m_insertCallback)( m_parent, this );
-  
+
     PostCreation();
-  
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -119,50 +122,50 @@ wxSpinButton::~wxSpinButton()
 int wxSpinButton::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->lower+0.5);
+
+    return ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->upper+0.5);
+
+    return ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->value+0.5);
+
+    return ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     float fpos = (float)value;
     m_oldPos = fpos;
-    if (fabs(fpos-m_adjust->value) < 0.2) return;
-    
+    if (fabs(fpos-m_adjust->value) < sensitivity) return;
+
     m_adjust->value = fpos;
-  
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     float fmin = (float)minVal;
     float fmax = (float)maxVal;
-      
-    if ((fabs(fmin-m_adjust->lower) < 0.2) &&
-        (fabs(fmax-m_adjust->upper) < 0.2))
+
+    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
+        (fabs(fmax-m_adjust->upper) < sensitivity))
     {
         return;
     }
-      
+
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
@@ -172,7 +175,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     m_width = 16;
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 392310c3f9f1635a29c0bf7cadf8847b9e7b697c..044f6270e369fcda3b37199f35761ef31354fc49 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -25,37 +25,39 @@
 
 extern bool   g_blockEventsOnDrag;
 
+static const float sensitivity = 0.2;
+
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
-{ 
+{
     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
 
     float diff = win->m_adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;
     win->m_oldPos = win->m_adjust->value;
-  
+
     wxEventType command = wxEVT_NULL;
-  
+
     float line_step = win->m_adjust->step_increment;
     float page_step = win->m_adjust->page_increment;
-  
-    if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+
+    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
+    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+    else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
+    else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
-    int value = (int)(win->m_adjust->value+0.5);
-      
+    int value = ceil(win->m_adjust->value);
+
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     event.SetOrientation( wxVERTICAL );
     event.SetEventObject( win );
-  
+
     win->GetEventHandler()->ProcessEvent( event );
 }
 
@@ -77,38 +79,39 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
             long style, const wxString& name)
 {
     m_needParent = TRUE;
-  
+
     wxSize new_size = size;
     new_size.x = 16;
-    if (new_size.y == -1) new_size.y = 30;
-  
+    if (new_size.y == -1)
+        new_size.y = 30;
+
     PreCreation( parent, id, pos, new_size, style, name );
-  
+
 //  SetValidator( validator );
 
     m_oldPos = 0.0;
 
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
-  
+
     m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
-    
+
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
-       
-    gtk_signal_connect( GTK_OBJECT (m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",
-                       (GtkSignalFunc) gtk_spinbutt_callback, 
-                       (gpointer) this );
-  
+                        (GtkSignalFunc) gtk_spinbutt_callback,
+                        (gpointer) this );
+
     m_parent->AddChild( this );
 
     (m_parent->m_insertCallback)( m_parent, this );
-  
+
     PostCreation();
-  
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -119,50 +122,50 @@ wxSpinButton::~wxSpinButton()
 int wxSpinButton::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->lower+0.5);
+
+    return ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->upper+0.5);
+
+    return ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-    return (int)(m_adjust->value+0.5);
+
+    return ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     float fpos = (float)value;
     m_oldPos = fpos;
-    if (fabs(fpos-m_adjust->value) < 0.2) return;
-    
+    if (fabs(fpos-m_adjust->value) < sensitivity) return;
+
     m_adjust->value = fpos;
-  
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     float fmin = (float)minVal;
     float fmax = (float)maxVal;
-      
-    if ((fabs(fmin-m_adjust->lower) < 0.2) &&
-        (fabs(fmax-m_adjust->upper) < 0.2))
+
+    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
+        (fabs(fmax-m_adjust->upper) < sensitivity))
     {
         return;
     }
-      
+
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
@@ -172,7 +175,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
+
     m_width = 16;
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }