All IO calls take void* instead of char*

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 4126813a500f35fcb0fd9e8ac92fd29ea6b28bde..bd4dc94a6212c15a199610545ed1af08120a913c 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -35,9 +35,7 @@
   #include "wx/defs.h"
   #include "wx/string.h"
   #include "wx/intl.h"
   #include "wx/defs.h"
   #include "wx/string.h"
   #include "wx/intl.h"

-#if wxUSE_THREADS
-  #include <wx/thread.h>
-#endif
+  #include "wx/thread.h"

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


@@ -56,6 +54,11 @@
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT
 
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT
 

+#if wxUSE_UNICODE
+#undef wxUSE_EXPERIMENTAL_PRINTF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
+#endif
+

 // allocating extra space for each string consumes more memory but speeds up
 // the concatenation operations (nLen is the current string's length)
 // NB: EXTRA_ALLOC must be >= 0!
 // allocating extra space for each string consumes more memory but speeds up
 // the concatenation operations (nLen is the current string's length)
 // NB: EXTRA_ALLOC must be >= 0!


@@ -80,40 +83,57 @@ static const struct
 {
   wxStringData data;
   wxChar dummy;
 {
   wxStringData data;
   wxChar dummy;

-} g_strEmpty = { {-1, 0, 0}, _T('\0') };
+} g_strEmpty = { {-1, 0, 0}, wxT('\0') };
+
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+// must define this static for VA or else you get multiply defined symbols everywhere
+const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
+
+#endif

 
 // empty C style string: points to 'string data' byte of g_strEmpty
 
 // empty C style string: points to 'string data' byte of g_strEmpty

-extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
+extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;

 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 

+#if !defined(__WXSW__) && wxUSE_UNICODE
+  #ifdef wxUSE_EXPERIMENTAL_PRINTF
+    #undef wxUSE_EXPERIMENTAL_PRINTF
+  #endif
+  #define wxUSE_EXPERIMENTAL_PRINTF 1
+#endif
+

 // we want to find out if the current platform supports vsnprintf()-like
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.
 // we want to find out if the current platform supports vsnprintf()-like
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.

+//
+// FIXME currently, this is only for ANSI (!Unicode) strings, so we call this
+//       function wxVsnprintfA (A for ANSI), should also find one for Unicode
+//       strings in Unicode build

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    #ifdef __VISUALC__
-        #define wxVsnprintf     _vsnprintf
+    #if defined(__VISUALC__) || wxUSE_NORLANDER_HEADERS
+        #define wxVsnprintfA     _vsnprintf

     #endif
 #else   // !Windows
     #ifdef HAVE_VSNPRINTF
     #endif
 #else   // !Windows
     #ifdef HAVE_VSNPRINTF

-        #define wxVsnprintf       vsnprintf
+        #define wxVsnprintfA       vsnprintf

     #endif
 #endif  // Windows/!Windows
 
     #endif
 #endif  // Windows/!Windows
 

-#ifndef wxVsnprintf
+#ifndef wxVsnprintfA

     // in this case we'll use vsprintf() (which is ANSI and thus should be
     // always available), but it's unsafe because it doesn't check for buffer
     // size - so give a warning
     // in this case we'll use vsprintf() (which is ANSI and thus should be
     // always available), but it's unsafe because it doesn't check for buffer
     // size - so give a warning

-    #define wxVsnprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
+    #define wxVsnprintfA(buf, len, format, arg) vsprintf(buf, format, arg)

 
     #if defined(__VISUALC__)
         #pragma message("Using sprintf() because no snprintf()-like function defined")
     #elif defined(__GNUG__) && !defined(__UNIX__)
         #warning "Using sprintf() because no snprintf()-like function defined"
     #elif defined(__MWERKS__)
 
     #if defined(__VISUALC__)
         #pragma message("Using sprintf() because no snprintf()-like function defined")
     #elif defined(__GNUG__) && !defined(__UNIX__)
         #warning "Using sprintf() because no snprintf()-like function defined"
     #elif defined(__MWERKS__)

-           #warning "Using sprintf() because no snprintf()-like function defined"
+        #warning "Using sprintf() because no snprintf()-like function defined"

     #endif //compiler
 #endif // no vsnprintf
 
     #endif //compiler
 #endif // no vsnprintf
 


@@ -126,7 +146,7 @@ extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 // global functions
 // ----------------------------------------------------------------------------
 
 // global functions
 // ----------------------------------------------------------------------------
 

-#ifdef  wxSTD_STRING_COMPATIBILITY
+#if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM

 
 // MS Visual C++ version 5.0 provides the new STL headers as well as the old
 // iostream ones.
 
 // MS Visual C++ version 5.0 provides the new STL headers as well as the old
 // iostream ones.


@@ -164,8 +184,53 @@ istream& operator>>(istream& is, wxString& WXUNUSED(str))
   return is;
 }
 
   return is;
 }
 

+ostream& operator<<(ostream& os, const wxString& str)
+{
+  os << str.c_str();
+  return os;
+}
+

 #endif  //std::string compatibility
 
 #endif  //std::string compatibility
 

+extern int WXDLLEXPORT wxVsnprintf(wxChar *buf, size_t len,
+                                   const wxChar *format, va_list argptr)
+{
+#if wxUSE_UNICODE
+    // FIXME should use wvsnprintf() or whatever if it's available
+    wxString s;
+    int iLen = s.PrintfV(format, argptr);
+    if ( iLen != -1 )
+    {
+        wxStrncpy(buf, s.c_str(), iLen);
+    }
+
+    return iLen;
+#else // ANSI
+    // vsnprintf() will not terminate the string with '\0' if there is not
+    // enough place, but we want the string to always be NUL terminated
+    int rc = wxVsnprintfA(buf, len - 1, format, argptr);
+    if ( rc == -1 )
+    {
+        buf[len] = 0;
+    }
+
+    return rc;
+#endif // Unicode/ANSI
+}
+
+extern int WXDLLEXPORT wxSnprintf(wxChar *buf, size_t len,
+                                  const wxChar *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int iLen = wxVsnprintf(buf, len, format, argptr);
+
+    va_end(argptr);
+
+    return iLen;
+}
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -225,11 +290,11 @@ void wxString::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
 {
   Init();
 
 {
   Init();
 

-  wxASSERT( nPos <= wxStrlen(psz) );
-

   if ( nLength == wxSTRING_MAXLEN )
     nLength = wxStrlen(psz + nPos);
 
   if ( nLength == wxSTRING_MAXLEN )
     nLength = wxStrlen(psz + nPos);
 

+  wxASSERT_MSG( nPos + nLength <= wxStrlen(psz), _T("index out of bounds") );
+

   STATISTICS_ADD(InitialLength, nLength);
 
   if ( nLength > 0 ) {
   STATISTICS_ADD(InitialLength, nLength);
 
   if ( nLength > 0 ) {


@@ -256,15 +321,14 @@ wxString::wxString(const void *pStart, const void *pEnd)
 wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
 {
   // first get necessary size
 wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
 {
   // first get necessary size

-
-  size_t nLen = conv.MB2WC((wchar_t *) NULL, psz, 0);
+  size_t nLen = psz ? conv.MB2WC((wchar_t *) NULL, psz, 0) : 0;

 
   // nLength is number of *Unicode* characters here!
 
   // nLength is number of *Unicode* characters here!

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

     nLen = nLength;
 
   // empty?
     nLen = nLength;
 
   // empty?

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

     AllocBuffer(nLen);
     conv.MB2WC(m_pchData, psz, nLen);
   }
     AllocBuffer(nLen);
     conv.MB2WC(m_pchData, psz, nLen);
   }


@@ -273,17 +337,17 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
   }
 }
 
   }
 }
 

