also fix handling of wxSP_ARROW_KEYS|wxSP_WRAP (see #10565)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index ed23baec671be3b5ef21ff0b7723ca0b0a2c5713..fda269e22e5a7026ca5457513923f3ee9984db08 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -557,6 +557,7 @@ wxMSW:
   by modern apps.
 - Ellipsize long strings in wxStatusBar (Francesco Montorsi)
 - Fix spurious repaint when changing tooltip text (Jonathan Liu).
   by modern apps.
 - Ellipsize long strings in wxStatusBar (Francesco Montorsi)
 - Fix spurious repaint when changing tooltip text (Jonathan Liu).

+- Fix wxSP_WRAP and wxSP_ARROW_KEYS in wxSpinCtrlDouble (Andrew Radke).

 
 wxX11:
 
 
 wxX11:
 

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index d01f8ba5bc32b2eaf3c5dda19a1b103aed852321..dbae5a17f0f685cff41e157b7527d109121a6307 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -110,8 +110,13 @@ protected:
     // Send the correct event type
     virtual void DoSendEvent() = 0;
 
     // Send the correct event type
     virtual void DoSendEvent() = 0;
 

+    // check if the value is in range

     bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
 
     bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
 

+    // ensure that the value is in range wrapping it round if necessary
+    double AdjustToFitInRange(double value) const;
+
+

     double m_value;
     double m_min;
     double m_max;
     double m_value;
     double m_min;
     double m_max;

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index 21e2d60d974c5daf4bdb19e916a8243469c094ff..853b967500d96462293f009ce3ab774de15db7f9 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -338,13 +338,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
     if (((spin_value >= 0) && (m_spin_value >= 0)) || ((spin_value <= 0) && (m_spin_value <= 0)))
         step *= abs(spin_value - m_spin_value);
 
     if (((spin_value >= 0) && (m_spin_value >= 0)) || ((spin_value <= 0) && (m_spin_value <= 0)))
         step *= abs(spin_value - m_spin_value);
 

-    double value = m_value + step*m_increment;
-
-    // Check for over/underflow wrapping around if necessary
-    if (value < m_min)
-        value = HasFlag(wxSP_WRAP) ? m_max : m_min;
-    if (value > m_max)
-        value = HasFlag(wxSP_WRAP) ? m_min : m_max;
+    double value = AdjustToFitInRange(m_value + step*m_increment);

 
     // Ignore the edges when it wraps since the up/down event may be opposite
     // They are in GTK and Mac
 
     // Ignore the edges when it wraps since the up/down event may be opposite
     // They are in GTK and Mac


@@ -356,7 +350,7 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
 
     m_spin_value = spin_value;
 
 
     m_spin_value = spin_value;
 

-    if (InRange(value) && DoSetValue(value))
+    if ( DoSetValue(value) )

         DoSendEvent();
 }
 
         DoSendEvent();
 }
 


@@ -399,6 +393,8 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
             return;
     }
 
             return;
     }
 

+    value = AdjustToFitInRange(value);
+

     if ( m_textCtrl && m_textCtrl->IsModified() )
         SyncSpinToText();
 
     if ( m_textCtrl && m_textCtrl->IsModified() )
         SyncSpinToText();
 


@@ -489,6 +485,16 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
     return false;
 }
 
     return false;
 }
 

+double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const
+{
+    if (value < m_min)
+        value = HasFlag(wxSP_WRAP) ? m_max : m_min;
+    if (value > m_max)
+        value = HasFlag(wxSP_WRAP) ? m_min : m_max;
+
+    return value;
+}
+

 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;
 void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
 {
     m_min = min;