X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58fa61dbad0ea1158f6c6e96d611c26057e069ba..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/valtext.h?ds=sidebyside

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 62c762990d..93f5dd614e 100644
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        valtext.h
+// Name:        wx/valtext.h
 // Purpose:     wxTextValidator class
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:     29/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -78,14 +77,14 @@ public:
     inline wxArrayString& GetExcludes() { return m_excludes; }
 
     bool HasFlag(wxTextValidatorStyle style) const
-        { return m_validatorStyle & style; }
+        { return (m_validatorStyle & style) != 0; }
 
 protected:
 
     // returns true if all characters of the given string are present in m_includes
     bool ContainsOnlyIncludedCharacters(const wxString& val) const;
 
-    // returns true if all characters of the given string are NOT present in m_excludes
+    // returns true if at least one character of the given string is present in m_excludes
     bool ContainsExcludedCharacters(const wxString& val) const;
 
     // returns the error message if the contents of 'val' are invalid
@@ -98,7 +97,7 @@ protected:
     wxArrayString        m_excludes;
 
 private:
-    DECLARE_NO_ASSIGN_CLASS(wxTextValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator);
     DECLARE_DYNAMIC_CLASS(wxTextValidator)
     DECLARE_EVENT_TABLE()
 };