-#else
+#else // ANSI

 
 

+#if wxUSE_WCHAR_T

 // from wide string
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size
 // from wide string
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size

-
-  size_t nLen = wxWC2MB((char *) NULL, pwz, 0);
+  size_t nLen = pwz ? wxWC2MB((char *) NULL, pwz, 0) : 0;

 
   // empty?
 
   // empty?

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

     AllocBuffer(nLen);
     wxWC2MB(m_pchData, pwz, nLen);
   }
     AllocBuffer(nLen);
     wxWC2MB(m_pchData, pwz, nLen);
   }


@@ -291,8 +355,9 @@ wxString::wxString(const wchar_t *pwz)
     Init();
   }
 }
     Init();
   }
 }

+#endif // wxUSE_WCHAR_T

 
 

-#endif
+#endif // Unicode/ANSI

 
 // ---------------------------------------------------------------------------
 // memory allocation
 
 // ---------------------------------------------------------------------------
 // memory allocation


@@ -301,8 +366,13 @@ wxString::wxString(const wchar_t *pwz)
 // allocates memory needed to store a C string of length nLen
 void wxString::AllocBuffer(size_t nLen)
 {
 // allocates memory needed to store a C string of length nLen
 void wxString::AllocBuffer(size_t nLen)
 {

-  wxASSERT( nLen >  0         );    //
-  wxASSERT( nLen <= INT_MAX-1 );    // max size (enough room for 1 extra)
+  // allocating 0 sized buffer doesn't make sense, all empty strings should
+  // reuse g_strEmpty
+  wxASSERT( nLen >  0 );
+
+  // make sure that we don't overflow
+  wxASSERT( nLen < (INT_MAX / sizeof(wxChar)) -
+                   (sizeof(wxStringData) + EXTRA_ALLOC + 1) );

 
   STATISTICS_ADD(Length, nLen);
 
 
   STATISTICS_ADD(Length, nLen);
 


@@ -315,7 +385,7 @@ void wxString::AllocBuffer(size_t nLen)
   pData->nDataLength  = nLen;
   pData->nAllocLength = nLen + EXTRA_ALLOC;
   m_pchData           = pData->data();  // data starts after wxStringData
   pData->nDataLength  = nLen;
   pData->nAllocLength = nLen + EXTRA_ALLOC;
   m_pchData           = pData->data();  // data starts after wxStringData

-  m_pchData[nLen]     = _T('\0');
+  m_pchData[nLen]     = wxT('\0');

 }
 
 // must be called before changing this string
 }
 
 // must be called before changing this string


@@ -340,13 +410,35 @@ void wxString::AllocBeforeWrite(size_t nLen)
 
   // must not share string and must have enough space
   wxStringData* pData = GetStringData();
 
   // must not share string and must have enough space
   wxStringData* pData = GetStringData();

-  if ( pData->IsShared() || (nLen > pData->nAllocLength) ) {
+  if ( pData->IsShared() || pData->IsEmpty() ) {

     // can't work with old buffer, get new one
     pData->Unlock();
     AllocBuffer(nLen);
   }
   else {
     // can't work with old buffer, get new one
     pData->Unlock();
     AllocBuffer(nLen);
   }
   else {

-    // update the string length
+    if ( nLen > pData->nAllocLength ) {
+      // realloc the buffer instead of calling malloc() again, this is more
+      // efficient
+      STATISTICS_ADD(Length, nLen);
+
+      nLen += EXTRA_ALLOC;
+
+      wxStringData *pDataOld = pData;
+      pData = (wxStringData*)
+          realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+      if ( !pData ) {
+        // out of memory
+        free(pDataOld);
+
+        // FIXME we're going to crash...
+        return;
+      }
+
+      pData->nAllocLength = nLen;
+      m_pchData = pData->data();
+    }
+
+    // now we have enough space, just update the string length

     pData->nDataLength = nLen;
   }
 
     pData->nDataLength = nLen;
   }
 


@@ -367,7 +459,7 @@ void wxString::Alloc(size_t nLen)
       pData->nDataLength = 0;
       pData->nAllocLength = nLen;
       m_pchData = pData->data();  // data starts after wxStringData
       pData->nDataLength = 0;
       pData->nAllocLength = nLen;
       m_pchData = pData->data();  // data starts after wxStringData

-      m_pchData[0u] = _T('\0');
+      m_pchData[0u] = wxT('\0');

     }
     else if ( pData->IsShared() ) {
       pData->Unlock();                // memory not freed because shared
     }
     else if ( pData->IsShared() ) {
       pData->Unlock();                // memory not freed because shared


@@ -378,11 +470,15 @@ void wxString::Alloc(size_t nLen)
     else {
       nLen += EXTRA_ALLOC;
 
     else {
       nLen += EXTRA_ALLOC;
 

+      wxStringData *pDataOld = pData;

       wxStringData *p = (wxStringData *)
         realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
 
       if ( p == NULL ) {
       wxStringData *p = (wxStringData *)
         realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
 
       if ( p == NULL ) {

-        // @@@ what to do on memory error?
+        // don't leak memory
+        free(pDataOld);
+
+        // FIXME what to do on memory error?

         return;
       }
 
         return;
       }
 


@@ -400,13 +496,16 @@ void wxString::Shrink()
 {
   wxStringData *pData = GetStringData();
 
 {
   wxStringData *pData = GetStringData();
 

-  // this variable is unused in release build, so avoid the compiler warning by
-  // just not declaring it
+  // this variable is unused in release build, so avoid the compiler warning
+  // by just not declaring it

 #ifdef __WXDEBUG__
   void *p =
 #endif
   realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar));
 
 #ifdef __WXDEBUG__
   void *p =
 #endif
   realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar));
 

+  // we rely on a reasonable realloc() implementation here - so far I haven't
+  // seen any which wouldn't behave like this
+

   wxASSERT( p != NULL );  // can't free memory?
   wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move!
 }
   wxASSERT( p != NULL );  // can't free memory?
   wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move!
 }


@@ -429,6 +528,12 @@ void wxString::UngetWriteBuf()
   GetStringData()->Validate(TRUE);
 }
 
   GetStringData()->Validate(TRUE);
 }
 

+void wxString::UngetWriteBuf(size_t nLen)
+{
+  GetStringData()->nDataLength = nLen;
+  GetStringData()->Validate(TRUE);
+}
+

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


@@ -449,7 +554,7 @@ void wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
     AllocBeforeWrite(nSrcLen);
     memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar));
     GetStringData()->nDataLength = nSrcLen;
     AllocBeforeWrite(nSrcLen);
     memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar));
     GetStringData()->nDataLength = nSrcLen;

-    m_pchData[nSrcLen] = _T('\0');
+    m_pchData[nSrcLen] = wxT('\0');

   }
 }
 
   }
 }
 


@@ -497,12 +602,14 @@ wxString& wxString::operator=(const unsigned char* psz)
   return *this;
 }
 
   return *this;
 }
 

+#if wxUSE_WCHAR_T

 wxString& wxString::operator=(const wchar_t *pwz)
 {
   wxString str(pwz);
   *this = str;
   return *this;
 }
 wxString& wxString::operator=(const wchar_t *pwz)
 {
   wxString str(pwz);
   *this = str;
   return *this;
 }

