Fix for bug [ 1351659 ] wxTextValidator::Validate not Unicode safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -311,7 +311,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
|
||||
((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
|
||||
((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
|
||||
((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
|
||||
&& keyCode != '.' && keyCode != ',' && keyCode != '-')
|
||||
&& keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-'))
|
||||
)
|
||||
)
|
||||
{
|
||||
@@ -333,7 +333,7 @@ static bool wxIsNumeric(const wxString& val)
|
||||
{
|
||||
// Allow for "," (French) as well as "." -- in future we should
|
||||
// use wxSystemSettings or other to do better localisation
|
||||
if ((!wxIsdigit(val[i])) && (val[i] != '.') && (val[i] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
|
||||
if ((!wxIsdigit(val[i])) && (val[i] != wxT('.')) && (val[i] != wxT(',')) && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user