escape _ in LaTeX sources

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index c2abb44c199f66bed3f20588f222ddae563a9827..db4b5fe6189b90ae4936741fa1f4eaa5908c7137 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        string.cpp
+// Name:        src/common/string.cpp

 // Purpose:     wxString class
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:
 // Purpose:     wxString class
 // Author:      Vadim Zeitlin, Ryan Norton
 // Modified by:


@@ -25,22 +25,26 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-  #include "wx/defs.h"
-  #include "wx/string.h"
-  #include "wx/intl.h"
-  #include "wx/thread.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/thread.h"

 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>

+
+#ifndef __WXWINCE__
+    #include <errno.h>
+#endif
+

 #include <string.h>
 #include <stdlib.h>
 
 #ifdef __SALFORDC__
 #include <string.h>
 #include <stdlib.h>
 
 #ifdef __SALFORDC__

-  #include <clib.h>
+    #include <clib.h>

 #endif
 
 // allocating extra space for each string consumes more memory but speeds up
 #endif
 
 // allocating extra space for each string consumes more memory but speeds up


@@ -48,20 +52,36 @@
 // NB: EXTRA_ALLOC must be >= 0!
 #define EXTRA_ALLOC       (19 - nLen % 16)
 
 // NB: EXTRA_ALLOC must be >= 0!
 #define EXTRA_ALLOC       (19 - nLen % 16)
 

+
+// string handling functions used by wxString:
+#if wxUSE_UNICODE_UTF8
+    #define wxStringMemcpy   memcpy
+    #define wxStringMemcmp   memcmp
+    #define wxStringMemchr   memchr
+    #define wxStringStrlen   strlen
+#else
+    #define wxStringMemcpy   wxTmemcpy
+    #define wxStringMemcmp   wxTmemcmp
+    #define wxStringMemchr   wxTmemchr
+    #define wxStringStrlen   wxStrlen
+#endif
+
+

 // ---------------------------------------------------------------------------
 // static class variables definition
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // static class variables definition
 // ---------------------------------------------------------------------------
 

-#if !wxUSE_STL
+#if !wxUSE_STL_BASED_WXSTRING

   //According to STL _must_ be a -1 size_t
   //According to STL _must_ be a -1 size_t

-  const size_t wxStringBase::npos = (size_t) -1;
+  const size_t wxStringImpl::npos = (size_t) -1;

 #endif
 #endif

+const size_t wxString::npos = (size_t) -1;

 
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 

-#if wxUSE_STL
+#if wxUSE_STL_BASED_WXSTRING

 
 extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T("");
 
 
 extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T("");
 


@@ -87,52 +107,20 @@ extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
 
 #if wxUSE_STD_IOSTREAM
 
 
 #if wxUSE_STD_IOSTREAM
 

-// MS Visual C++ version 5.0 provides the new STL headers as well as the old
-// iostream ones.
-//
-// ATTN: you can _not_ use both of these in the same program!
-

 #include <iostream>
 
 #include <iostream>
 

-wxSTD istream& operator>>(wxSTD istream& is, wxString& WXUNUSED(str))
-{
-#if 0
-  int w = is.width(0);
-  if ( is.ipfx(0) ) {
-    streambuf *sb = is.rdbuf();
-    str.erase();
-    while ( true ) {
-      int ch = sb->sbumpc ();
-      if ( ch == EOF ) {
-        is.setstate(ios::eofbit);
-        break;
-      }
-      else if ( isspace(ch) ) {
-        sb->sungetc();
-        break;
-      }
-
-      str += ch;
-      if ( --w == 1 )
-        break;
-    }
-  }
-
-  is.isfx();
-  if ( str.length() == 0 )
-    is.setstate(ios::failbit);
-#endif
-  return is;
+wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
+{
+    return os << str.c_str();

 }
 
 }
 

-wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
+wxSTD ostream& operator<<(wxSTD ostream& os, const wxCStrData& str)

 {
 {

-#ifdef __BORLANDC__
-    os << str.mb_str();
+#if wxUSE_UNICODE && !defined(__BORLANDC__)
+    return os << str.AsWChar();

 #else
 #else

-    os << str.c_str();
+    return os << str.AsChar();

 #endif
 #endif

-    return os;

 }
 
 #endif // wxUSE_STD_IOSTREAM
 }
 
 #endif // wxUSE_STD_IOSTREAM


@@ -166,7 +154,7 @@ wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
   #define STATISTICS_ADD(av, val)
 #endif // WXSTRING_STATISTICS
 
   #define STATISTICS_ADD(av, val)
 #endif // WXSTRING_STATISTICS
 

-#if !wxUSE_STL
+#if !wxUSE_STL_BASED_WXSTRING

 
 // ===========================================================================
 // wxStringData class deallocation
 
 // ===========================================================================
 // wxStringData class deallocation


@@ -181,11 +169,11 @@ void wxStringData::Free()
 #endif
 
 // ===========================================================================
 #endif
 
 // ===========================================================================

-// wxStringBase
+// wxStringImpl

 // ===========================================================================
 
 // takes nLength elements of psz starting at nPos
 // ===========================================================================
 
 // takes nLength elements of psz starting at nPos

-void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
+void wxStringImpl::InitWith(const wxChar *psz, size_t nPos, size_t nLength)

 {
   Init();
 
 {
   Init();
 


@@ -201,21 +189,29 @@ void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     if ( !AllocBuffer(nLength) ) {
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     if ( !AllocBuffer(nLength) ) {

-      wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
+      wxFAIL_MSG( _T("out of memory in wxStringImpl::InitWith") );

       return;
     }
       return;
     }

-    wxTmemcpy(m_pchData, psz + nPos, nLength);
+    wxStringMemcpy(m_pchData, psz + nPos, nLength);

   }
 }
 
 // poor man's iterators are "void *" pointers
   }
 }
 
 // poor man's iterators are "void *" pointers

-wxStringBase::wxStringBase(const void *pStart, const void *pEnd)
+wxStringImpl::wxStringImpl(const void *pStart, const void *pEnd)

 {
 {

-  InitWith((const wxChar *)pStart, 0,
-           (const wxChar *)pEnd - (const wxChar *)pStart);
+  if ( pEnd >= pStart )
+  {
+    InitWith((const wxChar *)pStart, 0,
+             (const wxChar *)pEnd - (const wxChar *)pStart);
+  }
+  else
+  {
+    wxFAIL_MSG( _T("pStart is not before pEnd") );
+    Init();
+  }

 }
 
 }
 

-wxStringBase::wxStringBase(size_type n, wxChar ch)
+wxStringImpl::wxStringImpl(size_type n, wxStringCharType ch)

 {
   Init();
   append(n, ch);
 {
   Init();
   append(n, ch);


@@ -226,7 +222,7 @@ wxStringBase::wxStringBase(size_type n, wxChar ch)
 // ---------------------------------------------------------------------------
 
 // allocates memory needed to store a C string of length nLen
 // ---------------------------------------------------------------------------
 
 // allocates memory needed to store a C string of length nLen

-bool wxStringBase::AllocBuffer(size_t nLen)
+bool wxStringImpl::AllocBuffer(size_t nLen)

 {
   // allocating 0 sized buffer doesn't make sense, all empty strings should
   // reuse g_strEmpty
 {
   // allocating 0 sized buffer doesn't make sense, all empty strings should
   // reuse g_strEmpty


@@ -258,7 +254,7 @@ bool wxStringBase::AllocBuffer(size_t nLen)
 }
 
 // must be called before changing this string
 }
 
 // must be called before changing this string

-bool wxStringBase::CopyBeforeWrite()
+bool wxStringImpl::CopyBeforeWrite()

 {
   wxStringData* pData = GetStringData();
 
 {
   wxStringData* pData = GetStringData();
 


@@ -269,7 +265,7 @@ bool wxStringBase::CopyBeforeWrite()
       // allocation failures are handled by the caller
       return false;
     }
       // allocation failures are handled by the caller
       return false;
     }

-    wxTmemcpy(m_pchData, pData->data(), nLen);
+    wxStringMemcpy(m_pchData, pData->data(), nLen);

   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
   }
 
   wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner


@@ -278,7 +274,7 @@ bool wxStringBase::CopyBeforeWrite()
 }
 
 // must be called before replacing contents of this string
 }
 
 // must be called before replacing contents of this string

-bool wxStringBase::AllocBeforeWrite(size_t nLen)
+bool wxStringImpl::AllocBeforeWrite(size_t nLen)

 {
   wxASSERT( nLen != 0 );  // doesn't make any sense
 
 {
   wxASSERT( nLen != 0 );  // doesn't make any sense
 


@@ -324,12 +320,12 @@ bool wxStringBase::AllocBeforeWrite(size_t nLen)
   return true;
 }
 
   return true;
 }
 

-wxStringBase& wxStringBase::append(size_t n, wxChar ch)
+wxStringImpl& wxStringImpl::append(size_t n, wxStringCharType ch)

 {
     size_type len = length();
 
     if ( !Alloc(len + n) || !CopyBeforeWrite() ) {
 {
     size_type len = length();
 
     if ( !Alloc(len + n) || !CopyBeforeWrite() ) {

-      wxFAIL_MSG( _T("out of memory in wxStringBase::append") );
+      wxFAIL_MSG( _T("out of memory in wxStringImpl::append") );

     }
     GetStringData()->nDataLength = len + n;
     m_pchData[len + n] = '\0';
     }
     GetStringData()->nDataLength = len + n;
     m_pchData[len + n] = '\0';


@@ -338,7 +334,7 @@ wxStringBase& wxStringBase::append(size_t n, wxChar ch)
     return *this;
 }
 
     return *this;
 }
 

-void wxStringBase::resize(size_t nSize, wxChar ch)
+void wxStringImpl::resize(size_t nSize, wxStringCharType ch)

 {
     size_t len = length();
 
 {
     size_t len = length();
 


@@ -354,7 +350,7 @@ void wxStringBase::resize(size_t nSize, wxChar ch)
 }
 
 // allocate enough memory for nLen characters
 }
 
 // allocate enough memory for nLen characters

