Applied patch [ 740071 ] Make tiff errors/warnings use wxLog functions

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

diff --git a/include/wx/string.h b/include/wx/string.h
index ac039eaa63554a615a4ab4f24ee395b8b67d5649..b4a6fa1df7f5c156cf7cbe28788341e24d7a7c20 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -258,7 +258,7 @@ private:
   bool AssignCopy(size_t, const wxChar *);
 
   // append a (sub)string
-  bool ConcatSelf(int nLen, const wxChar *src);
+  bool ConcatSelf(size_t nLen, const wxChar *src);
 
   // functions called before writing to the string: they copy it if there
   // are other references to our data (should be the only owner when writing)
@@ -803,6 +803,8 @@ public:
 
   // standard types
   typedef wxChar value_type;
+  typedef size_t size_type;
+  typedef value_type *iterator;
   typedef const value_type *const_iterator;
 
   // an 'invalid' value for string index
@@ -848,6 +850,11 @@ public:
     // position one after the last valid one
   const_iterator end() const { return wx_str() + length(); }
 
+  // first valid index position
+  iterator begin() { CopyBeforeWrite(); return m_pchData; }
+  // position one after the last valid one
+  iterator end() { CopyBeforeWrite(); return m_pchData + length(); }
+
   // lib.string.modifiers
     // append a string
   wxString& append(const wxString& str)