fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index 0a3f45bb528450322c47b4cfb418c89a307e40ed..7a9adb99bf90dde84b8456e8dcffa153b7346c46 100644 (file)
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -23,7 +23,8 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"        // everybody should include this
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"        // everybody should include this

-#include "wx/wxchar.h"      // for wxChar, wxStrlen() etc.
+#include "wx/chartype.h"    // for wxChar
+#include "wx/wxcrtbase.h"   // for wxStrlen() etc.

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -61,17 +62,20 @@ extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl;
 #include <string>
 #include "wx/afterstd.h"
 
 #include <string>
 #include "wx/afterstd.h"
 

+#ifdef HAVE_STD_WSTRING
+    typedef std::wstring wxStdWideString;
+#else
+    typedef std::basic_string<wchar_t> wxStdWideString;
+#endif
+

 #if wxUSE_UNICODE_WCHAR
 #if wxUSE_UNICODE_WCHAR

-    #ifdef HAVE_STD_WSTRING
-        typedef std::wstring wxStdString;
-    #else
-        typedef std::basic_string<wxStringCharType> wxStdString;
-    #endif
+    typedef wxStdWideString wxStdString;

 #else
     typedef std::string wxStdString;
 #endif
 
 #else
     typedef std::string wxStdString;
 #endif
 

-#endif // need <string>
+#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING
+

 
 #if wxUSE_STL_BASED_WXSTRING
 
 
 #if wxUSE_STL_BASED_WXSTRING
 


@@ -194,6 +198,7 @@ public:
         typedef ptr_type pointer;                                             \
         typedef int difference_type;                                          \
                                                                               \
         typedef ptr_type pointer;                                             \
         typedef int difference_type;                                          \
                                                                               \

+        iterator_name() : m_ptr(NULL) { }                                     \

         iterator_name(pointer ptr) : m_ptr(ptr) { }                           \
                                                                               \
         reference operator*() const { return *m_ptr; }                        \
         iterator_name(pointer ptr) : m_ptr(ptr) { }                           \
                                                                               \
         reference operator*() const { return *m_ptr; }                        \


@@ -214,21 +219,13 @@ public:
             return tmp;                                                       \
         }                                                                     \
                                                                               \
             return tmp;                                                       \
         }                                                                     \
                                                                               \

-        iterator_name operator+(int n) const                                  \
-            { return iterator_name(m_ptr + n); }                              \
-        iterator_name operator+(size_t n) const                               \
+        iterator_name operator+(ptrdiff_t n) const                            \

             { return iterator_name(m_ptr + n); }                              \
             { return iterator_name(m_ptr + n); }                              \

-        iterator_name operator-(int n) const                                  \
+        iterator_name operator-(ptrdiff_t n) const                            \

             { return iterator_name(m_ptr - n); }                              \
             { return iterator_name(m_ptr - n); }                              \

-        iterator_name operator-(size_t n) const                               \
-            { return iterator_name(m_ptr - n); }                              \
-        iterator_name& operator+=(int n)                                      \
-            { m_ptr += n; return *this; }                                     \
-        iterator_name& operator+=(size_t n)                                   \
+        iterator_name& operator+=(ptrdiff_t n)                                \

             { m_ptr += n; return *this; }                                     \
             { m_ptr += n; return *this; }                                     \

-        iterator_name& operator-=(int n)                                      \
-            { m_ptr -= n; return *this; }                                     \
-        iterator_name& operator-=(size_t n)                                   \
+        iterator_name& operator-=(ptrdiff_t n)                                \

             { m_ptr -= n; return *this; }                                     \
                                                                               \
         difference_type operator-(const iterator_name& i) const               \
             { m_ptr -= n; return *this; }                                     \
                                                                               \
         difference_type operator-(const iterator_name& i) const               \


@@ -250,18 +247,18 @@ public:
                                                                               \
     private:                                                                  \
         /* for wxStringImpl use only */                                       \
                                                                               \
     private:                                                                  \
         /* for wxStringImpl use only */                                       \

-        operator pointer() const { return m_ptr; }                            \
+        pointer GetPtr() const { return m_ptr; }                              \

                                                                               \
                                                                               \

-        friend class WXDLLIMPEXP_BASE wxStringImpl;                           \
+        friend class wxStringImpl;                                            \

                                                                               \
         pointer m_ptr
 
   // we need to declare const_iterator in wxStringImpl scope, the friend
   // declaration inside iterator class itself is not enough, or at least not
   // for g++ 3.4 (g++ 4 is ok)
                                                                               \
         pointer m_ptr
 
   // we need to declare const_iterator in wxStringImpl scope, the friend
   // declaration inside iterator class itself is not enough, or at least not
   // for g++ 3.4 (g++ 4 is ok)