-bool wxStringBase::Alloc(size_t nLen)
+bool wxStringImpl::Alloc(size_t nLen)

 {
   wxStringData *pData = GetStringData();
   if ( pData->nAllocLength <= nLen ) {
 {
   wxStringData *pData = GetStringData();
   if ( pData->nAllocLength <= nLen ) {


@@ -408,41 +404,41 @@ bool wxStringBase::Alloc(size_t nLen)
   return true;
 }
 
   return true;
 }
 

-wxStringBase::iterator wxStringBase::begin()
+wxStringImpl::iterator wxStringImpl::begin()

 {
     if (length() > 0)
         CopyBeforeWrite();
     return m_pchData;
 }
 
 {
     if (length() > 0)
         CopyBeforeWrite();
     return m_pchData;
 }
 

-wxStringBase::iterator wxStringBase::end()
+wxStringImpl::iterator wxStringImpl::end()

 {
     if (length() > 0)
         CopyBeforeWrite();
     return m_pchData + length();
 }
 
 {
     if (length() > 0)
         CopyBeforeWrite();
     return m_pchData + length();
 }
 

-wxStringBase::iterator wxStringBase::erase(iterator it)
+wxStringImpl::iterator wxStringImpl::erase(iterator it)

 {
     size_type idx = it - begin();
     erase(idx, 1);
     return begin() + idx;
 }
 
 {
     size_type idx = it - begin();
     erase(idx, 1);
     return begin() + idx;
 }
 

-wxStringBase& wxStringBase::erase(size_t nStart, size_t nLen)
+wxStringImpl& wxStringImpl::erase(size_t nStart, size_t nLen)

 {
     wxASSERT(nStart <= length());
     size_t strLen = length() - nStart;
     // delete nLen or up to the end of the string characters
     nLen = strLen < nLen ? strLen : nLen;
 {
     wxASSERT(nStart <= length());
     size_t strLen = length() - nStart;
     // delete nLen or up to the end of the string characters
     nLen = strLen < nLen ? strLen : nLen;

-    wxString strTmp(c_str(), nStart);
+    wxStringImpl strTmp(c_str(), nStart);

     strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);
 
     swap(strTmp);
     return *this;
 }
 
     strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);
 
     swap(strTmp);
     return *this;
 }
 

-wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
+wxStringImpl& wxStringImpl::insert(size_t nPos, const wxChar *sz, size_t n)

 {
     wxASSERT( nPos <= length() );
 
 {
     wxASSERT( nPos <= length() );
 


@@ -450,7 +446,7 @@ wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
     if ( n == 0 ) return *this;
 
     if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
     if ( n == 0 ) return *this;
 
     if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {

-        wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
+        wxFAIL_MSG( _T("out of memory in wxStringImpl::insert") );

     }
 
     memmove(m_pchData + nPos + n, m_pchData + nPos,
     }
 
     memmove(m_pchData + nPos + n, m_pchData + nPos,


@@ -462,62 +458,77 @@ wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
     return *this;
 }
 
     return *this;
 }
 

-void wxStringBase::swap(wxStringBase& str)
+void wxStringImpl::swap(wxStringImpl& str)

 {
 {

-    wxChar* tmp = str.m_pchData;
+    wxStringCharType* tmp = str.m_pchData;

     str.m_pchData = m_pchData;
     m_pchData = tmp;
 }
 
     str.m_pchData = m_pchData;
     m_pchData = tmp;
 }
 

-size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
+size_t wxStringImpl::find(const wxStringImpl& str, size_t nStart) const

 {
 {

+    // deal with the special case of empty string first
+    const size_t nLen = length();
+    const size_t nLenOther = str.length();
+
+    if ( !nLenOther )
+    {
+        // empty string is a substring of anything
+        return 0;
+    }
+
+    if ( !nLen )
+    {
+        // the other string is non empty so can't be our substring
+        return npos;
+    }
+

     wxASSERT( str.GetStringData()->IsValid() );
     wxASSERT( str.GetStringData()->IsValid() );

-    wxASSERT( nStart <= length() );
+    wxASSERT( nStart <= nLen );

 
 

-    //anchor
-    const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
-                                               str.c_str()[0],
-                                               length() - nStart);
+    const wxStringCharType * const other = str.c_str();

 
 

-    if(!p)
+    // anchor
+    const wxStringCharType* p =
+        (const wxStringCharType*)wxStringMemchr(c_str() + nStart,
+                                                *other,
+                                                nLen - nStart);
+
+    if ( !p )

         return npos;
 
         return npos;
 

-    while(p - c_str() + str.length() <= length() &&
-          wxTmemcmp(p, str.c_str(), str.length()) )
+    while ( p - c_str() + nLenOther <= nLen &&
+            wxStringMemcmp(p, other, nLenOther) )

     {
     {

-        //Previosly passed as the first argument to wxTmemchr,
-        //but C/C++ standard does not specify evaluation order
-        //of arguments to functions -
-        //http://embedded.com/showArticle.jhtml?articleID=9900607
-        ++p;
-
-        //anchor again
-        p = (const wxChar*)wxTmemchr(p,
-                                     str.c_str()[0],
-                                     length() - (p - c_str()));
-
-        if(!p)
+        p++;
+
+        // anchor again
+        p = (const wxStringCharType*)
+                wxStringMemchr(p, *other, nLen - (p - c_str()));
+
+        if ( !p )

             return npos;
     }
 
             return npos;
     }
 

-    return (p - c_str() + str.length() <= length()) ? p - c_str() : npos;
+    return p - c_str() + nLenOther <= nLen ? p - c_str() : npos;

 }
 
 }
 

-size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const
+size_t wxStringImpl::find(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-    return find(wxStringBase(sz, n), nStart);
+    return find(wxStringImpl(sz, n), nStart);

 }
 
 }
 

-size_t wxStringBase::find(wxChar ch, size_t nStart) const
+size_t wxStringImpl::find(wxStringCharType ch, size_t nStart) const

 {
     wxASSERT( nStart <= length() );
 
 {
     wxASSERT( nStart <= length() );
 

-    const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);
+    const wxStringCharType *p = (const wxStringCharType*)
+        wxStringMemchr(c_str() + nStart, ch, length() - nStart);

 
     return p == NULL ? npos : p - c_str();
 }
 
 
     return p == NULL ? npos : p - c_str();
 }
 

-size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
+size_t wxStringImpl::rfind(const wxStringImpl& str, size_t nStart) const

 {
     wxASSERT( str.GetStringData()->IsValid() );
     wxASSERT( nStart == npos || nStart <= length() );
 {
     wxASSERT( str.GetStringData()->IsValid() );
     wxASSERT( nStart == npos || nStart <= length() );


@@ -536,11 +547,10 @@ size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
         if ( nStart < top )
             top = nStart;
 
         if ( nStart < top )
             top = nStart;
 

-        const wxChar *cursor = c_str() + top;
+        const wxStringCharType *cursor = c_str() + top;

         do
         {
         do
         {

-            if ( wxTmemcmp(cursor, str.c_str(),
-                        str.length()) == 0 )
+            if ( wxStringMemcmp(cursor, str.c_str(), str.length()) == 0 )

             {
                 return cursor - c_str();
             }
             {
                 return cursor - c_str();
             }


@@ -550,12 +560,12 @@ size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
     return npos;
 }
 
     return npos;
 }
 

-size_t wxStringBase::rfind(const wxChar* sz, size_t nStart, size_t n) const
+size_t wxStringImpl::rfind(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-    return rfind(wxStringBase(sz, n), nStart);
+    return rfind(wxStringImpl(sz, n), nStart);

 }
 
 }
 

-size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
+size_t wxStringImpl::rfind(wxStringCharType ch, size_t nStart) const

 {
     if ( nStart == npos )
     {
 {
     if ( nStart == npos )
     {


@@ -566,7 +576,7 @@ size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
         wxASSERT( nStart <= length() );
     }
 
         wxASSERT( nStart <= length() );
     }
 

-    const wxChar *actual;
+    const wxStringCharType *actual;

     for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 );
           actual > c_str(); --actual )
     {
     for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 );
           actual > c_str(); --actual )
     {


@@ -577,162 +587,15 @@ size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
     return npos;
 }
 
     return npos;
 }
 

-size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
-{
-    wxASSERT(nStart <= length());
-
-    size_t len = wxStrlen(sz);
-
-    size_t i;
-    for(i = nStart; i < this->length(); ++i)
-    {
-        if (wxTmemchr(sz, *(c_str() + i), len))
-            break;
-    }
-
-    if(i == this->length())
-        return npos;
-    else
-        return i;
-}
-
-size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart,
-                                   size_t n) const
-{
-    return find_first_of(wxStringBase(sz, n), nStart);
-}
-
-size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
-{
-    if ( nStart == npos )
-    {
-        nStart = length() - 1;
-    }
-    else
-    {
-        wxASSERT_MSG( nStart <= length(),
-                        _T("invalid index in find_last_of()") );
-    }
-
-    size_t len = wxStrlen(sz);
-
-    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
-    {
-        if ( wxTmemchr(sz, *p, len) )
-            return p - c_str();
-    }
-
-    return npos;
-}
-
-size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart,
-                                   size_t n) const
-{
-    return find_last_of(wxStringBase(sz, n), nStart);
-}
-
-size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const
-{
-    if ( nStart == npos )
-    {
-        nStart = length();
-    }
-    else
-    {
-        wxASSERT( nStart <= length() );
-    }
-
-    size_t len = wxStrlen(sz);
-
-    size_t i;
-    for(i = nStart; i < this->length(); ++i)
-    {
-        if (!wxTmemchr(sz, *(c_str() + i), len))
-            break;
-    }
-
-    if(i == this->length())
-         return npos;
-     else
-        return i;
-}
-
-size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart,
-                                       size_t n) const
-{
-    return find_first_not_of(wxStringBase(sz, n), nStart);
-}
-
-size_t wxStringBase::find_first_not_of(wxChar ch, size_t nStart) const
-{
-    wxASSERT( nStart <= length() );
-
-    for ( const wxChar *p = c_str() + nStart; *p; p++ )
-    {
-        if ( *p != ch )
-            return p - c_str();
-    }
-
-    return npos;
-}
-
-size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
-{
-    if ( nStart == npos )
-    {
-        nStart = length() - 1;
-    }
-    else
-    {
-        wxASSERT( nStart <= length() );
-    }
-
-    size_t len = wxStrlen(sz);
-
-    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
-    {
-        if ( !wxTmemchr(sz, *p,len) )
-             return p - c_str();
-    }
-
-    return npos;
-}
-
-size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart,
-                                      size_t n) const
-{
-    return find_last_not_of(wxStringBase(sz, n), nStart);
-}
-
-size_t wxStringBase::find_last_not_of(wxChar ch, size_t nStart) const
-{
-    if ( nStart == npos )
-    {
-        nStart = length() - 1;
-    }
-    else
-    {
-        wxASSERT( nStart <= length() );
-    }
-
-    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
-    {
-        if ( *p != ch )
-            return p - c_str();
-    }
-
-    return npos;
-}
-
-wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,

                                     const wxChar *sz)
 {
   wxASSERT_MSG( nStart <= length(),
                                     const wxChar *sz)
 {
   wxASSERT_MSG( nStart <= length(),

-                _T("index out of bounds in wxStringBase::replace") );
+                _T("index out of bounds in wxStringImpl::replace") );

   size_t strLen = length() - nStart;
   nLen = strLen < nLen ? strLen : nLen;
 
   size_t strLen = length() - nStart;
   nLen = strLen < nLen ? strLen : nLen;
 

-  wxStringBase strTmp;
+  wxStringImpl strTmp;

   strTmp.reserve(length()); // micro optimisation to avoid multiple mem allocs
 
   //This is kind of inefficient, but its pretty good considering...
   strTmp.reserve(length()); // micro optimisation to avoid multiple mem allocs
 
   //This is kind of inefficient, but its pretty good considering...


@@ -756,34 +619,34 @@ wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
   return *this;
 }
 
   return *this;
 }
 

-wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
-                                    size_t nCount, wxChar ch)
+wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,
+                                    size_t nCount, wxStringCharType ch)

 {
 {

-  return replace(nStart, nLen, wxStringBase(nCount, ch).c_str());
+  return replace(nStart, nLen, wxStringImpl(nCount, ch).c_str());

 }
 
 }
 

-wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
-                                    const wxStringBase& str,
+wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,
+                                    const wxStringImpl& str,

                                     size_t nStart2, size_t nLen2)
 {
   return replace(nStart, nLen, str.substr(nStart2, nLen2));
 }
 
                                     size_t nStart2, size_t nLen2)
 {
   return replace(nStart, nLen, str.substr(nStart2, nLen2));
 }
 

-wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,

                                     const wxChar* sz, size_t nCount)
 {
                                     const wxChar* sz, size_t nCount)
 {

-  return replace(nStart, nLen, wxStringBase(sz, nCount).c_str());
+  return replace(nStart, nLen, wxStringImpl(sz, nCount).c_str());

 }
 
 }
 

-wxStringBase wxStringBase::substr(size_t nStart, size_t nLen) const
+wxStringImpl wxStringImpl::substr(size_t nStart, size_t nLen) const

 {
   if ( nLen == npos )
     nLen = length() - nStart;
 {
   if ( nLen == npos )
     nLen = length() - nStart;

-  return wxStringBase(*this, nStart, nLen);
+  return wxStringImpl(*this, nStart, nLen);

 }
 
 // assigns one string to another
 }
 
 // assigns one string to another

-wxStringBase& wxStringBase::operator=(const wxStringBase& stringSrc)
+wxStringImpl& wxStringImpl::operator=(const wxStringImpl& stringSrc)

 {
   wxASSERT( stringSrc.GetStringData()->IsValid() );
 
 {
   wxASSERT( stringSrc.GetStringData()->IsValid() );
 


@@ -804,25 +667,26 @@ wxStringBase& wxStringBase::operator=(const wxStringBase& stringSrc)
 }
 
 // assigns a single character
 }
 
 // assigns a single character

-wxStringBase& wxStringBase::operator=(wxChar ch)
+wxStringImpl& wxStringImpl::operator=(wxStringCharType ch)

 {
 {

-  if ( !AssignCopy(1, &ch) ) {
-    wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(wxChar)") );
+  wxChar c(ch);
+  if ( !AssignCopy(1, &c) ) {
+    wxFAIL_MSG( _T("out of memory in wxStringImpl::operator=(wxChar)") );

   }
   return *this;
 }
 
 // assigns C string
   }
   return *this;
 }
 
 // assigns C string

-wxStringBase& wxStringBase::operator=(const wxChar *psz)
+wxStringImpl& wxStringImpl::operator=(const wxChar *psz)

 {
   if ( !AssignCopy(wxStrlen(psz), psz) ) {
 {
   if ( !AssignCopy(wxStrlen(psz), psz) ) {

-    wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(const wxChar *)") );
+    wxFAIL_MSG( _T("out of memory in wxStringImpl::operator=(const wxChar *)") );

   }
   return *this;
 }
 
 // helper function: does real copy
   }
   return *this;
 }
 
 // helper function: does real copy

-bool wxStringBase::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
+bool wxStringImpl::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)

 {
   if ( nSrcLen == 0 ) {
     Reinit();
 {
   if ( nSrcLen == 0 ) {
     Reinit();


@@ -844,7 +708,7 @@ bool wxStringBase::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
 // ---------------------------------------------------------------------------
 
 // add something to this string
 // ---------------------------------------------------------------------------
 
 // add something to this string

-bool wxStringBase::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData,
+bool wxStringImpl::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData,

                               size_t nMaxLen)
 {
   STATISTICS_ADD(SummandLength, nSrcLen);
                               size_t nMaxLen)
 {
   STATISTICS_ADD(SummandLength, nSrcLen);


@@ -899,70 +763,115 @@ bool wxStringBase::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData,
   return true;
 }
 
   return true;
 }
 

-// ---------------------------------------------------------------------------
-// simple sub-string extraction
-// ---------------------------------------------------------------------------
+#endif // !wxUSE_STL_BASED_WXSTRING
+
+#ifdef HAVE_STD_STRING_COMPARE

 
 

-// helper function: clone the data attached to this string
-bool wxStringBase::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
+// NB: Comparison code (both if HAVE_STD_STRING_COMPARE and if not) works with
+//     UTF-8 encoded strings too, thanks to UTF-8's design which allows us to
+//     sort strings in characters code point order by sorting the byte sequence
+//     in byte values order (i.e. what strcmp() and memcmp() do).
+
+int wxString::compare(const wxString& str) const

 {
 {

-  if ( nCopyLen == 0 ) {
-    dest.Init();
-  }
-  else {
-    if ( !dest.AllocBuffer(nCopyLen) ) {
-      // allocation failure handled by caller
-      return false;
-    }
-    memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar));
-  }
-  return true;
+    return m_impl.compare(str.m_impl);

 }
 
 }
 

-#endif // !wxUSE_STL
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wxString& str) const
+{
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+    return m_impl.compare(pos, len, str.m_impl);
+}
+
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wxString& str,
+                      size_t nStart2, size_t nLen2) const
+{
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);

 
 

-#if !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE)
+    size_t pos2, len2;
+    str.PosLenToImpl(nStart2, nLen2, &pos2, &len2);

 
 

-#if !wxUSE_STL
-    #define STRINGCLASS wxStringBase
-#else
-    #define STRINGCLASS wxString
-#endif
+    return m_impl.compare(pos, len, str.m_impl, pos2, len2);
+}

 
 

-static inline int wxDoCmp(const wxChar* s1, size_t l1,
-                          const wxChar* s2, size_t l2)
+int wxString::compare(const char* sz) const
+{
+    return m_impl.compare(ImplStr(sz));
+}
+
+int wxString::compare(const wchar_t* sz) const
+{
+    return m_impl.compare(ImplStr(sz));
+}
+
+int wxString::compare(size_t nStart, size_t nLen,
+                      const char* sz, size_t nCount) const
+{
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+
+    SubstrBufFromMB str(sz, nCount);
+
+    return m_impl.compare(pos, len, str.data, str.len);
+}
+
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wchar_t* sz, size_t nCount) const
+{
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+
+    SubstrBufFromWC str(sz, nCount);
+
+    return m_impl.compare(pos, len, str.data, str.len);
+}
+
+#else // !HAVE_STD_STRING_COMPARE
+
+static inline int wxDoCmp(const wxStringCharType* s1, size_t l1,
+                          const wxStringCharType* s2, size_t l2)

 {
     if( l1 == l2 )
 {
     if( l1 == l2 )

-        return wxTmemcmp(s1, s2, l1);
+        return wxStringMemcmp(s1, s2, l1);

     else if( l1 < l2 )
     {
     else if( l1 < l2 )
     {

-        int ret = wxTmemcmp(s1, s2, l1);
+        int ret = wxStringMemcmp(s1, s2, l1);

         return ret == 0 ? -1 : ret;
     }
     else
     {
         return ret == 0 ? -1 : ret;
     }
     else
     {

-        int ret = wxTmemcmp(s1, s2, l2);
+        int ret = wxStringMemcmp(s1, s2, l2);

         return ret == 0 ? +1 : ret;
     }
 }
 
         return ret == 0 ? +1 : ret;
     }
 }
 

-int STRINGCLASS::compare(const wxStringBase& str) const
+int wxString::compare(const wxString& str) const

 {
 {

-    return ::wxDoCmp(data(), length(), str.data(), str.length());
+    return ::wxDoCmp(m_impl.data(), m_impl.length(),
+                     str.m_impl.data(), str.m_impl.length());

 }
 
 }
 

-int STRINGCLASS::compare(size_t nStart, size_t nLen,
-                         const wxStringBase& str) const
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wxString& str) const

 {
     wxASSERT(nStart <= length());
     size_type strLen = length() - nStart;
     nLen = strLen < nLen ? strLen : nLen;
 {
     wxASSERT(nStart <= length());
     size_type strLen = length() - nStart;
     nLen = strLen < nLen ? strLen : nLen;

-    return ::wxDoCmp(data() + nStart, nLen, str.data(), str.length());
+
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+
+    return ::wxDoCmp(m_impl.data() + pos,  len,
+                     str.m_impl.data(), str.m_impl.length());

 }
 
 }
 

-int STRINGCLASS::compare(size_t nStart, size_t nLen,
-                         const wxStringBase& str,
-                         size_t nStart2, size_t nLen2) const
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wxString& str,
+                      size_t nStart2, size_t nLen2) const

 {
     wxASSERT(nStart <= length());
     wxASSERT(nStart2 <= str.length());
 {
     wxASSERT(nStart <= length());
     wxASSERT(nStart2 <= str.length());


@@ -970,30 +879,67 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
               strLen2 = str.length() - nStart2;
     nLen  = strLen  < nLen  ? strLen  : nLen;
     nLen2 = strLen2 < nLen2 ? strLen2 : nLen2;
               strLen2 = str.length() - nStart2;
     nLen  = strLen  < nLen  ? strLen  : nLen;
     nLen2 = strLen2 < nLen2 ? strLen2 : nLen2;

-    return ::wxDoCmp(data() + nStart, nLen, str.data() + nStart2, nLen2);
+
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+    size_t pos2, len2;
+    str.PosLenToImpl(nStart2, nLen2, &pos2, &len2);
+
+    return ::wxDoCmp(m_impl.data() + pos, len,
+                     str.m_impl.data() + pos2, len2);

 }
 
 }
 

