Doc mods; fixed return non-processing problem; fixed toolbar sizing problems
(incl. MDI area clipping); put wxPrintPaperDatabase, wxPrintPaperType into prntbase.cpp since it's needed in non-PostScript WIN16 for the generic page setup dialog; corrected some 16-bit makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -134,7 +134,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
||||
|
||||
wxString val(control->GetValue());
|
||||
|
||||
bool ok = true;
|
||||
bool ok = TRUE;
|
||||
|
||||
// this format string should contian exactly one '%s'
|
||||
const char *errormsg = _("'%s' is invalid");
|
||||
@@ -143,37 +143,37 @@ bool wxTextValidator::Validate(wxWindow *parent)
|
||||
{
|
||||
if ( !m_includeList.Member(val) )
|
||||
{
|
||||
ok = false;
|
||||
ok = FALSE;
|
||||
}
|
||||
}
|
||||
else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
|
||||
{
|
||||
if ( m_excludeList.Member(val) )
|
||||
{
|
||||
ok = false;
|
||||
ok = FALSE;
|
||||
}
|
||||
}
|
||||
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.");
|
||||
}
|
||||
|
Reference in New Issue
Block a user