Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / include / wx / valtext.h

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 62c762990d878c834c2092e602aff3b4ad022b61..4b9be083ae3ce1583404db53942fd49331273fcd 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valtext.h
+// Name:        wx/valtext.h

 // Purpose:     wxTextValidator class
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Purpose:     wxTextValidator class
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi


@@ -78,14 +78,14 @@ public:
     inline wxArrayString& GetExcludes() { return m_excludes; }
 
     bool HasFlag(wxTextValidatorStyle style) const
     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;
 
 
 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
     bool ContainsExcludedCharacters(const wxString& val) const;
 
     // returns the error message if the contents of 'val' are invalid


@@ -98,7 +98,7 @@ protected:
     wxArrayString        m_excludes;
 
 private:
     wxArrayString        m_excludes;
 
 private:

-    DECLARE_NO_ASSIGN_CLASS(wxTextValidator)
+    wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator);

     DECLARE_DYNAMIC_CLASS(wxTextValidator)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxTextValidator)
     DECLARE_EVENT_TABLE()
 };