wxSpinCtrl values are always integral, they don't need to be rounded

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

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 9c18c06a6b2cd79722cb81beb83b78f5a676f3f3..41fc00cb1b339980c2373f9fe19971dcd4b8ed6f 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -264,11 +264,10 @@ public:
     }
 
     // accessors
     }
 
     // accessors

-    int GetValue(wxSPINCTRL_GETVALUE_FIX) const
-        { return wxRound( DoGetValue() ); }
-    int GetMin() const       { return wxRound( m_min ); }
-    int GetMax() const       { return wxRound( m_max ); }
-    int GetIncrement() const { return wxRound( m_increment ); }
+    int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue()); }
+    int GetMin() const { return int(m_min); }
+    int GetMax() const { return int(m_max); }
+    int GetIncrement() const { return int(m_increment); }

 
     // operations
     void SetValue(const wxString& value)
 
     // operations
     void SetValue(const wxString& value)

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 39dc35089b6af8a00b0c08d96340670651882c10..f9924ed224cf37bf7019122fd35c91b42c6794e9 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -117,10 +117,10 @@ public:
     }
 
     // accessors
     }
 
     // accessors

-    int GetValue() const     { return wxRound( DoGetValue() ); }
-    int GetMin() const       { return wxRound( DoGetMin() ); }
-    int GetMax() const       { return wxRound( DoGetMax() ); }
-    int GetIncrement() const { return wxRound( DoGetIncrement() ); }
+    int GetValue() const { return int(DoGetValue()); }
+    int GetMin() const { return int(DoGetMin()); }
+    int GetMax() const { return int(DoGetMax()); }
+    int GetIncrement() const { return int(DoGetIncrement()); }

 
     // operations
     void SetValue(const wxString& value)    { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc
 
     // operations
     void SetValue(const wxString& value)    { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index bae8e7ea5b27b68dd9e4b3d26c9359591a5cfc11..6ba4071d2833e7138ea2d65eba3dc7d927ca66d3 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -218,9 +218,6 @@ void wxSpinCtrlGTKBase::DoSetValue( double value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 

-    if (wxIsKindOf(this, wxSpinCtrl))
-        value = wxRound( value );
-

     GtkDisableEvents();
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
     GtkEnableEvents();
     GtkDisableEvents();
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
     GtkEnableEvents();