Also check for range on Mac's spin controls.

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 20c43cef8f1e805b099006f196ca4b1195e88f49..b3fd3830b1a102f3c160f5b8ca488ecd61d38f1b 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -87,7 +87,12 @@ int wxSpinButton::GetMax() const
 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {

-    return m_value;
+    int n = m_value;
+
+    if (n < m_min) n = m_min;
+    if (n > m_max) n = m_max;
+
+    return n;

 }
 
 void wxSpinButton::SetValue(int val)
 }
 
 void wxSpinButton::SetValue(int val)

diff --git a/src/mac/classic/spinbutt.cpp b/src/mac/classic/spinbutt.cpp
index 3d1cd44c21e6be82d4d4851c4cec90bfbed03e41..22e5baa67daed227be7fe758b2451a59c69ca25d 100644 (file)
--- a/src/mac/classic/spinbutt.cpp
+++ b/src/mac/classic/spinbutt.cpp
@@ -86,7 +86,12 @@ int wxSpinButton::GetMax() const
 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {

-    return m_value;
+    int n = m_value;
+
+    if (n < m_min) n = m_min;
+    if (n > m_max) n = m_max;
+
+    return n;

 }
 
 void wxSpinButton::SetValue(int val)
 }
 
 void wxSpinButton::SetValue(int val)