-int STRINGCLASS::compare(const wxChar* sz) const
+int wxString::compare(const char* sz) const

 {
 {

-    size_t nLen = wxStrlen(sz);
-    return ::wxDoCmp(data(), length(), sz, nLen);
+    SubstrBufFromMB str(ImplStr(sz, npos));
+    if ( str.len == npos )
+        str.len = wxStringStrlen(str.data);
+    return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len);

 }
 
 }
 

-int STRINGCLASS::compare(size_t nStart, size_t nLen,
-                         const wxChar* sz, size_t nCount) const
+int wxString::compare(const wchar_t* sz) const
+{
+    SubstrBufFromWC str(ImplStr(sz, npos));
+    if ( str.len == npos )
+        str.len = wxStringStrlen(str.data);
+    return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len);
+}
+
+int wxString::compare(size_t nStart, size_t nLen,
+                      const char* sz, size_t nCount) const

 {
     wxASSERT(nStart <= length());
     size_type strLen = length() - nStart;
     nLen = strLen < nLen ? strLen : nLen;
 {
     wxASSERT(nStart <= length());
     size_type strLen = length() - nStart;
     nLen = strLen < nLen ? strLen : nLen;

-    if( nCount == npos )
-        nCount = wxStrlen(sz);

 
 

-    return ::wxDoCmp(data() + nStart, nLen, sz, nCount);
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);
+
+    SubstrBufFromMB str(ImplStr(sz, nCount));
+    if ( str.len == npos )
+        str.len = wxStringStrlen(str.data);
+
+    return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len);

 }
 
 }
 

-#undef STRINGCLASS
+int wxString::compare(size_t nStart, size_t nLen,
+                      const wchar_t* sz, size_t nCount) const
+{
+    wxASSERT(nStart <= length());
+    size_type strLen = length() - nStart;
+    nLen = strLen < nLen ? strLen : nLen;
+
+    size_t pos, len;
+    PosLenToImpl(nStart, nLen, &pos, &len);

 
 

-#endif // !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE)
+    SubstrBufFromWC str(ImplStr(sz, nCount));
+    if ( str.len == npos )
+        str.len = wxStringStrlen(str.data);
+
+    return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len);
+}
+
+#endif // HAVE_STD_STRING_COMPARE/!HAVE_STD_STRING_COMPARE

 
 // ===========================================================================
 // wxString class core
 
 // ===========================================================================
 // wxString class core


@@ -1004,116 +950,116 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 // ---------------------------------------------------------------------------
 
 #if wxUSE_UNICODE

+/* static */
+wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength,
+                                           const wxMBConv& conv)
+{
+    // anything to do?
+    if ( !psz || nLength == 0 )
+        return SubstrBufFromMB();

 
 

-// from multibyte string
-wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
+    if ( nLength == npos )
+        nLength = wxNO_LEN;
+
+    size_t wcLen;
+    wxWCharBuffer wcBuf(conv.cMB2WC(psz, nLength, &wcLen));
+    if ( !wcLen )
+        return SubstrBufFromMB();
+    else
+        return SubstrBufFromMB(wcBuf, wcLen);
+}
+#else
+/* static */
+wxString::SubstrBufFromWC wxString::ConvertStr(const wchar_t *pwz, size_t nLength,
+                                           const wxMBConv& conv)

 {
 {

-    // if nLength != npos, then we have to make a NULL-terminated copy
-    // of first nLength bytes of psz first because the input buffer to MB2WC
-    // must always be NULL-terminated:
-    wxCharBuffer inBuf((const char *)NULL);
-    if (nLength != npos)
-    {
-        wxASSERT( psz != NULL );
-        wxCharBuffer tmp(nLength);
-        memcpy(tmp.data(), psz, nLength);
-        tmp.data()[nLength] = '\0';
-        inBuf = tmp;
-        psz = inBuf.data();
-    }
+    // anything to do?
+    if ( !pwz || nLength == 0 )
+        return SubstrBufFromWC();

 
 

-    // first get the size of the buffer we need
-    size_t nLen;
-    if ( psz )
-    {
-        // calculate the needed size ourselves or use the provided one
-        if (nLength == npos)
-            nLen = strlen(psz);
-        else
-            nLen = nLength;
-    }
+    if ( nLength == npos )
+        nLength = wxNO_LEN;
+
+    size_t mbLen;
+    wxCharBuffer mbBuf(conv.cWC2MB(pwz, nLength, &mbLen));
+    if ( !mbLen )
+        return SubstrBufFromWC();

     else
     else

-    {
-        // nothing to convert
-        nLen = 0;
-    }
+        return SubstrBufFromWC(mbBuf, mbLen);
+}
+#endif
+
+
+#if wxUSE_UNICODE

 
 

+// from multibyte string
+wxString::wxString(const char *psz, const wxMBConv& conv, size_t nLength)
+{
+    // FIXME-UTF8: this will need changes

 
     // anything to do?
 
     // anything to do?

-    if ( (nLen != 0) && (nLen != (size_t)-1) )
+    if ( psz && nLength != 0 )

     {
     {

-        //Convert string
-        size_t nRealSize;
-        wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);
+        if ( nLength == npos )
+        {
+            nLength = wxNO_LEN;
+        }

 
 

-        //Copy
-        if (nRealSize)
-            assign( theBuffer.data() , nRealSize - 1 );
+        size_t nLenWide;
+        wxWCharBuffer wbuf = conv.cMB2WC(psz, nLength, &nLenWide);
+
+        if ( nLenWide )
+            assign(wbuf, nLenWide);

     }
 }
 
     }
 }
 

+wxString::wxString(const char *psz, size_t nLength)
+{
+    assign(psz, nLength);
+}
+

 //Convert wxString in Unicode mode to a multi-byte string
 //Convert wxString in Unicode mode to a multi-byte string

-const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
+const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const

 {
 {

-    size_t dwOutSize;
-    return conv.cWC2MB(c_str(), length(), &dwOutSize);
+    return conv.cWC2MB(c_str(), length() + 1 /* size, not length */, NULL);

 }
 
 #else // ANSI
 
 #if wxUSE_WCHAR_T
 }
 
 #else // ANSI
 
 #if wxUSE_WCHAR_T

+

 // from wide string
 // from wide string

-wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
+wxString::wxString(const wchar_t *pwz, const wxMBConv& conv, size_t nLength)

 {
 {

-    // if nLength != npos, then we have to make a NULL-terminated copy
-    // of first nLength chars of psz first because the input buffer to WC2MB
-    // must always be NULL-terminated:
-    wxWCharBuffer inBuf((const wchar_t *)NULL);
-    if (nLength != npos)
-    {
-        wxASSERT( pwz != NULL );
-        wxWCharBuffer tmp(nLength);
-        memcpy(tmp.data(), pwz, nLength * sizeof(wchar_t));
-        tmp.data()[nLength] = '\0';
-        inBuf = tmp;
-        pwz = inBuf.data();
-    }
-
-    // first get the size of the buffer we need
-    size_t nLen;
-    if ( pwz )
-    {
-        // calculate the needed size ourselves or use the provided one
-        if (nLength == npos)
-            nLen = wxWcslen(pwz);
-        else
-            nLen = nLength;
-    }
-    else
-    {
-        // nothing to convert
-        nLen = 0;
-    }
+    // FIXME-UTF8: this will need changes

 
     // anything to do?
 
     // anything to do?

-    if ( (nLen != 0) && (nLen != (size_t)-1) )
+    if ( pwz && nLength != 0 )

     {
     {

-        //Convert string
-        size_t nRealSize;
-        wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
+        if ( nLength == npos )
+        {
+            nLength = wxNO_LEN;
+        }
+
+        size_t nLenMB;
+        wxCharBuffer buf = conv.cWC2MB(pwz, nLength, &nLenMB);

 
 

-        //Copy
-        if (nRealSize)
-            assign( theBuffer.data() , nRealSize - 1 );
+        if ( nLenMB )
+            assign(buf, nLenMB);

     }
     }

+
+}
+
+wxString::wxString(const wchar_t *pwz, size_t nLength)
+{
+    assign(pwz, nLength);

 }
 
 //Converts this string to a wide character string if unicode
 //mode is not enabled and wxUSE_WCHAR_T is enabled
 }
 
 //Converts this string to a wide character string if unicode
 //mode is not enabled and wxUSE_WCHAR_T is enabled

-const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const
+const wxWCharBuffer wxString::wc_str(const wxMBConv& conv) const

 {
 {

-    size_t dwOutSize;
-    return conv.cMB2WC(c_str(), length(), &dwOutSize);
+    return conv.cMB2WC(c_str(), length() + 1 /* size, not length */, NULL);

 }
 
 #endif // wxUSE_WCHAR_T
 }
 
 #endif // wxUSE_WCHAR_T


@@ -1128,9 +1074,9 @@ bool wxString::Shrink()
   return tmp.length() == length();
 }
 
   return tmp.length() == length();
 }
 

-#if !wxUSE_STL
+#if !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8

 // get the pointer to writable buffer of (at least) nLen bytes
 // get the pointer to writable buffer of (at least) nLen bytes

