Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to pass tests

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-13 14:09:39 +00:00
parent 18c8b0ee1d
commit f66c0d497b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/spinctlg.cpp
View File

@@ -533,8 +533,10 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val)
{ {
wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") ); wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") );
if (!InRange(val)) if ( val < m_min )
return false; val = m_min;
if ( val > m_max )
val = m_max;
if ( m_snap_to_ticks && (m_increment != 0) ) if ( m_snap_to_ticks && (m_increment != 0) )
{ {
@@ -577,7 +579,11 @@ double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const
void wxSpinCtrlGenericBase::DoSetRange(double min, double max) void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
{ {
m_min = min; m_min = min;
if ( m_value < m_min )
DoSetValue(m_min);
m_max = max; m_max = max;
if ( m_value > m_max )
DoSetValue(m_max);
} }
void wxSpinCtrlGenericBase::DoSetIncrement(double inc) void wxSpinCtrlGenericBase::DoSetIncrement(double inc)