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

Applied custom character filter patch for text validator

Browse Source 
Corrected typo in spinbutt.tex


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-14 11:05:18 +00:00
parent ea323db37d
commit aaae829664
5 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/valtext.cpp
View File

@@ -170,6 +170,18 @@ bool wxTextValidator::Validate(wxWindow *parent)
errormsg = _("'%s' should be numeric.");
}
else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(val))
{
//it's only ok to have the members of the list
errormsg = _("'%s' is invalid");
ok = FALSE;
}
else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(val))
{
// it's only ok to have non-members of the list
errormsg = _("'%s' is invalid");
ok = FALSE;
}
if ( !ok )
{
@@ -262,6 +274,8 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
if (
!(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
(
((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((char) keyCode, 1))) ||
((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) keyCode, 1))) ||
((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
@@ -295,5 +309,27 @@ static bool wxIsNumeric(const wxString& val)
return TRUE;
}
bool wxTextValidator::IsInCharIncludeList(const wxString& val)
{
size_t i;
for ( i = 0; i < val.Length(); i++)
{
if (!m_includeList.Member((wxString) val[i]))
return FALSE;
}
return TRUE;
}
bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
{
size_t i;
for ( i = 0; i < val.Length(); i++)
{
if (m_excludeList.Member((wxString) val[i]))
return FALSE;
}
return TRUE;
}
#endif
// wxUSE_VALIDATORS