-wxChar *wxString::GetWriteBuf(size_t nLen)
+wxChar *wxStringImpl::DoGetWriteBuf(size_t nLen)

 {
   if ( !AllocBeforeWrite(nLen) ) {
     // allocation failure handled by caller
 {
   if ( !AllocBeforeWrite(nLen) ) {
     // allocation failure handled by caller


@@ -1144,18 +1090,43 @@ wxChar *wxString::GetWriteBuf(size_t nLen)
 }
 
 // put string back in a reasonable state after GetWriteBuf
 }
 
 // put string back in a reasonable state after GetWriteBuf

+void wxStringImpl::DoUngetWriteBuf()
+{
+  DoUngetWriteBuf(wxStrlen(m_pchData));
+}
+
+void wxStringImpl::DoUngetWriteBuf(size_t nLen)
+{
+  wxStringData * const pData = GetStringData();
+
+  wxASSERT_MSG( nLen < pData->nAllocLength, _T("buffer overrun") );
+
+  // the strings we store are always NUL-terminated
+  pData->data()[nLen] = _T('\0');
+  pData->nDataLength = nLen;
+  pData->Validate(true);
+}
+
+// deprecated compatibility code:
+#if WXWIN_COMPATIBILITY_2_8
+wxChar *wxString::GetWriteBuf(size_t nLen)
+{
+    return DoGetWriteBuf(nLen);
+}
+

 void wxString::UngetWriteBuf()
 {
 void wxString::UngetWriteBuf()
 {

-  GetStringData()->nDataLength = wxStrlen(m_pchData);
-  GetStringData()->Validate(true);
+    DoUngetWriteBuf();

 }
 
 void wxString::UngetWriteBuf(size_t nLen)
 {
 }
 
 void wxString::UngetWriteBuf(size_t nLen)
 {

-  GetStringData()->nDataLength = nLen;
-  GetStringData()->Validate(true);
+    DoUngetWriteBuf(nLen);

 }
 }

-#endif
+#endif // WXWIN_COMPATIBILITY_2_8
+
+#endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
+

 
 // ---------------------------------------------------------------------------
 // data access
 
 // ---------------------------------------------------------------------------
 // data access


@@ -1196,131 +1167,319 @@ wxString& wxString::operator=(const wchar_t *pwz)
 
 wxString operator+(const wxString& str1, const wxString& str2)
 {
 
 wxString operator+(const wxString& str1, const wxString& str2)
 {

-#if !wxUSE_STL
-  wxASSERT( str1.GetStringData()->IsValid() );
-  wxASSERT( str2.GetStringData()->IsValid() );
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str1.IsValid() );
+    wxASSERT( str2.IsValid() );
+#endif
+
+    wxString s = str1;
+    s += str2;
+
+    return s;
+}
+
+wxString operator+(const wxString& str, wxUniChar ch)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );
+#endif
+
+    wxString s = str;
+    s += ch;
+
+    return s;
+}
+
+wxString operator+(wxUniChar ch, const wxString& str)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );
+#endif
+
+    wxString s = ch;
+    s += str;
+
+    return s;
+}
+
+wxString operator+(const wxString& str, const char *psz)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );

 #endif
 
 #endif
 

-  wxString s = str1;
-  s += str2;
+    wxString s;
+    if ( !s.Alloc(strlen(psz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s += str;
+    s += psz;
+
+    return s;
+}
+
+wxString operator+(const wxString& str, const wchar_t *pwz)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );
+#endif
+
+    wxString s;
+    if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s += str;
+    s += pwz;
+
+    return s;
+}
+
+wxString operator+(const char *psz, const wxString& str)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );
+#endif
+
+    wxString s;
+    if ( !s.Alloc(strlen(psz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s = psz;
+    s += str;
+
+    return s;
+}
+
+wxString operator+(const wchar_t *pwz, const wxString& str)
+{
+#if !wxUSE_STL_BASED_WXSTRING
+    wxASSERT( str.IsValid() );
+#endif
+
+    wxString s;
+    if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s = pwz;
+    s += str;
+
+    return s;
+}
+
+// ---------------------------------------------------------------------------
+// find_{first,last}_[not]_of functions
+// ---------------------------------------------------------------------------
+
+#if !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8
+
+// NB: All these functions are implemented  with the argument being wxChar*,
+//     i.e. widechar string in any Unicode build, even though native string
+//     representation is char* in the UTF-8 build. This is because we couldn't
+//     use memchr() to determine if a character is in a set encoded as UTF-8.
+
+size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const
+{
+    return find_first_of(sz, nStart, wxStrlen(sz));
+}

 
 

-  return s;
+size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const
+{
+    return find_first_not_of(sz, nStart, wxStrlen(sz));

 }
 
 }
 

-wxString operator+(const wxString& str, wxChar ch)
+size_t wxString::find_first_of(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-#if !wxUSE_STL
-  wxASSERT( str.GetStringData()->IsValid() );
-#endif
+    wxASSERT_MSG( nStart <= length(),  _T("invalid index") );

 
 

-  wxString s = str;
-  s += ch;
+    size_t idx = nStart;
+    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
+    {
+        if ( wxTmemchr(sz, *i, n) )
+            return idx;
+    }

 
 

-  return s;
+    return npos;

 }
 
 }
 

-wxString operator+(wxChar ch, const wxString& str)
+size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-#if !wxUSE_STL
-  wxASSERT( str.GetStringData()->IsValid() );
-#endif
+    wxASSERT_MSG( nStart <= length(),  _T("invalid index") );

 
 

-  wxString s = ch;
-  s += str;
+    size_t idx = nStart;
+    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
+    {
+        if ( !wxTmemchr(sz, *i, n) )
+            return idx;
+    }

 
 

-  return s;
+    return npos;

 }
 
 }
 

-wxString operator+(const wxString& str, const wxChar *psz)
-{
-#if !wxUSE_STL
-  wxASSERT( str.GetStringData()->IsValid() );
-#endif

 
 

-  wxString s;
-  if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
-    wxFAIL_MSG( _T("out of memory in wxString::operator+") );
-  }
-  s += str;
-  s += psz;
+size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const
+{
+    return find_last_of(sz, nStart, wxStrlen(sz));
+}

 
 

-  return s;
+size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const
+{
+    return find_last_not_of(sz, nStart, wxStrlen(sz));

 }
 
 }
 

-wxString operator+(const wxChar *psz, const wxString& str)
+size_t wxString::find_last_of(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-#if !wxUSE_STL
-  wxASSERT( str.GetStringData()->IsValid() );
-#endif
+    size_t len = length();

 
 

-  wxString s;
-  if ( !s.Alloc(wxStrlen(psz) + str.Len()) ) {
-    wxFAIL_MSG( _T("out of memory in wxString::operator+") );
-  }
-  s = psz;
-  s += str;
+    if ( nStart == npos )
+    {
+        nStart = len - 1;
+    }
+    else
+    {
+        wxASSERT_MSG( nStart <= len, _T("invalid index") );
+    }

 
 

-  return s;
-}
+    size_t idx = nStart;
+    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
+          i != rend(); --idx, ++i )
+    {
+        if ( wxTmemchr(sz, *i, n) )
+            return idx;
+    }

 
 

-// ===========================================================================
-// other common string functions
-// ===========================================================================
+    return npos;
+}

 
 

-int wxString::Cmp(const wxString& s) const
+size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart, size_t n) const

 {
 {

-    return compare(s);
+    size_t len = length();
+
+    if ( nStart == npos )
+    {
+        nStart = len - 1;
+    }
+    else
+    {
+        wxASSERT_MSG( nStart <= len, _T("invalid index") );
+    }
+
+    size_t idx = nStart;
+    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
+          i != rend(); --idx, ++i )
+    {
+        if ( !wxTmemchr(sz, *i, n) )
+            return idx;
+    }
+
+    return npos;

 }
 
 }
 

-int wxString::Cmp(const wxChar* psz) const
+size_t wxString::find_first_not_of(wxUniChar ch, size_t nStart) const

 {
 {

-    return compare(psz);
+    wxASSERT_MSG( nStart <= length(),  _T("invalid index") );
+
+    size_t idx = nStart;
+    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
+    {
+        if ( *i != ch )
+            return idx;
+    }
+
+    return npos;

 }
 
 }
 

-static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
-                                const wxChar* s2, size_t l2)
+size_t wxString::find_last_not_of(wxUniChar ch, size_t nStart) const

 {
 {

-    size_t i;
+    size_t len = length();

 
 

-    if( l1 == l2 )
+    if ( nStart == npos )

     {
     {

-        for(i = 0; i < l1; ++i)
-        {
-            if(wxTolower(s1[i]) != wxTolower(s2[i]))
-                break;
-        }
-        return i == l1 ? 0 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+        nStart = len - 1;

     }
     }

-    else if( l1 < l2 )
+    else

     {
     {

-        for(i = 0; i < l1; ++i)
-        {
-            if(wxTolower(s1[i]) != wxTolower(s2[i]))
-                break;
-        }
-        return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+        wxASSERT_MSG( nStart <= len, _T("invalid index") );

     }
     }

-    else
+
+    size_t idx = nStart;
+    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
+          i != rend(); --idx, ++i )

     {
     {

-        for(i = 0; i < l2; ++i)
-        {
-            if(wxTolower(s1[i]) != wxTolower(s2[i]))
-                break;
-        }
-        return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+        if ( *i != ch )
+            return idx;

     }
     }

+
+    return npos;

 }
 
 }
 

+// the functions above were implemented for wchar_t* arguments in Unicode
+// build and char* in ANSI build; below are implementations for the other
+// version:
+#if wxUSE_UNICODE
+    #define wxOtherCharType char
+    #define STRCONV         (const wxChar*)wxConvLibc.cMB2WC
+#else
+    #define wxOtherCharType wchar_t
+    #define STRCONV         (const wxChar*)wxConvLibc.cWC2MB
+#endif
+
+size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart) const
+    { return find_first_of(STRCONV(sz), nStart); }
+
+size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart,
+                               size_t n) const
+    { return find_first_of(STRCONV(sz, n, NULL), nStart, n); }
+size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart) const
+    { return find_last_of(STRCONV(sz), nStart); }
+size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart,
+                              size_t n) const
+    { return find_last_of(STRCONV(sz, n, NULL), nStart, n); }
+size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart) const
+    { return find_first_not_of(STRCONV(sz), nStart); }
+size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart,
+                                   size_t n) const
+    { return find_first_not_of(STRCONV(sz, n, NULL), nStart, n); }
+size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart) const
+    { return find_last_not_of(STRCONV(sz), nStart); }
+size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart,
+                                  size_t n) const
+    { return find_last_not_of(STRCONV(sz, n, NULL), nStart, n); }
+
+#undef wxOtherCharType
+#undef STRCONV
+
+#endif // !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8
+
+// ===========================================================================
+// other common string functions
+// ===========================================================================
+

 int wxString::CmpNoCase(const wxString& s) const
 {
 int wxString::CmpNoCase(const wxString& s) const
 {

-    return wxDoCmpNoCase(data(), length(), s.data(), s.length());
-}
+    // FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added

 
 

-int wxString::CmpNoCase(const wxChar* psz) const
-{
-    int nLen = wxStrlen(psz);
+    size_t idx = 0;
+    const_iterator i1 = begin();
+    const_iterator end1 = end();
+    const_iterator i2 = s.begin();
+    const_iterator end2 = s.end();
+
+    for ( ; i1 != end1 && i2 != end2; ++idx, ++i1, ++i2 )
+    {
+        wxUniChar lower1 = (wxChar)wxTolower(*i1);
+        wxUniChar lower2 = (wxChar)wxTolower(*i2);
+        if ( lower1 != lower2 )
+            return lower1 < lower2 ? -1 : 1;
+    }
+
+    size_t len1 = length();
+    size_t len2 = s.length();

 
 

-    return wxDoCmpNoCase(data(), length(), psz, nLen);
+    if ( len1 < len2 )
+        return -1;
+    else if ( len1 > len2 )
+        return 1;
+    return 0;

 }
 
 
 }
 
 