-  class const_iterator;
+  class WXDLLIMPEXP_FWD_BASE const_iterator;

 
 

-  class iterator
+  class WXDLLIMPEXP_BASE iterator

   {
     WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
                                   wxStringCharType&,
   {
     WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
                                   wxStringCharType&,


@@ -270,7 +267,7 @@ public:
     friend class const_iterator;
   };
 
     friend class const_iterator;
   };
 

-  class const_iterator
+  class WXDLLIMPEXP_BASE const_iterator

   {
   public:
       const_iterator(iterator i) : m_ptr(i.m_ptr) { }
   {
   public:
       const_iterator(iterator i) : m_ptr(i.m_ptr) { }


@@ -321,6 +318,17 @@ public:
     // take everything between start and end
   wxStringImpl(const_iterator start, const_iterator end);
 
     // take everything between start and end
   wxStringImpl(const_iterator start, const_iterator end);
 

+
+    // ctor from and conversion to std::string
+#if wxUSE_STD_STRING
+  wxStringImpl(const wxStdString& impl)
+      { InitWith(impl.c_str(), 0, impl.length()); }
+
+  operator wxStdString() const
+      { return wxStdString(c_str(), length()); }
+#endif
+
+

     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()
   {
     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()
   {


@@ -386,32 +394,32 @@ public:
     { ConcatSelf(str.length(), str.c_str()); return *this; }
     // append first n (or all if n == npos) characters of sz
   wxStringImpl& append(const wxStringCharType *sz)
     { ConcatSelf(str.length(), str.c_str()); return *this; }
     // append first n (or all if n == npos) characters of sz
   wxStringImpl& append(const wxStringCharType *sz)

-    { ConcatSelf(Strsize(sz), sz); return *this; }
+    { ConcatSelf(wxStrlen(sz), sz); return *this; }

   wxStringImpl& append(const wxStringCharType *sz, size_t n)
     { ConcatSelf(n, sz); return *this; }
     // append n copies of ch
   wxStringImpl& append(size_t n, wxStringCharType ch);
     // append from first to last
   wxStringImpl& append(const_iterator first, const_iterator last)
   wxStringImpl& append(const wxStringCharType *sz, size_t n)
     { ConcatSelf(n, sz); return *this; }
     // append n copies of ch
   wxStringImpl& append(size_t n, wxStringCharType ch);
     // append from first to last
   wxStringImpl& append(const_iterator first, const_iterator last)

-    { ConcatSelf(last - first, first); return *this; }
+    { ConcatSelf(last - first, first.GetPtr()); return *this; }

 
     // same as `this_string = str'
   wxStringImpl& assign(const wxStringImpl& str)
     { return *this = str; }
     // same as ` = str[pos..pos + n]
   wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n)
 
     // same as `this_string = str'
   wxStringImpl& assign(const wxStringImpl& str)
     { return *this = str; }
     // same as ` = str[pos..pos + n]
   wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n)

-    { clear(); return append(str, pos, n); }
+    { return replace(0, npos, str, pos, n); }

     // same as `= first n (or all if n == npos) characters of sz'
   wxStringImpl& assign(const wxStringCharType *sz)
     // same as `= first n (or all if n == npos) characters of sz'
   wxStringImpl& assign(const wxStringCharType *sz)

-    { clear(); return append(sz, Strsize(sz)); }
+    { return replace(0, npos, sz, wxStrlen(sz)); }

   wxStringImpl& assign(const wxStringCharType *sz, size_t n)
   wxStringImpl& assign(const wxStringCharType *sz, size_t n)

-    { clear(); return append(sz, n); }
+    { return replace(0, npos, sz, n); }

     // same as `= n copies of ch'
   wxStringImpl& assign(size_t n, wxStringCharType ch)
     // same as `= n copies of ch'
   wxStringImpl& assign(size_t n, wxStringCharType ch)

-    { clear(); return append(n, ch); }
+    { return replace(0, npos, n, ch); }

     // assign from first to last
   wxStringImpl& assign(const_iterator first, const_iterator last)
     // assign from first to last
   wxStringImpl& assign(const_iterator first, const_iterator last)

-    { clear(); return append(first, last); }
+    { return replace(begin(), end(), first, last); }

 
     // first valid index position
   const_iterator begin() const { return m_pchData; }
 
     // first valid index position
   const_iterator begin() const { return m_pchData; }


@@ -443,7 +451,7 @@ public:
   iterator insert(iterator it, wxStringCharType ch)
     { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
   void insert(iterator it, const_iterator first, const_iterator last)
   iterator insert(iterator it, wxStringCharType ch)
     { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
   void insert(iterator it, const_iterator first, const_iterator last)

-    { insert(it - begin(), first, last - first); }
+    { insert(it - begin(), first.GetPtr(), last - first); }

   void insert(iterator it, size_type n, wxStringCharType ch)
     { insert(it - begin(), n, ch); }
 
   void insert(iterator it, size_type n, wxStringCharType ch)
     { insert(it - begin(), n, ch); }
 


@@ -462,18 +470,23 @@ public:
   const wxStringCharType* data() const { return m_pchData; }
 
     // replaces the substring of length nLen starting at nStart
   const wxStringCharType* data() const { return m_pchData; }
 
     // replaces the substring of length nLen starting at nStart

-  wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz);
+  wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz)
+    { return replace(nStart, nLen, sz, npos); }

     // replaces the substring of length nLen starting at nStart
   wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str)
     // replaces the substring of length nLen starting at nStart
   wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str)

