A few Unicode fixes.

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

diff --git a/include/wx/string.h b/include/wx/string.h
index fa68ee7ccff403b1d2e0db96856b7abff4a92771..8948591e53f25ba926e17f7cbcf01daf987528a4 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -575,7 +575,7 @@ public:
     // case-sensitive comparison (returns a value < 0, = 0 or > 0)
   int  Cmp(const wxChar *psz) const { return wxStrcmp(c_str(), psz); }
     // same as Cmp() but not case-sensitive
-  int  CmpNoCase(const wxChar *psz) const { return Stricmp(c_str(), psz); }
+  int  CmpNoCase(const wxChar *psz) const { return wxStricmp(c_str(), psz); }
     // test for the string equality, either considering case or not
     // (if compareWithCase then the case matters)
   bool IsSameAs(const wxChar *psz, bool compareWithCase = TRUE) const
@@ -713,6 +713,10 @@ public:
 #ifdef  wxSTD_STRING_COMPATIBILITY
   // std::string compatibility functions
 
+  // standard types
+  typedef wxChar value_type;
+  typedef const value_type *const_iterator;
+
   // an 'invalid' value for string index
   static const size_t npos;
 
@@ -746,6 +750,11 @@ public:
     // returns the writable character at position n
   wxChar& at(size_t n) { return GetWritableChar(n); }
 
+    // first valid index position
+  const_iterator begin() const { return wx_str(); }
+    // position one after the last valid one
+  const_iterator end() const { return wx_str() + length(); }
+
   // lib.string.modifiers
     // append a string
   wxString& append(const wxString& str)