X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56364fa2218d6acc78d8d77066926527a6116f41..5e1d513ea393c769cc83e4bc69cec34c3d0a9507:/src/common/valtext.cpp?ds=sidebyside diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 93762c52d8..56998ee14c 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -76,7 +76,7 @@ void wxTextValidator::SetStyle(long style) { m_validatorStyle = style; -#ifdef __WXDEBUG__ +#if wxDEBUG_LEVEL int check; check = (int)HasFlag(wxFILTER_ALPHA) + (int)HasFlag(wxFILTER_ALPHANUMERIC) + (int)HasFlag(wxFILTER_DIGITS) + (int)HasFlag(wxFILTER_NUMERIC); @@ -93,7 +93,7 @@ void wxTextValidator::SetStyle(long style) (int)HasFlag(wxFILTER_EXCLUDE_LIST) + (int)HasFlag(wxFILTER_EXCLUDE_CHAR_LIST); wxASSERT_MSG(check <= 1, "Using both an include/exclude list may lead to unexpected results"); -#endif +#endif // wxDEBUG_LEVEL } bool wxTextValidator::Copy(const wxTextValidator& val) @@ -149,7 +149,7 @@ bool wxTextValidator::Validate(wxWindow *parent) wxString errormsg; if ( HasFlag(wxFILTER_EMPTY) && val.empty() ) { - errormsg = _("Please enter a non-empty string."); + errormsg = _("Required information entry is empty."); } else if ( !(errormsg = IsValid(val)).empty() ) {