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

fixed Unicode-mode only bug in Validate()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-19 15:21:55 +00:00
parent ec64d63207
commit e90867579b
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/valtext.cpp
View File

@@ -132,21 +132,18 @@ bool wxTextValidator::Validate(wxWindow *parent)
bool ok = TRUE; bool ok = TRUE;
// this format string should contian exactly one '%s' // NB: this format string should contian exactly one '%s'
const wxChar *errormsg = _("'%s' is invalid"); wxString errormsg;
if ( m_validatorStyle & wxFILTER_INCLUDE_LIST ) bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
{ {
if ( !m_includeList.Member(val) ) // if includeList, it's only ok to have the members of the list,
// otherwise it's only ok to have non-members
ok = includeList == m_includeList.Member(val);
if ( !ok )
{ {
ok = FALSE; errormsg = _("'%s' is invalid");
}
}
else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
{
if ( m_excludeList.Member(val) )
{
ok = FALSE;
} }
} }
else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() ) else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
@@ -176,6 +173,8 @@ bool wxTextValidator::Validate(wxWindow *parent)
if ( !ok ) if ( !ok )
{ {
wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
m_validatorWindow->SetFocus(); m_validatorWindow->SetFocus();
wxString buf; wxString buf;