-    { return replace(nStart, nLen, str.c_str()); }
+    { return replace(nStart, nLen, str.c_str(), str.length()); }

     // replaces the substring with nCount copies of ch
     // replaces the substring with nCount copies of ch

-  wxStringImpl& replace(size_t nStart, size_t nLen, size_t nCount, wxStringCharType ch);
+  wxStringImpl& replace(size_t nStart, size_t nLen,
+                        size_t nCount, wxStringCharType ch)
+    { return replace(nStart, nLen, wxStringImpl(nCount, ch)); }

     // replaces a substring with another substring
   wxStringImpl& replace(size_t nStart, size_t nLen,
     // replaces a substring with another substring
   wxStringImpl& replace(size_t nStart, size_t nLen,

-                        const wxStringImpl& str, size_t nStart2, size_t nLen2);
+                        const wxStringImpl& str, size_t nStart2, size_t nLen2)
+    { return replace(nStart, nLen, str.substr(nStart2, nLen2)); }

     // replaces the substring with first nCount chars of sz
   wxStringImpl& replace(size_t nStart, size_t nLen,
                         const wxStringCharType* sz, size_t nCount);
     // replaces the substring with first nCount chars of sz
   wxStringImpl& replace(size_t nStart, size_t nLen,
                         const wxStringCharType* sz, size_t nCount);

+

   wxStringImpl& replace(iterator first, iterator last, const_pointer s)
     { return replace(first - begin(), last - first, s); }
   wxStringImpl& replace(iterator first, iterator last, const_pointer s,
   wxStringImpl& replace(iterator first, iterator last, const_pointer s)
     { return replace(first - begin(), last - first, s); }
   wxStringImpl& replace(iterator first, iterator last, const_pointer s,


@@ -485,7 +498,7 @@ public:
     { return replace(first - begin(), last - first, n, c); }
   wxStringImpl& replace(iterator first, iterator last,
                         const_iterator first1, const_iterator last1)
     { return replace(first - begin(), last - first, n, c); }
   wxStringImpl& replace(iterator first, iterator last,
                         const_iterator first1, const_iterator last1)

-    { return replace(first - begin(), last - first, first1, last1 - first1); }
+    { return replace(first - begin(), last - first, first1.GetPtr(), last1 - first1); }

 
     // swap two strings
   void swap(wxStringImpl& str);
 
     // swap two strings
   void swap(wxStringImpl& str);


@@ -526,21 +539,12 @@ public:
       // string += char
   wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); }
 
       // string += char
   wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); }
 

-#if !wxUSE_UNICODE_UTF8

   // helpers for wxStringBuffer and wxStringBufferLength
   wxStringCharType *DoGetWriteBuf(size_t nLen);
   void DoUngetWriteBuf();
   void DoUngetWriteBuf(size_t nLen);
   // helpers for wxStringBuffer and wxStringBufferLength
   wxStringCharType *DoGetWriteBuf(size_t nLen);
   void DoUngetWriteBuf();
   void DoUngetWriteBuf(size_t nLen);

-#endif
-
-private:
-#if wxUSE_UNICODE_UTF8
-  static size_t Strsize(const wxStringCharType *s) { return strlen(s); }
-#else
-  static size_t Strsize(const wxStringCharType *s) { return wxStrlen(s); }
-#endif

 
 

-  friend class WXDLLIMPEXP_BASE wxString;
+  friend class WXDLLIMPEXP_FWD_BASE wxString;

 };
 
 #endif // !wxUSE_STL_BASED_WXSTRING
 };
 
 #endif // !wxUSE_STL_BASED_WXSTRING