From 6511d3078ecd1b1673de4a050a5130de971f77ab Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 28 Dec 2004 15:59:22 +0000 Subject: [PATCH] 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 --- src/mac/carbon/spinbutt.cpp | 7 ++++++- src/mac/classic/spinbutt.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index 20c43cef8f..b3fd3830b1 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -87,7 +87,12 @@ int wxSpinButton::GetMax() 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) diff --git a/src/mac/classic/spinbutt.cpp b/src/mac/classic/spinbutt.cpp index 3d1cd44c21..22e5baa67d 100644 --- a/src/mac/classic/spinbutt.cpp +++ b/src/mac/classic/spinbutt.cpp @@ -86,7 +86,12 @@ int wxSpinButton::GetMax() 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) -- 2.49.0