+#endif

 
 #endif
 
 
 #endif
 


@@ -549,7 +656,7 @@ void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData)
     // fast concatenation - all is done in our buffer
     memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar));
 
     // fast concatenation - all is done in our buffer
     memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar));
 

-    m_pchData[nNewLen] = _T('\0');          // put terminating '\0'
+    m_pchData[nNewLen] = wxT('\0');          // put terminating '\0'

     GetStringData()->nDataLength = nNewLen; // and fix the length
   }
   //else: the string to append was empty
     GetStringData()->nDataLength = nNewLen; // and fix the length
   }
   //else: the string to append was empty


@@ -708,7 +815,7 @@ wxString wxString::Left(size_t nCount) const
 wxString wxString::BeforeFirst(wxChar ch) const
 {
   wxString str;
 wxString wxString::BeforeFirst(wxChar ch) const
 {
   wxString str;

-  for ( const wxChar *pc = m_pchData; *pc != _T('\0') && *pc != ch; pc++ )
+  for ( const wxChar *pc = m_pchData; *pc != wxT('\0') && *pc != ch; pc++ )

     str += *pc;
 
   return str;
     str += *pc;
 
   return str;


@@ -748,7 +855,7 @@ size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplace
   wxString strTemp;
   const wxChar *pCurrent = m_pchData;
   const wxChar *pSubstr;
   wxString strTemp;
   const wxChar *pCurrent = m_pchData;
   const wxChar *pSubstr;

-  while ( *pCurrent != _T('\0') ) {
+  while ( *pCurrent != wxT('\0') ) {

     pSubstr = wxStrstr(pCurrent, szOld);
     if ( pSubstr == NULL ) {
       // strTemp is unused if no replacements were made, so avoid the copy
     pSubstr = wxStrstr(pCurrent, szOld);
     if ( pSubstr == NULL ) {
       // strTemp is unused if no replacements were made, so avoid the copy


@@ -803,6 +910,8 @@ bool wxString::IsWord() const
 bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;
 bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;

+  if (wxStrlen(s))
+     if ((s[0] == '-') || (s[0] == '+')) s++;

   while(*s){
     if(!wxIsdigit(*s)) return(FALSE);
     s++;
   while(*s){
     if(!wxIsdigit(*s)) return(FALSE);
     s++;


@@ -850,8 +959,8 @@ wxString& wxString::MakeLower()
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all
 wxString& wxString::Trim(bool bFromRight)
 {
   // first check if we're going to modify the string at all

-  if ( !IsEmpty() && 
-       ( 
+  if ( !IsEmpty() &&
+       (

         (bFromRight && wxIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxIsspace(GetChar(0u)))
        )
         (bFromRight && wxIsspace(GetChar(Len() - 1))) ||
         (!bFromRight && wxIsspace(GetChar(0u)))
        )


@@ -868,7 +977,7 @@ wxString& wxString::Trim(bool bFromRight)
         psz--;
 
       // truncate at trailing space start
         psz--;
 
       // truncate at trailing space start

-      *++psz = _T('\0');
+      *++psz = wxT('\0');

       GetStringData()->nDataLength = psz - m_pchData;
     }
     else
       GetStringData()->nDataLength = psz - m_pchData;
     }
     else


@@ -910,7 +1019,7 @@ wxString& wxString::Truncate(size_t uiLen)
   if ( uiLen < Len() ) {
     CopyBeforeWrite();
 
   if ( uiLen < Len() ) {
     CopyBeforeWrite();
 

-    *(m_pchData + uiLen) = _T('\0');
+    *(m_pchData + uiLen) = wxT('\0');

     GetStringData()->nDataLength = uiLen;
   }
   //else: nothing to do, string is already short enough
     GetStringData()->nDataLength = uiLen;
   }
   //else: nothing to do, string is already short enough


@@ -938,36 +1047,75 @@ int wxString::Find(const wxChar *pszSub) const
   return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData;
 }
 
   return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData;
 }
 

-// ---------------------------------------------------------------------------
-// stream-like operators
-// ---------------------------------------------------------------------------
-wxString& wxString::operator<<(int i)
+// ----------------------------------------------------------------------------
+// conversion to numbers
+// ----------------------------------------------------------------------------
+
+bool wxString::ToLong(long *val) const

 {
 {

-    wxString res;
-    res.Printf(_T("%d"), i);
+    wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToLong") );
+
+    const wxChar *start = c_str();
+    wxChar *end;
+    *val = wxStrtol(start, &end, 10);

 
 

-    return (*this) << res;
+    // 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);

 }
 
 }
 

-wxString& wxString::operator<<(float f)
+bool wxString::ToULong(unsigned long *val) const

 {
 {

-    wxString res;
-    res.Printf(_T("%f"), f);
+    wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToULong") );

 
 

-    return (*this) << res;
+    const wxChar *start = c_str();
+    wxChar *end;
+    *val = wxStrtoul(start, &end, 10);
+
+    // 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);

 }
 
 }
 

-wxString& wxString::operator<<(double d)
+bool wxString::ToDouble(double *val) const

 {
 {

-    wxString res;
-    res.Printf(_T("%g"), d);
+    wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToDouble") );
+
+    const wxChar *start = c_str();
+    wxChar *end;
+    *val = wxStrtod(start, &end);

 
 

-    return (*this) << res;
+    // 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);

 }
 
 // ---------------------------------------------------------------------------
 // formatted output
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------
 // formatted output
 // ---------------------------------------------------------------------------

+
+/* static */
+wxString wxString::Format(const wxChar *pszFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, pszFormat);
+
+    wxString s;
+    s.PrintfV(pszFormat, argptr);
+
+    va_end(argptr);
+
+    return s;
+}
+
+/* static */
+wxString wxString::FormatV(const wxChar *pszFormat, va_list argptr)
+{
+    wxString s;
+    s.Printf(pszFormat, argptr);
+    return s;
+}
+

 int wxString::Printf(const wxChar *pszFormat, ...)
 {
   va_list argptr;
 int wxString::Printf(const wxChar *pszFormat, ...)
 {
   va_list argptr;


@@ -982,279 +1130,279 @@ int wxString::Printf(const wxChar *pszFormat, ...)
 
 int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 {
 
 int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 {

-  // static buffer to avoid dynamic memory allocation each time
-  static char s_szScratch[1024];
-#if wxUSE_THREADS
-  // protect the static buffer
-  static wxCriticalSection critsect;
-  wxCriticalSectionLocker lock(critsect);
-#endif
+#if wxUSE_EXPERIMENTAL_PRINTF
+  // the new implementation

 
 

-#if 1 // the new implementation
+  // buffer to avoid dynamic memory allocation each time for small strings
+  char szScratch[1024];

 
   Reinit();
   for (size_t n = 0; pszFormat[n]; n++)
 
   Reinit();
   for (size_t n = 0; pszFormat[n]; n++)

-    if (pszFormat[n] == _T('%')) {
+    if (pszFormat[n] == wxT('%')) {

       static char s_szFlags[256] = "%";
       size_t flagofs = 1;
       bool adj_left = FALSE, in_prec = FALSE,
       static char s_szFlags[256] = "%";
       size_t flagofs = 1;
       bool adj_left = FALSE, in_prec = FALSE,

-          prec_dot = FALSE, done = FALSE;
+           prec_dot = FALSE, done = FALSE;

       int ilen = 0;
       size_t min_width = 0, max_width = wxSTRING_MAXLEN;
       do {
 #define CHECK_PREC if (in_prec && !prec_dot) { s_szFlags[flagofs++] = '.'; prec_dot = TRUE; }
       int ilen = 0;
       size_t min_width = 0, max_width = wxSTRING_MAXLEN;
       do {
 #define CHECK_PREC if (in_prec && !prec_dot) { s_szFlags[flagofs++] = '.'; prec_dot = TRUE; }

-       switch (pszFormat[++n]) {
-       case _T('\0'):
-         done = TRUE;
-         break;
-       case _T('%'):
-         *this += _T('%');
-         done = TRUE;
-         break;
-       case _T('#'):
-       case _T('0'):
-       case _T(' '):
-       case _T('+'):
-       case _T('\''):
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('-'):
-         CHECK_PREC
-         adj_left = TRUE;
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('.'):
-         CHECK_PREC
-         in_prec = TRUE;
-         prec_dot = FALSE;
-         max_width = 0;
-         // dot will be auto-added to s_szFlags if non-negative number follows
-         break;
-       case _T('h'):
-         ilen = -1;
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('l'):
-         ilen = 1;
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('q'):
-       case _T('L'):
-         ilen = 2;
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('Z'):
-         ilen = 3;
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         break;
-       case _T('*'):
-         {
-           int len = va_arg(argptr, int);
-           if (in_prec) {
-             if (len<0) break;
-             CHECK_PREC
-             max_width = len;
-           } else {
-             if (len<0) {
-               adj_left = !adj_left;
-               s_szFlags[flagofs++] = '-';
-               len = -len;
-             }
-             min_width = len;
-           }
-           flagofs += ::sprintf(s_szFlags+flagofs,"%d",len);
-         }
-         break;
-       case _T('1'): case _T('2'): case _T('3'):
-       case _T('4'): case _T('5'): case _T('6'):
-       case _T('7'): case _T('8'): case _T('9'):
-         {
-           int len = 0;
-           CHECK_PREC
-           while ((pszFormat[n]>=_T('0')) && (pszFormat[n]<=_T('9'))) {
-             s_szFlags[flagofs++] = pszFormat[n];
-             len = len*10 + (pszFormat[n] - _T('0'));
-             n++;
-           }
-           if (in_prec) max_width = len;
-           else min_width = len;
-           n--; // the main loop pre-increments n again
-         }
-         break;
-       case _T('d'):
-       case _T('i'):
-       case _T('o'):
-       case _T('u'):
-       case _T('x'):
-       case _T('X'):
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         s_szFlags[flagofs] = '\0';
-         if (ilen == 0 ) {
-           int val = va_arg(argptr, int);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         }
-         else if (ilen == -1) {
-           short int val = va_arg(argptr, short int);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         }
-         else if (ilen == 1) {
-           long int val = va_arg(argptr, long int);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         }
-         else if (ilen == 2) {
+        switch (pszFormat[++n]) {
+        case wxT('\0'):
+          done = TRUE;
+          break;
+        case wxT('%'):
+          *this += wxT('%');
+          done = TRUE;
+          break;
+        case wxT('#'):
+        case wxT('0'):
+        case wxT(' '):
+        case wxT('+'):
+        case wxT('\''):
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('-'):
+          CHECK_PREC
+          adj_left = TRUE;
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('.'):
+          CHECK_PREC
+          in_prec = TRUE;
+          prec_dot = FALSE;
+          max_width = 0;
+          // dot will be auto-added to s_szFlags if non-negative number follows
+          break;
+        case wxT('h'):
+          ilen = -1;
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('l'):
+          ilen = 1;
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('q'):
+        case wxT('L'):
+          ilen = 2;
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('Z'):
+          ilen = 3;
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          break;
+        case wxT('*'):
+          {
+            int len = va_arg(argptr, int);
+            if (in_prec) {
+              if (len<0) break;
+              CHECK_PREC
+              max_width = len;
+            } else {
+              if (len<0) {
+                adj_left = !adj_left;
+                s_szFlags[flagofs++] = '-';
+                len = -len;
+              }
+              min_width = len;
+            }
+            flagofs += ::sprintf(s_szFlags+flagofs,"%d",len);
+          }
+          break;
+        case wxT('1'): case wxT('2'): case wxT('3'):
+        case wxT('4'): case wxT('5'): case wxT('6'):
+        case wxT('7'): case wxT('8'): case wxT('9'):
+          {
+            int len = 0;
+            CHECK_PREC
+            while ((pszFormat[n]>=wxT('0')) && (pszFormat[n]<=wxT('9'))) {
+              s_szFlags[flagofs++] = pszFormat[n];
+              len = len*10 + (pszFormat[n] - wxT('0'));
+              n++;
+            }
+            if (in_prec) max_width = len;
+            else min_width = len;
+            n--; // the main loop pre-increments n again
+          }
+          break;
+        case wxT('d'):
+        case wxT('i'):
+        case wxT('o'):
+        case wxT('u'):
+        case wxT('x'):
+        case wxT('X'):
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          s_szFlags[flagofs] = '\0';
+          if (ilen == 0 ) {
+            int val = va_arg(argptr, int);
+            ::sprintf(szScratch, s_szFlags, val);
+          }
+          else if (ilen == -1) {
+            short int val = va_arg(argptr, short int);
+            ::sprintf(szScratch, s_szFlags, val);
+          }
+          else if (ilen == 1) {
+            long int val = va_arg(argptr, long int);
+            ::sprintf(szScratch, s_szFlags, val);
+          }
+          else if (ilen == 2) {

 #if SIZEOF_LONG_LONG
 #if SIZEOF_LONG_LONG

-           long long int val = va_arg(argptr, long long int);
-           ::sprintf(s_szScratch, s_szFlags, val);
+            long long int val = va_arg(argptr, long long int);
+            ::sprintf(szScratch, s_szFlags, val);

 #else
 #else

-           long int val = va_arg(argptr, long int);
-           ::sprintf(s_szScratch, s_szFlags, val);
+            long int val = va_arg(argptr, long int);
+            ::sprintf(szScratch, s_szFlags, val);

 #endif
 #endif

-         }
-         else if (ilen == 3) {
-           size_t val = va_arg(argptr, size_t);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         }
-         *this += wxString(s_szScratch);
-         done = TRUE;
-         break;
-       case _T('e'):
-       case _T('E'):
-       case _T('f'):
-       case _T('g'):
-       case _T('G'):
-         CHECK_PREC
-         s_szFlags[flagofs++] = pszFormat[n];
-         s_szFlags[flagofs] = '\0';
-         if (ilen == 2) {
-           long double val = va_arg(argptr, long double);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         } else {
-           double val = va_arg(argptr, double);
-           ::sprintf(s_szScratch, s_szFlags, val);
-         }
-         *this += wxString(s_szScratch);
-         done = TRUE;
-         break;
-       case _T('p'):
-         {
-           void *val = va_arg(argptr, void *);
-           CHECK_PREC
-           s_szFlags[flagofs++] = pszFormat[n];
-           s_szFlags[flagofs] = '\0';
-           ::sprintf(s_szScratch, s_szFlags, val);
-           *this += wxString(s_szScratch);
-           done = TRUE;
-         }
-         break;
-       case _T('c'):
-         {
-           wxChar val = va_arg(argptr, int);
-           // we don't need to honor padding here, do we?
-           *this += val;
-           done = TRUE;
-         }
-         break;
-       case _T('s'):
-         if (ilen == -1) {
-           // wx extension: we'll let %hs mean non-Unicode strings
-           char *val = va_arg(argptr, char *);
+          }
+          else if (ilen == 3) {
+            size_t val = va_arg(argptr, size_t);
+            ::sprintf(szScratch, s_szFlags, val);
+          }
+          *this += wxString(szScratch);
+          done = TRUE;
+          break;
+        case wxT('e'):
+        case wxT('E'):
+        case wxT('f'):
+        case wxT('g'):
+        case wxT('G'):
+          CHECK_PREC
+          s_szFlags[flagofs++] = pszFormat[n];
+          s_szFlags[flagofs] = '\0';
+          if (ilen == 2) {
+            long double val = va_arg(argptr, long double);
+            ::sprintf(szScratch, s_szFlags, val);
+          } else {
+            double val = va_arg(argptr, double);
+            ::sprintf(szScratch, s_szFlags, val);
+          }
+          *this += wxString(szScratch);
+          done = TRUE;
+          break;
+        case wxT('p'):
+          {
+            void *val = va_arg(argptr, void *);
+            CHECK_PREC
+            s_szFlags[flagofs++] = pszFormat[n];
+            s_szFlags[flagofs] = '\0';
+            ::sprintf(szScratch, s_szFlags, val);
+            *this += wxString(szScratch);
+            done = TRUE;
+          }
+          break;
+        case wxT('c'):
+          {
+            wxChar val = va_arg(argptr, int);
+            // we don't need to honor padding here, do we?
+            *this += val;
+            done = TRUE;
+          }
+          break;
+        case wxT('s'):
+          if (ilen == -1) {
+            // wx extension: we'll let %hs mean non-Unicode strings
+            char *val = va_arg(argptr, char *);

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-           // ASCII->Unicode constructor handles max_width right
-           wxString s(val, wxConv_libc, max_width);
+            // ASCII->Unicode constructor handles max_width right
+            wxString s(val, wxConvLibc, max_width);

 #else
 #else

-           size_t len = wxSTRING_MAXLEN;
-           if (val) {
-             for (len = 0; val[len] && (len<max_width); len++);
-           } else val = _T("(null)");
-           wxString s(val, len);
+            size_t len = wxSTRING_MAXLEN;
+            if (val) {
+              for (len = 0; val[len] && (len<max_width); len++);
+            } else val = wxT("(null)");
+            wxString s(val, len);

 #endif
 #endif

-           if (s.Len() < min_width)
-             s.Pad(min_width - s.Len(), _T(' '), adj_left);
-           *this += s;
-         } else {
-           wxChar *val = va_arg(argptr, wxChar *);
-           size_t len = wxSTRING_MAXLEN;
-           if (val) {
-             for (len = 0; val[len] && (len<max_width); len++);
-           } else val = _T("(null)");
-           wxString s(val, len);
-           if (s.Len() < min_width)
-             s.Pad(min_width - s.Len(), _T(' '), adj_left);
-           *this += s;
-           done = TRUE;
-         }
-         break;
-       case _T('n'):
-         if (ilen == 0) {
-           int *val = va_arg(argptr, int *);
-           *val = Len();
-         }
-         else if (ilen == -1) {
-           short int *val = va_arg(argptr, short int *);
-           *val = Len();
-         }
-         else if (ilen >= 1) {
-           long int *val = va_arg(argptr, long int *);
-           *val = Len();
-         }
-         done = TRUE;
-         break;
-       default:
-         if (wxIsalpha(pszFormat[n]))
-           // probably some flag not taken care of here yet
-           s_szFlags[flagofs++] = pszFormat[n];
-         else {
-           // bad format
-           *this += _T('%'); // just to pass the glibc tst-printf.c
-           n--;
-           done = TRUE;
-         }
-         break;
-       }
+            if (s.Len() < min_width)
+              s.Pad(min_width - s.Len(), wxT(' '), adj_left);
+            *this += s;
+          } else {
+            wxChar *val = va_arg(argptr, wxChar *);
+            size_t len = wxSTRING_MAXLEN;
+            if (val) {
+              for (len = 0; val[len] && (len<max_width); len++);
+            } else val = wxT("(null)");
+            wxString s(val, len);
+            if (s.Len() < min_width)
+              s.Pad(min_width - s.Len(), wxT(' '), adj_left);
+            *this += s;
+          }
+          done = TRUE;
+          break;
+        case wxT('n'):
+          if (ilen == 0) {
+            int *val = va_arg(argptr, int *);
+            *val = Len();
+          }
+          else if (ilen == -1) {
+            short int *val = va_arg(argptr, short int *);
+            *val = Len();
+          }
+          else if (ilen >= 1) {
+            long int *val = va_arg(argptr, long int *);
+            *val = Len();
+          }
+          done = TRUE;
+          break;
+        default:
+          if (wxIsalpha(pszFormat[n]))
+            // probably some flag not taken care of here yet
+            s_szFlags[flagofs++] = pszFormat[n];
+          else {
+            // bad format
+            *this += wxT('%'); // just to pass the glibc tst-printf.c
+            n--;
+            done = TRUE;
+          }
+          break;
+        }

 #undef CHECK_PREC
       } while (!done);
     } else *this += pszFormat[n];
 
 #else
 #undef CHECK_PREC
       } while (!done);
     } else *this += pszFormat[n];
 
 #else

-  // NB: wxVsnprintf() may return either less than the buffer size or -1 if there
-  //     is not enough place depending on implementation
-  int iLen = wxVsnprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr);
-  char *buffer;
-  if ( iLen < (int)WXSIZEOF(s_szScratch) ) {
-    buffer = s_szScratch;
+  // buffer to avoid dynamic memory allocation each time for small strings
+  char szScratch[1024];
+
+  // NB: wxVsnprintf() may return either less than the buffer size or -1 if
+  //     there is not enough place depending on implementation
+  int iLen = wxVsnprintfA(szScratch, WXSIZEOF(szScratch), pszFormat, argptr);
+  if ( iLen != -1 ) {
+    // the whole string is in szScratch
+    *this = szScratch;

   }
   else {
   }
   else {

-      int size = WXSIZEOF(s_szScratch) * 2;
-      buffer = (char *)malloc(size);
-      while ( buffer != NULL ) {
-          iLen = wxVsnprintf(buffer, WXSIZEOF(s_szScratch), pszFormat, argptr);
-          if ( iLen < size ) {
+      bool outOfMemory = FALSE;
+      int size = 2*WXSIZEOF(szScratch);
+      while ( !outOfMemory ) {
+          char *buf = GetWriteBuf(size);
+          if ( buf )
+            iLen = wxVsnprintfA(buf, size, pszFormat, argptr);
+          else
+            outOfMemory = TRUE;
+
+          UngetWriteBuf();
+
+          if ( iLen != -1 ) {

               // ok, there was enough space
               break;
           }
 
           // still not enough, double it again
               // ok, there was enough space
               break;
           }
 
           // still not enough, double it again

-          buffer = (char *)realloc(buffer, size *= 2);
+          size *= 2;

       }
 
       }
 

-      if ( !buffer ) {
+      if ( outOfMemory ) {

           // out of memory
           return -1;
       }
   }
           // out of memory
           return -1;
       }
   }

-
-  wxString s(buffer);
-  *this = s;
-
-  if ( buffer != s_szScratch )
-      free(buffer);
-#endif
+#endif // wxUSE_EXPERIMENTAL_PRINTF/!wxUSE_EXPERIMENTAL_PRINTF

 
   return Len();
 }
 
   return Len();
 }


@@ -1262,33 +1410,37 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 // ----------------------------------------------------------------------------
 // misc other operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // misc other operations
 // ----------------------------------------------------------------------------

+
+// returns TRUE if the string matches the pattern which may contain '*' and
+// '?' metacharacters (as usual, '?' matches any character and '*' any number
+// of them)

 bool wxString::Matches(const wxChar *pszMask) const
 {
   // check char by char
   const wxChar *pszTxt;
 bool wxString::Matches(const wxChar *pszMask) const
 {
   // check char by char
   const wxChar *pszTxt;

-  for ( pszTxt = c_str(); *pszMask != _T('\0'); pszMask++, pszTxt++ ) {
+  for ( pszTxt = c_str(); *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {

     switch ( *pszMask ) {
     switch ( *pszMask ) {

-      case _T('?'):
-        if ( *pszTxt == _T('\0') )
+      case wxT('?'):
+        if ( *pszTxt == wxT('\0') )

           return FALSE;
 
           return FALSE;
 

-        pszTxt++;
-        pszMask++;
+        // pszText and pszMask will be incremented in the loop statement
+

         break;
 
         break;
 

-      case _T('*'):
+      case wxT('*'):

         {
           // ignore special chars immediately following this one
         {
           // ignore special chars immediately following this one

-          while ( *pszMask == _T('*') || *pszMask == _T('?') )
+          while ( *pszMask == wxT('*') || *pszMask == wxT('?') )

             pszMask++;
 
           // if there is nothing more, match
             pszMask++;
 
           // if there is nothing more, match

-          if ( *pszMask == _T('\0') )
+          if ( *pszMask == wxT('\0') )

             return TRUE;
 
           // are there any other metacharacters in the mask?
           size_t uiLenMask;
             return TRUE;
 
           // are there any other metacharacters in the mask?
           size_t uiLenMask;

-          const wxChar *pEndMask = wxStrpbrk(pszMask, _T("*?"));
+          const wxChar *pEndMask = wxStrpbrk(pszMask, wxT("*?"));

 
           if ( pEndMask != NULL ) {
             // we have to match the string between two metachars
 
           if ( pEndMask != NULL ) {
             // we have to match the string between two metachars


@@ -1318,7 +1470,7 @@ bool wxString::Matches(const wxChar *pszMask) const
   }
 
   // match only if nothing left
   }
 
   // match only if nothing left

-  return *pszTxt == _T('\0');
+  return *pszTxt == wxT('\0');

 }
 
 // Count the number of chars
 }
 
 // Count the number of chars


@@ -1387,7 +1539,7 @@ size_t wxString::find(const wxString& str, size_t nStart) const
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::find(const wxChar* sz, size_t nStart, size_t n) const
 {
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::find(const wxChar* sz, size_t nStart, size_t n) const
 {

-  return find(wxString(sz, n == npos ? 0 : n), nStart);
+  return find(wxString(sz, n), nStart);

 }
 #endif // VC++ 1.5
 
 }
 #endif // VC++ 1.5
 


@@ -1408,7 +1560,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 

-  // # could be quicker than that
+  // TODO could be made much quicker than that

   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
   while ( p >= c_str() + str.Len() ) {
     if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 )
   const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
   while ( p >= c_str() + str.Len() ) {
     if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 )


@@ -1423,28 +1575,129 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {
 #if !defined(__VISUALC__) || defined(__WIN32__)
 size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
 {

-  return rfind(wxString(sz, n == npos ? 0 : n), nStart);
+    return rfind(wxString(sz, n == npos ? 0 : n), nStart);

 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 {
 }
 
 size_t wxString::rfind(wxChar ch, size_t nStart) const
 {

-  wxASSERT( nStart <= Len() );
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }

 
 

-  const wxChar *p = wxStrrchr(c_str() + nStart, ch);
+    const wxChar *p = wxStrrchr(c_str(), ch);

 
 

-  return p == NULL ? npos : p - c_str();
+    if ( p == NULL )
+        return npos;
+
+    size_t result = p - c_str();
+    return ( result > nStart ) ? npos : result;

 }
 #endif // VC++ 1.5
 
 }
 #endif // VC++ 1.5
 

-wxString wxString::substr(size_t nStart, size_t nLen) const
+size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const

 {
 {

-  // npos means 'take all'
-  if ( nLen == npos )
-    nLen = 0;
+    const wxChar *start = c_str() + nStart;
+    const wxChar *firstOf = wxStrpbrk(start, sz);
+    if ( firstOf )
+        return firstOf - c_str();
+    else
+        return npos;
+}
+
+size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + length() - 1; p >= c_str(); p-- )
+    {
+        if ( wxStrchr(sz, *p) )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    size_t nAccept = wxStrspn(c_str() + nStart, sz);
+    if ( nAccept >= length() - nStart )
+        return npos;
+    else
+        return nAccept;
+}

 
 

-  wxASSERT( nStart + nLen <= Len() );
+size_t wxString::find_first_not_of(wxChar ch, size_t nStart) const
+{
+    wxASSERT( nStart <= Len() );

 
 

-  return wxString(c_str() + nStart, nLen == npos ? 0 : nLen);
+    for ( const wxChar *p = c_str() + nStart; *p; p++ )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    {
+        if ( !wxStrchr(sz, *p) )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxString::find_last_not_of(wxChar ch, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = Len();
+    }
+    else
+    {
+        wxASSERT( nStart <= Len() );
+    }
+
+    for ( const wxChar *p = c_str() + nStart - 1; p >= c_str(); p-- )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;

 }
 
 wxString& wxString::erase(size_t nStart, size_t nLen)
 }
 
 wxString& wxString::erase(size_t nStart, size_t nLen)


@@ -1506,11 +1759,12 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
 #define   STRING(p)   ((wxString *)(&(p)))
 
 // ctor
 #define   STRING(p)   ((wxString *)(&(p)))
 
 // ctor

-wxArrayString::wxArrayString()
+wxArrayString::wxArrayString(bool autoSort)

 {
   m_nSize  =
   m_nCount = 0;
   m_pItems = (wxChar **) NULL;
 {
   m_nSize  =
   m_nCount = 0;
   m_pItems = (wxChar **) NULL;

+  m_autoSort = autoSort;

 }
 
 // copy ctor
 }
 
 // copy ctor


@@ -1519,6 +1773,7 @@ wxArrayString::wxArrayString(const wxArrayString& src)
   m_nSize  =
   m_nCount = 0;
   m_pItems = (wxChar **) NULL;
   m_nSize  =
   m_nCount = 0;
   m_pItems = (wxChar **) NULL;

+  m_autoSort = src.m_autoSort;

 
   *this = src;
 }
 
   *this = src;
 }


@@ -1529,18 +1784,18 @@ wxArrayString& wxArrayString::operator=(const wxArrayString& src)
   if ( m_nSize > 0 )
     Clear();
 
   if ( m_nSize > 0 )
     Clear();
 

+  Copy(src);
+
+  return *this;
+}
+
+void wxArrayString::Copy(const wxArrayString& src)
+{

   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);
 
   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);
 

-  // we can't just copy the pointers here because otherwise we would share
-  // the strings with another array

   for ( size_t n = 0; n < src.m_nCount; n++ )
     Add(src[n]);
   for ( size_t n = 0; n < src.m_nCount; n++ )
     Add(src[n]);

-
-  if ( m_nCount != 0 )
-    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(wxChar *));
-
-  return *this;

 }
 
 // grow the array
 }
 
 // grow the array


@@ -1556,7 +1811,12 @@ void wxArrayString::Grow()
     else {
       // otherwise when it's called for the first time, nIncrement would be 0
       // and the array would never be expanded
     else {
       // otherwise when it's called for the first time, nIncrement would be 0
       // and the array would never be expanded

+#if defined(__VISAGECPP__) && defined(__WXDEBUG__)
+      int array_size = ARRAY_DEFAULT_INITIAL_SIZE;
+      wxASSERT( array_size != 0 );
+#else

       wxASSERT( ARRAY_DEFAULT_INITIAL_SIZE != 0 );
       wxASSERT( ARRAY_DEFAULT_INITIAL_SIZE != 0 );

+#endif

 
       // add 50% but not too much
       size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE
 
       // add 50% but not too much
       size_t nIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE


@@ -1633,7 +1893,7 @@ 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];              
+    wxChar **pNew = new wxChar *[m_nCount];

 
     // copy data to new location
     memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
 
     // copy data to new location
     memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));


@@ -1645,20 +1905,46 @@ void wxArrayString::Shrink()
 // 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
 {

-  if ( bFromEnd ) {
-    if ( m_nCount > 0 ) {
-      size_t ui = m_nCount;
-      do {
-        if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) )
-          return ui;
-      }
-      while ( ui != 0 );
+  if ( m_autoSort ) {
+    // use binary search in the sorted array
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  wxT("search parameters ignored for auto sorted array") );
+
+    size_t i,
+           lo = 0,
+           hi = m_nCount;
+    int res;
+    while ( lo < hi ) {
+      i = (lo + hi)/2;
+
+      res = wxStrcmp(sz, m_pItems[i]);
+      if ( res < 0 )
+        hi = i;
+      else if ( res > 0 )
+        lo = i + 1;
+      else
+        return i;

     }
     }

+
+    return wxNOT_FOUND;

   }
   else {
   }
   else {

-    for( size_t ui = 0; ui < m_nCount; ui++ ) {
-      if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) )
-        return ui;
+    // use linear search in unsorted array
+    if ( bFromEnd ) {
+      if ( m_nCount > 0 ) {
+        size_t ui = m_nCount;
+        do {
+          if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) )
+            return ui;
+        }
+        while ( ui != 0 );
+      }
+    }
+    else {
+      for( size_t ui = 0; ui < m_nCount; ui++ ) {
+        if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) )
+          return ui;
+      }

     }
   }
 
     }
   }
 


