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

I suppose text validators may take Unicode input as well.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-03-25 23:05:30 +00:00
parent 659755d7c2
commit 12c1498d81
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/valtext.cpp
View File

@@ -98,7 +98,7 @@ static bool wxIsAlpha(const wxString& val)
int i; int i;
for ( i = 0; i < (int)val.Length(); i++) for ( i = 0; i < (int)val.Length(); i++)
{ {
if (!isalpha(val[i])) if (!wxIsalpha(val[i]))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@@ -109,7 +109,7 @@ static bool wxIsAlphaNumeric(const wxString& val)
int i; int i;
for ( i = 0; i < (int)val.Length(); i++) for ( i = 0; i < (int)val.Length(); i++)
{ {
if (!isalnum(val[i])) if (!wxIsalnum(val[i]))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@@ -276,9 +276,9 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
!(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) && !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
( (
((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) || ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode)) || ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
((m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
&& keyCode != '.' && keyCode != ',' && keyCode != '-') && keyCode != '.' && keyCode != ',' && keyCode != '-')
) )
) )