Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -76,7 +76,7 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
|
||||
m_includeList = val.m_includeList;
|
||||
m_excludeList = val.m_excludeList;
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
wxTextValidator::~wxTextValidator()
|
||||
@@ -89,9 +89,9 @@ static bool wxIsAlpha(const wxString& val)
|
||||
for ( i = 0; i < (int)val.Length(); i++)
|
||||
{
|
||||
if (!wxIsalpha(val[i]))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool wxIsAlphaNumeric(const wxString& val)
|
||||
@@ -100,9 +100,9 @@ static bool wxIsAlphaNumeric(const wxString& val)
|
||||
for ( i = 0; i < (int)val.Length(); i++)
|
||||
{
|
||||
if (!wxIsalnum(val[i]))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called when the value in the window must be validated.
|
||||
@@ -110,17 +110,17 @@ static bool wxIsAlphaNumeric(const wxString& val)
|
||||
bool wxTextValidator::Validate(wxWindow *parent)
|
||||
{
|
||||
if( !CheckValidator() )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
|
||||
|
||||
// If window is disabled, simply return
|
||||
if ( !control->IsEnabled() )
|
||||
return TRUE;
|
||||
return true;
|
||||
|
||||
wxString val(control->GetValue());
|
||||
|
||||
bool ok = TRUE;
|
||||
bool ok = true;
|
||||
|
||||
// NB: this format string should contian exactly one '%s'
|
||||
wxString errormsg;
|
||||
@@ -138,25 +138,25 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
||||
}
|
||||
else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
|
||||
{
|
||||
ok = FALSE;
|
||||
ok = false;
|
||||
|
||||
errormsg = _("'%s' should only contain ASCII characters.");
|
||||
}
|
||||
else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
|
||||
{
|
||||
ok = FALSE;
|
||||
ok = false;
|
||||
|
||||
errormsg = _("'%s' should only contain alphabetic characters.");
|
||||
}
|
||||
else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
|
||||
{
|
||||
ok = FALSE;
|
||||
ok = false;
|
||||
|
||||
errormsg = _("'%s' should only contain alphabetic or numeric characters.");
|
||||
}
|
||||
else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
|
||||
{
|
||||
ok = FALSE;
|
||||
ok = false;
|
||||
|
||||
errormsg = _("'%s' should be numeric.");
|
||||
}
|
||||
@@ -164,13 +164,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
||||
{
|
||||
//it's only ok to have the members of the list
|
||||
errormsg = _("'%s' is invalid");
|
||||
ok = FALSE;
|
||||
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;
|
||||
ok = false;
|
||||
}
|
||||
|
||||
if ( !ok )
|
||||
@@ -193,7 +193,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
||||
bool wxTextValidator::TransferToWindow(void)
|
||||
{
|
||||
if( !CheckValidator() )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
if ( m_stringValue )
|
||||
{
|
||||
@@ -201,14 +201,14 @@ bool wxTextValidator::TransferToWindow(void)
|
||||
control->SetValue(* m_stringValue);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Called to transfer data to the window
|
||||
bool wxTextValidator::TransferFromWindow(void)
|
||||
{
|
||||
if( !CheckValidator() )
|
||||
return FALSE;
|
||||
return false;
|
||||
|
||||
if ( m_stringValue )
|
||||
{
|
||||
@@ -216,7 +216,7 @@ bool wxTextValidator::TransferFromWindow(void)
|
||||
*m_stringValue = control->GetValue();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxTextValidator::SetIncludeList(const wxStringList& list)
|
||||
@@ -273,9 +273,9 @@ 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('-')))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxTextValidator::IsInCharIncludeList(const wxString& val)
|
||||
@@ -284,9 +284,9 @@ bool wxTextValidator::IsInCharIncludeList(const wxString& val)
|
||||
for ( i = 0; i < val.Length(); i++)
|
||||
{
|
||||
if (!m_includeList.Member((wxString) val[i]))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
|
||||
@@ -295,9 +295,9 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
|
||||
for ( i = 0; i < val.Length(); i++)
|
||||
{
|
||||
if (m_excludeList.Member((wxString) val[i]))
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user