AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make wxTextValidator validation error messages more informative.

Browse Source 
Saying that "something is invalid" really doesn't help much at all, so try to
be at least a bit more informative.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-12-29 00:01:47 +00:00
parent 39edfa27a2
commit a425e9f70d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/valtext.cpp
View File

@ -162,9 +162,9 @@ bool wxTextValidator::Validate(wxWindow *parent)
if ( HasFlag(wxFILTER_EMPTY) && val.empty() )
errormsg = _("Required information entry is empty.");
else if ( HasFlag(wxFILTER_INCLUDE_LIST) && m_includes.Index(val) == wxNOT_FOUND )
errormsg = wxString::Format(_("'%s' is invalid"), val);
errormsg = wxString::Format(_("'%s' is not one of the valid strings"), val);
else if ( HasFlag(wxFILTER_EXCLUDE_LIST) && m_excludes.Index(val) != wxNOT_FOUND )
errormsg = wxString::Format(_("'%s' is invalid"), val);
errormsg = wxString::Format(_("'%s' is one of the invalid strings"), val);
else if ( !(errormsg = IsValid(val)).empty() )
{
// NB: this format string should always contain exactly one '%s'
@ -251,9 +251,9 @@ wxString wxTextValidator::IsValid(const wxString& val) const
if ( HasFlag(wxFILTER_NUMERIC) && !wxIsNumeric(val) )
return _("'%s' should be numeric.");
if ( HasFlag(wxFILTER_INCLUDE_CHAR_LIST) && !ContainsOnlyIncludedCharacters(val) )
return _("'%s' is invalid");
return _("'%s' doesn't consist only of valid characters");
if ( HasFlag(wxFILTER_EXCLUDE_CHAR_LIST) && ContainsExcludedCharacters(val) )
return _("'%s' is invalid");
return _("'%s' contains illegal characters");
return wxEmptyString;
}