@@ -1451,6 +1610,27 @@ bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const
     return true;
 }
 
     return true;
 }
 

+
+// check that the string ends with suffix and return the rest of it in the
+// provided pointer if it is not NULL, otherwise return false
+bool wxString::EndsWith(const wxChar *suffix, wxString *rest) const
+{
+    wxASSERT_MSG( suffix, _T("invalid parameter in wxString::EndssWith") );
+
+    int start = length() - wxStrlen(suffix);
+    if ( start < 0 || wxStrcmp(wx_str() + start, suffix) != 0 )
+        return false;
+
+    if ( rest )
+    {
+        // put the rest of the string into provided pointer
+        rest->assign(*this, 0, start);
+    }
+
+    return true;
+}
+
+

 // extract nCount last (rightmost) characters
 wxString wxString::Right(size_t nCount) const
 {
 // extract nCount last (rightmost) characters
 wxString wxString::Right(size_t nCount) const
 {


@@ -1466,14 +1646,14 @@ wxString wxString::Right(size_t nCount) const
 
 // get all characters after the last occurence of ch
 // (returns the whole string if ch not found)
 
 // get all characters after the last occurence of ch
 // (returns the whole string if ch not found)

-wxString wxString::AfterLast(wxChar ch) const
+wxString wxString::AfterLast(wxUniChar ch) const

 {
   wxString str;
   int iPos = Find(ch, true);
   if ( iPos == wxNOT_FOUND )
     str = *this;
   else
 {
   wxString str;
   int iPos = Find(ch, true);
   if ( iPos == wxNOT_FOUND )
     str = *this;
   else

-    str = c_str() + iPos + 1;
+    str = wx_str() + iPos + 1;

 
   return str;
 }
 
   return str;
 }


@@ -1493,7 +1673,7 @@ wxString wxString::Left(size_t nCount) const
 
 // get all characters before the first occurence of ch
 // (returns the whole string if ch not found)
 
 // get all characters before the first occurence of ch
 // (returns the whole string if ch not found)

-wxString wxString::BeforeFirst(wxChar ch) const
+wxString wxString::BeforeFirst(wxUniChar ch) const

 {
   int iPos = Find(ch);
   if ( iPos == wxNOT_FOUND ) iPos = length();
 {
   int iPos = Find(ch);
   if ( iPos == wxNOT_FOUND ) iPos = length();


@@ -1502,7 +1682,7 @@ wxString wxString::BeforeFirst(wxChar ch) const
 
 /// get all characters before the last occurence of ch
 /// (returns empty string if ch not found)
 
 /// get all characters before the last occurence of ch
 /// (returns empty string if ch not found)

-wxString wxString::BeforeLast(wxChar ch) const
+wxString wxString::BeforeLast(wxUniChar ch) const

 {
   wxString str;
   int iPos = Find(ch, true);
 {
   wxString str;
   int iPos = Find(ch, true);


@@ -1514,12 +1694,12 @@ wxString wxString::BeforeLast(wxChar ch) const
 
 /// get all characters after the first occurence of ch
 /// (returns empty string if ch not found)
 
 /// get all characters after the first occurence of ch
 /// (returns empty string if ch not found)

-wxString wxString::AfterFirst(wxChar ch) const
+wxString wxString::AfterFirst(wxUniChar ch) const

 {
   wxString str;
   int iPos = Find(ch);
   if ( iPos != wxNOT_FOUND )
 {
   wxString str;
   int iPos = Find(ch);
   if ( iPos != wxNOT_FOUND )

-    str = c_str() + iPos + 1;
+    str = wx_str() + iPos + 1;

 
   return str;
 }
 
   return str;
 }


@@ -1642,65 +1822,65 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
 // trims spaces (in the sense of isspace) from left or right side
 wxString& wxString::Trim(bool bFromRight)
 {
 // trims spaces (in the sense of isspace) from left or right side
 wxString& wxString::Trim(bool bFromRight)
 {

-  // first check if we're going to modify the string at all
-  if ( !empty() &&
-       (
-        (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
-        (!bFromRight && wxSafeIsspace(GetChar(0u)))
+    // first check if we're going to modify the string at all
+    if ( !empty() &&
+         (
+          (bFromRight && wxSafeIsspace(GetChar(length() - 1))) ||
+          (!bFromRight && wxSafeIsspace(GetChar(0u)))
+         )

        )
        )

-     )
-  {
-    if ( bFromRight )

     {
     {

-      // find last non-space character
-      iterator psz = begin() + length() - 1;
-      while ( wxSafeIsspace(*psz) && (psz >= begin()) )
-        psz--;
+        if ( bFromRight )
+        {
+            // find last non-space character
+            reverse_iterator psz = rbegin();
+            while ( (psz != rend()) && wxSafeIsspace(*psz) )
+                psz++;

 
 

-      // truncate at trailing space start
-      *++psz = wxT('\0');
-      erase(psz, end());
-    }
-    else
-    {
-      // find first non-space character
-      iterator psz = begin();
-      while ( wxSafeIsspace(*psz) )
-        psz++;
+            // truncate at trailing space start
+            erase(psz.base(), end());
+        }
+        else
+        {
+            // find first non-space character
+            iterator psz = begin();
+            while ( (psz != end()) && wxSafeIsspace(*psz) )
+                psz++;

 
 

-      // fix up data and length
-      erase(begin(), psz);
+            // fix up data and length
+            erase(begin(), psz);
+        }

     }
     }

-  }

 
 

-  return *this;
+    return *this;

 }
 
 // adds nCount characters chPad to the string from either side
 }
 
 // adds nCount characters chPad to the string from either side

-wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight)
+wxString& wxString::Pad(size_t nCount, wxUniChar chPad, bool bFromRight)

 {
 {

-  wxString s(chPad, nCount);
+    wxString s(chPad, nCount);

 
 

-  if ( bFromRight )
-    *this += s;
-  else
-  {
-    s += *this;
-    swap(s);
-  }
+    if ( bFromRight )
+        *this += s;
+    else
+    {
+        s += *this;
+        swap(s);
+    }

 
 

-  return *this;
+    return *this;

 }
 
 // truncate the string
 wxString& wxString::Truncate(size_t uiLen)
 {
 }
 
 // truncate the string
 wxString& wxString::Truncate(size_t uiLen)
 {

-  if ( uiLen < Len() ) {
-    erase(begin() + uiLen, end());
-  }
-  //else: nothing to do, string is already short enough
+    if ( uiLen < length() )
+    {
+        erase(begin() + uiLen, end());
+    }
+    //else: nothing to do, string is already short enough

 
 

-  return *this;
+    return *this;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1708,64 +1888,106 @@ wxString& wxString::Truncate(size_t uiLen)
 // ---------------------------------------------------------------------------
 
 // find a character
 // ---------------------------------------------------------------------------
 
 // find a character

-int wxString::Find(wxChar ch, bool bFromEnd) const
+int wxString::Find(wxUniChar ch, bool bFromEnd) const

 {
 {

-  size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch);
+    size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch);

 
 

-  return (idx == npos) ? wxNOT_FOUND : (int)idx;
+    return (idx == npos) ? wxNOT_FOUND : (int)idx;

 }
 
 // find a sub-string (like strstr)
 int wxString::Find(const wxChar *pszSub) const
 {
 }
 
 // find a sub-string (like strstr)
 int wxString::Find(const wxChar *pszSub) const
 {

-  size_type idx = find(pszSub);
+    size_type idx = find(pszSub);

 
 

-  return (idx == npos) ? wxNOT_FOUND : (int)idx;
+    return (idx == npos) ? wxNOT_FOUND : (int)idx;

 }
 
 // ----------------------------------------------------------------------------
 // conversion to numbers
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // conversion to numbers
 // ----------------------------------------------------------------------------
 

-bool wxString::ToLong(long *val, int base) const
+// the implementation of all the functions below is exactly the same so factor
+// it out
+
+template <typename T, typename F>
+bool wxStringToIntType(const wxChar *start,
+                       T *val,
+                       int base,
+                       F func)

 {
 {

-    wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToLong") );
+    wxCHECK_MSG( val, false, _T("NULL output pointer") );

     wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 
     wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 

-    const wxChar *start = c_str();
+#ifndef __WXWINCE__
+    errno = 0;
+#endif
+

     wxChar *end;
     wxChar *end;

-    *val = wxStrtol(start, &end, base);
+    *val = (*func)(start, &end, base);

 
     // return true only if scan was stopped by the terminating NUL and if the
 
     // return true only if scan was stopped by the terminating NUL and if the

-    // string was not empty to start with
-    return !*end && (end != start);
+    // string was not empty to start with and no under/overflow occurred
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;
+}
+
+bool wxString::ToLong(long *val, int base) const
+{
+    return wxStringToIntType((const wxChar*)c_str(), val, base, wxStrtol);

 }
 
 bool wxString::ToULong(unsigned long *val, int base) const
 {
 }
 
 bool wxString::ToULong(unsigned long *val, int base) const
 {

-    wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToULong") );
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    return wxStringToIntType((const wxChar*)c_str(), val, base, wxStrtoul);
+}

 
 

-    const wxChar *start = c_str();
-    wxChar *end;
-    *val = wxStrtoul(start, &end, base);
+bool wxString::ToLongLong(wxLongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType((const wxChar*)c_str(), val, base, wxStrtoll);
+#else
+    // TODO: implement this ourselves
+    wxUnusedVar(val);
+    wxUnusedVar(base);
+    return false;
+#endif // wxHAS_STRTOLL
+}

 
 

-    // return true only if scan was stopped by the terminating NUL and if the
-    // string was not empty to start with
-    return !*end && (end != start);
+bool wxString::ToULongLong(wxULongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType((const wxChar*)c_str(), val, base, wxStrtoull);
+#else
+    // TODO: implement this ourselves
+    wxUnusedVar(val);
+    wxUnusedVar(base);
+    return false;
+#endif

 }
 
 bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 
 }
 
 bool wxString::ToDouble(double *val) const
 {
     wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
 

+#ifndef __WXWINCE__
+    errno = 0;
+#endif
+

     const wxChar *start = c_str();
     wxChar *end;
     *val = wxStrtod(start, &end);
 
     // return true only if scan was stopped by the terminating NUL and if the
     const wxChar *start = c_str();
     wxChar *end;
     *val = wxStrtod(start, &end);
 
     // return true only if scan was stopped by the terminating NUL and if the

-    // string was not empty to start with
-    return !*end && (end != start);
+    // string was not empty to start with and no under/overflow occurred
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1773,13 +1995,17 @@ bool wxString::ToDouble(double *val) const
 // ---------------------------------------------------------------------------
 
 /* static */
 // ---------------------------------------------------------------------------
 
 /* static */

-wxString wxString::Format(const wxChar *pszFormat, ...)
+#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
+wxString wxStringPrintfMixinBase::DoFormat(const wxChar *format, ...)
+#else
+wxString wxString::DoFormat(const wxChar *format, ...)
+#endif

 {
     va_list argptr;
 {
     va_list argptr;

-    va_start(argptr, pszFormat);
+    va_start(argptr, format);

 
     wxString s;
 
     wxString s;

-    s.PrintfV(pszFormat, argptr);
+    s.PrintfV(format, argptr);

 
     va_end(argptr);
 
 
     va_end(argptr);
 


@@ -1787,33 +2013,46 @@ wxString wxString::Format(const wxChar *pszFormat, ...)
 }
 
 /* static */
 }
 
 /* static */

-wxString wxString::FormatV(const wxChar *pszFormat, va_list argptr)
+wxString wxString::FormatV(const wxString& format, va_list argptr)

 {
     wxString s;
 {
     wxString s;

-    s.PrintfV(pszFormat, argptr);
+    s.PrintfV(format, argptr);

     return s;
 }
 
     return s;
 }
 

-int wxString::Printf(const wxChar *pszFormat, ...)
+#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
+int wxStringPrintfMixinBase::DoPrintf(const wxChar *format, ...)
+#else
+int wxString::DoPrintf(const wxChar *format, ...)
+#endif

 {
     va_list argptr;
 {
     va_list argptr;

-    va_start(argptr, pszFormat);
+    va_start(argptr, format);
+
+#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
+    // get a pointer to the wxString instance; we have to use dynamic_cast<>
+    // because it's the only cast that works safely for downcasting when
+    // multiple inheritance is used:
+    wxString *str = static_cast<wxString*>(this);
+#else
+    wxString *str = this;
+#endif

 
 

-    int iLen = PrintfV(pszFormat, argptr);
+    int iLen = str->PrintfV(format, argptr);

 
     va_end(argptr);
 
     return iLen;
 }
 
 
     va_end(argptr);
 
     return iLen;
 }
 

-int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
+int wxString::PrintfV(const wxString& format, va_list argptr)

 {
     int size = 1024;
 
     for ( ;; )
     {
         wxStringBuffer tmp(*this, size + 1);
 {
     int size = 1024;
 
     for ( ;; )
     {
         wxStringBuffer tmp(*this, size + 1);

-        wxChar* buf = tmp;
+        wxChar *buf = tmp;

 
         if ( !buf )
         {
 
         if ( !buf )
         {


@@ -1825,7 +2064,7 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // only a copy
         va_list argptrcopy;
         wxVaCopy(argptrcopy, argptr);
         // only a copy
         va_list argptrcopy;
         wxVaCopy(argptrcopy, argptr);

-        int len = wxVsnprintf(buf, size, pszFormat, argptrcopy);
+        int len = wxVsnprintf(buf, size, format, argptrcopy);

         va_end(argptrcopy);
 
         // some implementations of vsnprintf() don't NUL terminate
         va_end(argptrcopy);
 
         // some implementations of vsnprintf() don't NUL terminate


@@ -1836,20 +2075,42 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
         // buffer were large enough (newer standards such as Unix98)
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
         // buffer were large enough (newer standards such as Unix98)

-        if ( len >= 0 && len <= size )
+        if ( len < 0 )
+        {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns -1
+            // only for a format error - thus there's something wrong with
+            // the user's format string
+            return -1;
+#else // assume that system version only returns error if not enough space
+            // still not enough, as we don't know how much we need, double the
+            // current size of the buffer
+            size *= 2;
+#endif // wxUSE_WXVSNPRINTF/!wxUSE_WXVSNPRINTF
+        }
+        else if ( len >= size )
+        {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns 
+            // size+1 when there's not enough space but that's not the size
+            // of the required buffer!
+            size *= 2;      // so we just double the current size of the buffer
+#else
+            // some vsnprintf() implementations NUL-terminate the buffer and
+            // some don't in len == size case, to be safe always add 1
+            size = len + 1;
+#endif
+        }
+        else // ok, there was enough space

         {
         {

-            // ok, there was enough space

             break;
         }
             break;
         }

-
-        // still not enough, double it again
-        size *= 2;

     }
 
     // we could have overshot
     Shrink();
 
     }
 
     // we could have overshot
     Shrink();
 

-    return Len();
+    return length();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1995,13 +2256,12 @@ match:
 }
 
 // Count the number of chars
 }
 
 // Count the number of chars

-int wxString::Freq(wxChar ch) const
+int wxString::Freq(wxUniChar ch) const

 {
     int count = 0;
 {
     int count = 0;

-    int len = Len();
-    for (int i = 0; i < len; i++)
+    for ( const_iterator i = begin(); i != end(); ++i )

     {
     {

-        if (GetChar(i) == ch)
+        if ( *i == ch )

             count ++;
     }
     return count;
             count ++;
     }
     return count;


@@ -2014,15 +2274,6 @@ wxString wxString::Upper() const
 // convert to lower case, return the copy of the string
 wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); }
 
 // convert to lower case, return the copy of the string
 wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); }
 

-int wxString::sprintf(const wxChar *pszFormat, ...)
-  {
-    va_list argptr;
-    va_start(argptr, pszFormat);
-    int iLen = PrintfV(pszFormat, argptr);
-    va_end(argptr);
-    return iLen;
-  }
-

 // ============================================================================
 // ArrayString
 // ============================================================================
 // ============================================================================
 // ArrayString
 // ============================================================================


@@ -2056,14 +2307,12 @@ wxArrayString::wxArrayString(size_t sz, const wxString* a)
 #define   ARRAY_DEFAULT_INITIAL_SIZE    (16)
 #endif
 
 #define   ARRAY_DEFAULT_INITIAL_SIZE    (16)
 #endif
 

-#define   STRING(p)   ((wxString *)(&(p)))
-

 // ctor
 void wxArrayString::Init(bool autoSort)
 {
   m_nSize  =
   m_nCount = 0;
 // ctor
 void wxArrayString::Init(bool autoSort)
 {
   m_nSize  =
   m_nCount = 0;

-  m_pItems = (wxChar **) NULL;
+  m_pItems = NULL;

   m_autoSort = autoSort;
 }
 
   m_autoSort = autoSort;
 }
 


@@ -2113,7 +2362,7 @@ void wxArrayString::Grow(size_t nIncrement)
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
       if (m_nSize < nIncrement)
           m_nSize = nIncrement;
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
       if (m_nSize < nIncrement)
           m_nSize = nIncrement;

-      m_pItems = new wxChar *[m_nSize];
+      m_pItems = new wxString[m_nSize];

     }
     else {
       // otherwise when it's called for the first time, nIncrement would be 0
     }
     else {
       // otherwise when it's called for the first time, nIncrement would be 0


@@ -2126,10 +2375,11 @@ void wxArrayString::Grow(size_t nIncrement)
       if ( nIncrement < ndefIncrement )
         nIncrement = ndefIncrement;
       m_nSize += nIncrement;
       if ( nIncrement < ndefIncrement )
         nIncrement = ndefIncrement;
       m_nSize += nIncrement;

-      wxChar **pNew = new wxChar *[m_nSize];
+      wxString *pNew = new wxString[m_nSize];

 
       // copy data to new location
 
       // copy data to new location

-      memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+      for ( size_t j = 0; j < m_nCount; j++ )
+          pNew[j] = m_pItems[j];

 
       // delete old memory (but do not release the strings!)
       wxDELETEA(m_pItems);
 
       // delete old memory (but do not release the strings!)
       wxDELETEA(m_pItems);


@@ -2139,26 +2389,15 @@ void wxArrayString::Grow(size_t nIncrement)
   }
 }
 
   }
 }
 

-void wxArrayString::Free()
-{
-  for ( size_t n = 0; n < m_nCount; n++ ) {
-    STRING(m_pItems[n])->GetStringData()->Unlock();
-  }
-}
-

 // deletes all the strings from the list
 void wxArrayString::Empty()
 {
 // deletes all the strings from the list
 void wxArrayString::Empty()
 {

-  Free();
-

   m_nCount = 0;
 }
 
 // as Empty, but also frees memory
 void wxArrayString::Clear()
 {
   m_nCount = 0;
 }
 
 // as Empty, but also frees memory
 void wxArrayString::Clear()
 {

-  Free();
-

   m_nSize  =
   m_nCount = 0;
 
   m_nSize  =
   m_nCount = 0;
 


@@ -2168,8 +2407,6 @@ void wxArrayString::Clear()
 // dtor
 wxArrayString::~wxArrayString()
 {
 // dtor
 wxArrayString::~wxArrayString()
 {

-  Free();
-

   wxDELETEA(m_pItems);
 }
 
   wxDELETEA(m_pItems);
 }
 


@@ -2183,13 +2420,17 @@ void wxArrayString::Alloc(size_t nSize)
 {
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
 {
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {

-    Free();
-    wxDELETEA(m_pItems);
-    m_pItems = new wxChar *[nSize];
+    wxString *pNew = new wxString[nSize];
+    if ( !pNew )
+        return;
+
+    for ( size_t j = 0; j < m_nCount; j++ )
+        pNew[j] = m_pItems[j];
+    delete [] m_pItems;
+
+    m_pItems = pNew;

     m_nSize  = nSize;
   }
     m_nSize  = nSize;
   }

-
-  m_nCount = 0;

 }
 
 // minimizes the memory usage by freeing unused memory
 }
 
 // minimizes the memory usage by freeing unused memory


@@ -2198,39 +2439,16 @@ void wxArrayString::Shrink()
   // only do it if we have some memory to free
   if( m_nCount < m_nSize ) {
     // allocates exactly as much memory as we need
   // only do it if we have some memory to free
   if( m_nCount < m_nSize ) {
     // allocates exactly as much memory as we need

-    wxChar **pNew = new wxChar *[m_nCount];
+    wxString *pNew = new wxString[m_nCount];

 
     // copy data to new location
 
     // copy data to new location

-    memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+    for ( size_t j = 0; j < m_nCount; j++ )
+        pNew[j] = m_pItems[j];

     delete [] m_pItems;
     m_pItems = pNew;
   }
 }
 
     delete [] m_pItems;
     m_pItems = pNew;
   }
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-
-// return a wxString[] as required for some control ctors.
-wxString* wxArrayString::GetStringArray() const
-{
-    wxString *array = 0;
-
-    if( m_nCount > 0 )
-    {
-        array = new wxString[m_nCount];
-        for( size_t i = 0; i < m_nCount; i++ )
-            array[i] = m_pItems[i];
-    }
-
-    return array;
-}
-
-void wxArrayString::Remove(size_t nIndex, size_t nRemove)
-{
-    RemoveAt(nIndex, nRemove);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-

 // searches the array for an item (forward or backwards)
 int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
 {
 // searches the array for an item (forward or backwards)
 int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
 {


@@ -2263,7 +2481,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
       if ( m_nCount > 0 ) {
         size_t ui = m_nCount;
         do {
       if ( m_nCount > 0 ) {
         size_t ui = m_nCount;
         do {

-          if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) )
+          if ( m_pItems[--ui].IsSameAs(sz, bCase) )

             return ui;
         }
         while ( ui != 0 );
             return ui;
         }
         while ( ui != 0 );


@@ -2271,7 +2489,7 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
     }
     else {
       for( size_t ui = 0; ui < m_nCount; ui++ ) {
     }
     else {
       for( size_t ui = 0; ui < m_nCount; ui++ ) {

-        if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) )
+        if( m_pItems[ui].IsSameAs(sz, bCase) )

           return ui;
       }
     }
           return ui;
       }
     }


@@ -2310,17 +2528,12 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
     return (size_t)lo;
   }
   else {
     return (size_t)lo;
   }
   else {

-    wxASSERT( str.GetStringData()->IsValid() );
-

     Grow(nInsert);
 
     for (size_t i = 0; i < nInsert; i++)
     {
     Grow(nInsert);
 
     for (size_t i = 0; i < nInsert; i++)
     {

-        // the string data must not be deleted!
-        str.GetStringData()->Lock();
-

         // just append
         // just append

-        m_pItems[m_nCount + i] = (wxChar *)str.c_str(); // const_cast
+        m_pItems[m_nCount + i] = str;

     }
     size_t ret = m_nCount;
     m_nCount += nInsert;
     }
     size_t ret = m_nCount;
     m_nCount += nInsert;


@@ -2331,21 +2544,18 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
 // add item at the given position
 void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
 {
 // add item at the given position
 void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
 {

-  wxASSERT( str.GetStringData()->IsValid() );
-

   wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );
   wxCHECK_RET( m_nCount <= m_nCount + nInsert,
                wxT("array size overflow in wxArrayString::Insert") );
 
   Grow(nInsert);
 
   wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );
   wxCHECK_RET( m_nCount <= m_nCount + nInsert,
                wxT("array size overflow in wxArrayString::Insert") );
 
   Grow(nInsert);
 

-  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],
-          (m_nCount - nIndex)*sizeof(wxChar *));
+  for (int j = m_nCount - nIndex - 1; j >= 0; j--)
+      m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j];

 
   for (size_t i = 0; i < nInsert; i++)
   {
 
   for (size_t i = 0; i < nInsert; i++)
   {

-      str.GetStringData()->Lock();
-      m_pItems[nIndex + i] = (wxChar *)str.c_str();
+      m_pItems[nIndex + i] = str;

   }
   m_nCount += nInsert;
 }
   }
   m_nCount += nInsert;
 }


