1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-06 06:31:07 +01:00

Steve's patch for bug 681 "New number input validation breaks several Nyquist plug-ins". It looks sensible and has only a limited scope.

This commit is contained in:
martynshaw99
2013-12-31 00:19:52 +00:00
parent 65e4f56126
commit afe1f36522
5 changed files with 81 additions and 23 deletions

View File

@@ -52,6 +52,12 @@ int wxNumValidatorBase::GetFormatFlags() const
flags |= wxNumberFormatter::Style_WithThousandsSep;
if ( m_style & wxNUM_VAL_NO_TRAILING_ZEROES )
flags |= wxNumberFormatter::Style_NoTrailingZeroes;
if ( m_style & wxNUM_VAL_ONE_TRAILING_ZERO )
flags |= wxNumberFormatter::Style_OneTrailingZero;
if ( m_style & wxNUM_VAL_TWO_TRAILING_ZEROES )
flags |= wxNumberFormatter::Style_TwoTrailingZeroes;
if ( m_style & wxNUM_VAL_THREE_TRAILING_ZEROES )
flags |= wxNumberFormatter::Style_ThreeTrailingZeroes;
return flags;
}
@@ -227,6 +233,13 @@ wxIntegerValidatorBase::IsCharOk(const wxString& val, int pos, wxChar ch) const
if ( !FromString(GetValueAfterInsertingChar(val, pos, ch), &value) )
return false;
wxString smin = ToString(m_min);
wxString smax = ToString(m_max);
if ( pos < (int) smin.Length() )
return true;
if ( pos < (int) smax.Length() - 1 )
return true;
return IsInRange(value);
}