@@ -1666,15 +1952,47 @@ int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
 }
 
 // add item at the end
 }
 
 // add item at the end

-void wxArrayString::Add(const wxString& str)
-{
-  wxASSERT( str.GetStringData()->IsValid() );
+size_t wxArrayString::Add(const wxString& str)
+{
+  if ( m_autoSort ) {
+    // insert the string at the correct position to keep the array sorted
+    size_t i,
+           lo = 0,
+           hi = m_nCount;
+    int res;
+    while ( lo < hi ) {
+      i = (lo + hi)/2;
+
+      res = wxStrcmp(str, m_pItems[i]);
+      if ( res < 0 )
+        hi = i;
+      else if ( res > 0 )
+        lo = i + 1;
+      else {
+        lo = hi = i;
+        break;
+      }
+    }

 
 

-  Grow();
+    wxASSERT_MSG( lo == hi, wxT("binary search broken") );

 
 

-  // the string data must not be deleted!
-  str.GetStringData()->Lock();
-  m_pItems[m_nCount++] = (wxChar *)str.c_str();
+    Insert(str, lo);
+
+    return (size_t)lo;
+  }
+  else {
+    wxASSERT( str.GetStringData()->IsValid() );
+
+    Grow();
+
+    // the string data must not be deleted!
+    str.GetStringData()->Lock();
+
+    // just append
+    m_pItems[m_nCount] = (wxChar *)str.c_str(); // const_cast
+
+    return m_nCount++;
+  }

 }
 
 // add item at the given position
 }
 
 // add item at the given position