@@ -2381,7 +2591,7 @@ void wxArrayString::SetCount(size_t count)
 
     wxString s;
     while ( m_nCount < count )
 
     wxString s;
     while ( m_nCount < count )

-        m_pItems[m_nCount++] = (wxChar *)s.c_str();
+        m_pItems[m_nCount++] = s;

 }
 
 // removes item from array (by index)
 }
 
 // removes item from array (by index)


@@ -2391,12 +2601,9 @@ void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
   wxCHECK_RET( nIndex + nRemove <= m_nCount,
                wxT("removing too many elements in wxArrayString::Remove") );
 
   wxCHECK_RET( nIndex + nRemove <= m_nCount,
                wxT("removing too many elements in wxArrayString::Remove") );
 

-  // release our lock
-  for (size_t i = 0; i < nRemove; i++)
-      Item(nIndex + i).GetStringData()->Unlock();
+  for ( size_t j =  0; j < m_nCount - nIndex -nRemove; j++)
+      m_pItems[nIndex + j] = m_pItems[nIndex + nRemove + j];

 
 

-  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],
-          (m_nCount - nIndex - nRemove)*sizeof(wxChar *));

   m_nCount -= nRemove;
 }
 
   m_nCount -= nRemove;
 }
 


@@ -2427,19 +2634,7 @@ void wxArrayString::assign(const_iterator first, const_iterator last)
 #if wxUSE_THREADS
   // need a critical section to protect access to gs_compareFunction and
   // gs_sortAscending variables
 #if wxUSE_THREADS
   // need a critical section to protect access to gs_compareFunction and
   // gs_sortAscending variables

