Fix calculation of the margins for owner-drawn menu items.

[wxWidgets.git] / src / common / valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 78135abcc03b37c99c7386bce16fb87dec3eac70..48b8bf3e32404fb47a8e5d2a252b0b787ac44d48 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -76,7 +76,7 @@ void wxTextValidator::SetStyle(long style)
 {
     m_validatorStyle = 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);
     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");
             (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)
 }
 
 bool wxTextValidator::Copy(const wxTextValidator& val)


@@ -126,7 +126,7 @@ wxTextEntry *wxTextValidator::GetTextEntry()
 #endif
 
     wxFAIL_MSG(
 #endif
 
     wxFAIL_MSG(

-        _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox")
+        wxT("wxTextValidator can only be used with wxTextCtrl or wxComboBox")

     );
 
     return NULL;
     );
 
     return NULL;


@@ -149,7 +149,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
     wxString errormsg;
     if ( HasFlag(wxFILTER_EMPTY) && val.empty() )
     {
     wxString errormsg;
     if ( HasFlag(wxFILTER_EMPTY) && val.empty() )
     {

-        errormsg = _("The empty string is not allowed.");
+        errormsg = _("Required information entry is empty.");

     }
     else if ( !(errormsg = IsValid(val)).empty() )
     {
     }
     else if ( !(errormsg = IsValid(val)).empty() )
     {