@@ -1682,7 +2000,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex)
 {
   wxASSERT( str.GetStringData()->IsValid() );
 
 {
   wxASSERT( str.GetStringData()->IsValid() );
 

-  wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Insert") );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );

 
   Grow();
 
 
   Grow();
 


@@ -1698,7 +2016,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex)
 // removes item from array (by index)
 void wxArrayString::Remove(size_t nIndex)
 {
 // removes item from array (by index)
 void wxArrayString::Remove(size_t nIndex)
 {

-  wxCHECK_RET( nIndex <= m_nCount, _("bad index in wxArrayString::Remove") );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Remove") );

 
   // release our lock
   Item(nIndex).GetStringData()->Unlock();
 
   // release our lock
   Item(nIndex).GetStringData()->Unlock();


@@ -1714,7 +2032,7 @@ void wxArrayString::Remove(const wxChar *sz)
   int iIndex = Index(sz);
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,
   int iIndex = Index(sz);
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,

-               _("removing inexistent element in wxArrayString::Remove") );
+               wxT("removing inexistent element in wxArrayString::Remove") );

 
   Remove(iIndex);
 }
 
   Remove(iIndex);
 }


@@ -1751,7 +2069,7 @@ static wxArrayString::CompareFunction gs_compareFunction = NULL;
 static bool gs_sortAscending = TRUE;
 
 // function which is called by quick sort
 static bool gs_sortAscending = TRUE;
 
 // function which is called by quick sort