-  static wxCriticalSection *gs_critsectStringSort = NULL;
-
-  // call this before the value of the global sort vars is changed/after
-  // you're finished with them
-  #define START_SORT()     wxASSERT( !gs_critsectStringSort );                \
-                           gs_critsectStringSort = new wxCriticalSection;     \
-                           gs_critsectStringSort->Enter()
-  #define END_SORT()       gs_critsectStringSort->Leave();                    \
-                           delete gs_critsectStringSort;                      \
-                           gs_critsectStringSort = NULL
-#else // !threads
-  #define START_SORT()
-  #define END_SORT()
+  static wxCriticalSection gs_critsectStringSort;

 #endif // wxUSE_THREADS
 
 // function to use for string comparaison
 #endif // wxUSE_THREADS
 
 // function to use for string comparaison


@@ -2470,7 +2665,7 @@ wxStringCompareFunction(const void *first, const void *second)
 // sort array elements using passed comparaison function
 void wxArrayString::Sort(CompareFunction compareFunction)
 {
 // sort array elements using passed comparaison function
 void wxArrayString::Sort(CompareFunction compareFunction)
 {

-  START_SORT();
+  wxCRIT_SECT_LOCKER(lockCmpFunc, gs_critsectStringSort);

 
   wxASSERT( !gs_compareFunction );  // must have been reset to NULL
   gs_compareFunction = compareFunction;
 
   wxASSERT( !gs_compareFunction );  // must have been reset to NULL
   gs_compareFunction = compareFunction;


@@ -2479,8 +2674,6 @@ void wxArrayString::Sort(CompareFunction compareFunction)
 
   // reset it to NULL so that Sort(bool) will work the next time
   gs_compareFunction = NULL;
 
   // reset it to NULL so that Sort(bool) will work the next time
   gs_compareFunction = NULL;

-
-  END_SORT();

 }
 
 extern "C"
 }
 
 extern "C"


@@ -2491,7 +2684,7 @@ extern "C"
 
 void wxArrayString::Sort(CompareFunction2 compareFunction)
 {
 
 void wxArrayString::Sort(CompareFunction2 compareFunction)
 {

-  qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction);
+  qsort(m_pItems, m_nCount, sizeof(wxString), (wxStringCompareFn)compareFunction);

 }
 
 void wxArrayString::Sort(bool reverseOrder)
 }
 
 void wxArrayString::Sort(bool reverseOrder)


@@ -2503,9 +2696,7 @@ void wxArrayString::DoSort()
 {
   wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
 
 {
   wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
 

-  // just sort the pointers using qsort() - of course it only works because
-  // wxString() *is* a pointer to its data
-  qsort(m_pItems, m_nCount, sizeof(wxChar *), wxStringCompareFunction);
+  qsort(m_pItems, m_nCount, sizeof(wxString), wxStringCompareFunction);

 }
 
 bool wxArrayString::operator==(const wxArrayString& a) const
 }
 
 bool wxArrayString::operator==(const wxArrayString& a) const


@@ -2533,3 +2724,106 @@ int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
 {
     return -s1->Cmp(*s2);
 }
 {
     return -s1->Cmp(*s2);
 }

+
+
+
+// ===========================================================================
+// wxJoin and wxSplit
+// ===========================================================================
+
+#include "wx/tokenzr.h"
+
+wxString wxJoin(const wxArrayString& arr, const wxChar sep, const wxChar escape)
+{
+    size_t count = arr.size();
+    if ( count == 0 )
+        return wxEmptyString;
+
+    wxString str;
+
+    // pre-allocate memory using the estimation of the average length of the
+    // strings in the given array: this is very imprecise, of course, but
+    // better than nothing
+    str.reserve(count*(arr[0].length() + arr[count-1].length()) / 2);
+
+    if ( escape == wxT('\0') )
+    {
+        // escaping is disabled:
+        for ( size_t i = 0; i < count; i++ )
+        {
+            if ( i )
+                str += sep;
+            str += arr[i];
+        }
+    }
+    else // use escape character
+    {
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( n )
+                str += sep;
+
+            for ( wxString::const_iterator i = arr[n].begin(),
+                                         end = arr[n].end();
+                  i != end;
+                  ++i )
+            {
+                const wxChar ch = *i;
+                if ( ch == sep )
+                    str += escape;      // escape this separator
+                str += ch;
+            }
+        }
+    }
+
+    str.Shrink(); // release extra memory if we allocated too much
+    return str;
+}
+
+wxArrayString wxSplit(const wxString& str, const wxChar sep, const wxChar escape)
+{
+    if ( escape == wxT('\0') )
+    {
+        // simple case: we don't need to honour the escape character
+        return wxStringTokenize(str, sep, wxTOKEN_RET_EMPTY_ALL);
+    }
+
+    wxArrayString ret;
+    wxString curr;
+    wxChar prev = wxT('\0');
+
+    for ( wxString::const_iterator i = str.begin(),
+                                 end = str.end();
+          i != end;
+          ++i )
+    {
+        const wxChar ch = *i;
+
+        if ( ch == sep )
+        {
+            if ( prev == escape )
+            {
+                // remove the escape character and don't consider this
+                // occurrence of 'sep' as a real separator
+                *curr.rbegin() = sep;
+            }
+            else // real separator
+            {
+                ret.push_back(curr);
+                curr.clear();
+            }
+        }
+        else // normal character
+        {
+            curr += ch;
+        }
+
+        prev = ch;
+    }
+
+    // add the last token
+    if ( !curr.empty() || prev == sep )
+        ret.Add(curr);
+
+    return ret;
+}