-static int wxStringCompareFunction(const void *first, const void *second)
+static int LINKAGEMODE wxStringCompareFunction(const void *first, const void *second)

 {
   wxString *strFirst = (wxString *)first;
   wxString *strSecond = (wxString *)second;
 {
   wxString *strFirst = (wxString *)first;
   wxString *strSecond = (wxString *)second;


@@ -1794,312 +2112,10 @@ void wxArrayString::Sort(bool reverseOrder)
 
 void wxArrayString::DoSort()
 {
 
 void wxArrayString::DoSort()
 {

+  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);
 }
 
   // 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);
 }
 

-// ============================================================================
-// MBConv
-// ============================================================================
-
-WXDLLEXPORT_DATA(wxMBConv *) wxConv_current = &wxConv_libc;
-
-// ----------------------------------------------------------------------------
-// standard libc conversion
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
-
-size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  return wxWC2MB(buf, psz, n);
-}
-
-// ----------------------------------------------------------------------------
-// standard file conversion
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv_file) wxConv_file;
-
-// just use the libc conversion for now
-size_t wxMBConv_file::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  return wxWC2MB(buf, psz, n);
-}
-
-// ----------------------------------------------------------------------------
-// standard gdk conversion
-// ----------------------------------------------------------------------------
-
-#if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)
-WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk;
-
-#include <gdk/gdk.h>
-
-size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  if (buf) {
-    return gdk_mbstowcs((GdkWChar *)buf, psz, n);
-  } else {
-    GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
-    size_t len = gdk_mbstowcs(nbuf, psz, n);
-    delete [] nbuf;
-    return len;
-  }
-}
-
-size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  char *mbstr = gdk_wcstombs((GdkWChar *)psz);
-  size_t len = mbstr ? strlen(mbstr) : 0;
-  if (buf) {
-    if (len > n) len = n;
-    memcpy(buf, psz, len);
-    if (len < n) buf[len] = 0;
-  }
-  return len;
-}
-#endif // GTK > 1.0
-
-// ----------------------------------------------------------------------------
-// UTF-7
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
-
-// TODO: write actual implementations of UTF-7 here
-size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  return 0;
-}
-
-size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  return 0;
-}
-
-// ----------------------------------------------------------------------------
-// UTF-8
-// ----------------------------------------------------------------------------
-
-WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
-
-// TODO: write actual implementations of UTF-8 here
-size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  return wxWC2MB(buf, psz, n);
-}
-
-// ----------------------------------------------------------------------------
-// specified character set
-// ----------------------------------------------------------------------------
-
-class wxCharacterSet
-{
-public:
-  wxArrayString names;
-  wchar_t *data;
-};
-
-#ifndef WX_PRECOMP
-  #include "wx/dynarray.h"
-  #include "wx/filefn.h"
-  #include "wx/textfile.h"
-  #include "wx/tokenzr.h"
-  #include "wx/utils.h"
-#endif
-
-WX_DECLARE_OBJARRAY(wxCharacterSet, wxCSArray);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxCSArray);
-
-static wxCSArray wxCharsets;
-
-static void wxLoadCharacterSets(void)
-{
-  static bool already_loaded = FALSE;
-
-  if (already_loaded) return;
-
-#if defined(__UNIX__) && wxUSE_UNICODE
-  // search through files in /usr/share/i18n/charmaps
-  wxString fname;
-  printf("Commencing load\n");
-  for (fname = ::wxFindFirstFile(_T("/usr/share/i18n/charmaps/*"));
-       !fname.IsEmpty();
-       fname = ::wxFindNextFile()) {
-    wxPrintf(_("Loading: %s\n"), fname.c_str());
-    wxTextFile cmap(fname);
-    if (cmap.Open()) {
-      wxCharacterSet *cset = new wxCharacterSet;
-      wxString comchar,escchar;
-      bool in_charset = FALSE;
-
-      wxPrintf(_T("yup, loaded %s\n"),fname.c_str());
-
-      wxString line;
-      for (line = cmap.GetFirstLine();
-          !cmap.Eof();
-          line = cmap.GetNextLine()) {
-       wxPrintf(_T("line contents: %s\n"),line.c_str());
-       wxStringTokenizer token(line);
-       wxString cmd = token.GetNextToken();
-       if (cmd == comchar) {
-         if (token.GetNextToken() == _T("alias")) {
-           wxStringTokenizer names(token.GetNextToken(),_T("/"));
-           wxString name;
-           while (!(name = names.GetNextToken()).IsEmpty())
-             cset->names.Add(name);
-         }
-       }
-       else if (cmd == _T("<code_set_name>"))
-         cset->names.Add(token.GetNextToken());
-       else if (cmd == _T("<comment_char>"))
-         comchar = token.GetNextToken();
-       else if (cmd == _T("<escape_char>"))
-         escchar = token.GetNextToken();
-       else if (cmd == _T("<mb_cur_min")) {
-         delete cset;
-         goto forget_it; // we don't support multibyte charsets ourselves (yet)
-       }
-       else if (cmd == _T("CHARMAP")) {
-         cset->data = (wchar_t *)calloc(256, sizeof(wxChar));
-         in_charset = TRUE;
-       }
-       else if (cmd == _T("END")) {
-         if (token.GetNextToken() == _T("CHARMAP"))
-           in_charset = FALSE;
-       }
-       else if (in_charset) {
-         // format: <NUL> /x00 <U0000> NULL (NUL)
-         wxString hex = token.GetNextToken();
-         wxString uni = token.GetNextToken();
-         // just assume that we've got the right format
-         int pos = ::wxHexToDec(hex.Mid(2,2));
-         unsigned long uni1 = ::wxHexToDec(uni.Mid(2,2));
-         unsigned long uni2 = ::wxHexToDec(uni.Mid(4,2));
-         cset->data[pos] = (uni1 << 16) | uni2;
-       }
-      }
-      cset->names.Shrink();
-      wxCharsets.Add(cset);
-    forget_it:
-      continue;
-    }
-  }
-#endif
-  wxCharsets.Shrink();
-  already_loaded = TRUE;
-}
-
-static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)
-{
-  wxLoadCharacterSets();
-  for (size_t n=0; n<wxCharsets.GetCount(); n++)
-    if (wxCharsets[n].names.Index(charset) != wxNOT_FOUND)
-      return &(wxCharsets[n]);
-  return (wxCharacterSet *)NULL;
-}
-
-WXDLLEXPORT_DATA(wxCSConv) wxConv_local((const wxChar *)NULL);
-
-wxCSConv::wxCSConv(const wxChar *charset)
-{
-  if (!charset) {
-#ifdef __UNIX__
-    wxChar *lang = wxGetenv(_T("LANG"));
-    wxChar *dot = lang ? wxStrchr(lang, _T('.')) : (wxChar *)NULL;
-    if (dot) charset = dot+1;
-#endif
-  }
-  m_cset = (wxCharacterSet *) NULL;
-  m_deferred = FALSE;
-  if (charset) {
-#ifdef __UNIX__
-    // first, convert the character set name to standard form
-    wxString codeset;
-    if (wxString(charset,3).CmpNoCase(_T("ISO")) == 0) {
-      // make sure it's represented in the standard form: ISO_8859-1
-      codeset = _T("ISO_");
-      charset += 3;
-      if ((*charset == _T('-')) || (*charset == _T('_'))) charset++;
-      if (wxStrlen(charset)>4) {
-       if (wxString(charset,4) == _T("8859")) {
-         codeset << _T("8859-");
-         if (*charset == _T('-')) charset++;
-       }
-      }
-    }
-    codeset << charset;
-    codeset.MakeUpper();
-    m_name = wxStrdup(codeset.c_str());
-    m_deferred = TRUE;
-#endif
-  }
-}
-
-wxCSConv::~wxCSConv()
-{
-  free(m_name);
-}
-
-void wxCSConv::LoadNow()
-{
-//  wxPrintf(_T("Conversion request\n"));
-  if (m_deferred) {
-    m_cset = wxFindCharacterSet(m_name);
-    m_deferred = FALSE;
-  }
-}
-
-size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-  ((wxCSConv *)this)->LoadNow(); // discard constness
-  if (buf) {
-    if (m_cset) {
-      for (size_t c=0; c<=n; c++)
-       buf[c] = m_cset->data[psz[c]];
-    } else {
-      // latin-1 (direct)
-      for (size_t c=0; c<=n; c++)
-       buf[c] = psz[c];
-    }
-  }
-  return n;
-}
-
-size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-  ((wxCSConv *)this)->LoadNow(); // discard constness
-  if (buf) {
-    if (m_cset) {
-      for (size_t c=0; c<=n; c++) {
-       size_t n;
-       for (n=0; (n<256) && (m_cset->data[n] != psz[c]); n++);
-       buf[c] = (n>0xff) ? '?' : n;
-      }
-    } else {
-      // latin-1 (direct)
-      for (size_t c=0; c<=n; c++)
-       buf[c] = (psz[c]>0xff) ? '?' : psz[c];
-    }
-  }
-  return n;
-}
-