Someone must have committed some ASCII string literals while I wasn't looking.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index cb949eb6886d14ce11dad67a5f769df73f35a2da..3a74e249914e2e2d5d3d34e8d6b0ac8630b0e6f6 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "string.h"
+  #pragma implementation "string.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -28,20 +28,27 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"
   #include "wx/string.h"
   #include "wx/intl.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"
   #include "wx/string.h"
   #include "wx/intl.h"

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

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

-#ifdef wxUSE_WCSRTOMBS
+#ifdef __SALFORDC__
+  #include <clib.h>
+#endif
+
+#if wxUSE_WCSRTOMBS

   #include <wchar.h>    // for wcsrtombs(), see comments where it's used
 #endif // GNU
 
   #include <wchar.h>    // for wcsrtombs(), see comments where it's used
 #endif // GNU
 


@@ -58,9 +65,9 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
 // static class variables definition
 // ---------------------------------------------------------------------------
 

-#ifdef  STD_STRING_COMPATIBILITY
-  const size_t wxString::npos = STRING_MAXLEN;
-#endif
+#ifdef  wxSTD_STRING_COMPATIBILITY
+  const size_t wxString::npos = wxSTRING_MAXLEN;
+#endif // wxSTD_STRING_COMPATIBILITY

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


@@ -72,47 +79,71 @@
 static const struct
 {
   wxStringData data;
 static const struct
 {
   wxStringData data;

-  char dummy;
-} g_strEmpty = { {-1, 0, 0}, '\0' };
+  wxChar dummy;
+} g_strEmpty = { {-1, 0, 0}, _T('\0') };

 
 // 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 char *g_szNul = &g_strEmpty.dummy;
+extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
+
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+// 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.
+#ifdef __WXMSW__
+    #ifdef __VISUALC__
+        #define wxVsnprintf     _vsnprintf
+    #endif
+#else   // !Windows
+    #ifdef HAVE_VSNPRINTF
+        #define wxVsnprintf       vsnprintf
+    #endif
+#endif  // Windows/!Windows
+
+#ifndef wxVsnprintf
+    // 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)
+
+    #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"
+    #endif //compiler
+#endif // no vsnprintf
+
+#ifdef _AIX
+  // AIX has vsnprintf, but there's no prototype in the system headers.
+  extern "C" int vsnprintf(char* str, size_t n, const char* format, va_list ap);
+#endif

 
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 

-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY

 
 // 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!
 
 // 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!

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#define   NAMESPACE
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-// for msvc (bcc50+ also) you don't need these NAMESPACE defines,
-// using namespace std; takes care of that.
-#define   NAMESPACE   std::
-#endif
-

 
 

-NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
+istream& operator>>(istream& is, wxString& WXUNUSED(str))

 {
 #if 0
   int w = is.width(0);
   if ( is.ipfx(0) ) {
 {
 #if 0
   int w = is.width(0);
   if ( is.ipfx(0) ) {

-    NAMESPACE streambuf *sb = is.rdbuf();
+    streambuf *sb = is.rdbuf();

     str.erase();
     while ( true ) {
       int ch = sb->sbumpc ();
       if ( ch == EOF ) {
     str.erase();
     while ( true ) {
       int ch = sb->sbumpc ();
       if ( ch == EOF ) {

-        is.setstate(NAMESPACE ios::eofbit);
+        is.setstate(ios::eofbit);

         break;
       }
       else if ( isspace(ch) ) {
         break;
       }
       else if ( isspace(ch) ) {


@@ -128,7 +159,7 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
 
   is.isfx();
   if ( str.length() == 0 )
 
   is.isfx();
   if ( str.length() == 0 )

-    is.setstate(NAMESPACE ios::failbit);
+    is.setstate(ios::failbit);

 #endif
   return is;
 }
 #endif
   return is;
 }


@@ -173,81 +204,96 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
 // ---------------------------------------------------------------------------
 
 // constructs string of <nLength> copies of character <ch>
 // ---------------------------------------------------------------------------
 
 // constructs string of <nLength> copies of character <ch>

-wxString::wxString(char ch, size_t nLength)
+wxString::wxString(wxChar ch, size_t nLength)

 {
   Init();
 
   if ( nLength > 0 ) {
     AllocBuffer(nLength);
 
 {
   Init();
 
   if ( nLength > 0 ) {
     AllocBuffer(nLength);
 

-    wxASSERT( sizeof(char) == 1 );  // can't use memset if not
-
+#if wxUSE_UNICODE
+    // memset only works on char
+    for (size_t n=0; n<nLength; n++) m_pchData[n] = ch;
+#else

     memset(m_pchData, ch, nLength);
     memset(m_pchData, ch, nLength);

+#endif

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

-void wxString::InitWith(const char *psz, size_t nPos, size_t nLength)
+void wxString::InitWith(const wxChar *psz, size_t nPos, size_t nLength)

 {
   Init();
 
 {
   Init();
 

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

 
 

-  if ( nLength == STRING_MAXLEN )
-    nLength = Strlen(psz + nPos);
+  if ( nLength == wxSTRING_MAXLEN )
+    nLength = wxStrlen(psz + nPos);

 
   STATISTICS_ADD(InitialLength, nLength);
 
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     AllocBuffer(nLength);
 
   STATISTICS_ADD(InitialLength, nLength);
 
   if ( nLength > 0 ) {
     // trailing '\0' is written in AllocBuffer()
     AllocBuffer(nLength);

-    memcpy(m_pchData, psz + nPos, nLength*sizeof(char));
+    memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar));

   }
 }
 
   }
 }
 

-// the same as previous constructor, but for compilers using unsigned char
-wxString::wxString(const unsigned char* psz, size_t nLength)
-{
-  InitWith((const char *)psz, 0, nLength);
-}
-
-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY

 
 // poor man's iterators are "void *" pointers
 wxString::wxString(const void *pStart, const void *pEnd)
 {
 
 // poor man's iterators are "void *" pointers
 wxString::wxString(const void *pStart, const void *pEnd)
 {

-  InitWith((const char *)pStart, 0,
-           (const char *)pEnd - (const char *)pStart);
+  InitWith((const wxChar *)pStart, 0,
+           (const wxChar *)pEnd - (const wxChar *)pStart);

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

+#if wxUSE_UNICODE
+
+// from multibyte string
+wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
+{
+  // first get necessary size
+
+  size_t nLen = conv.MB2WC((wchar_t *) NULL, psz, 0);
+
+  // nLength is number of *Unicode* characters here!
+  if (nLen > nLength)
+    nLen = nLength;
+
+  // empty?
+  if ( nLen != 0 ) {
+    AllocBuffer(nLen);
+    conv.MB2WC(m_pchData, psz, nLen);
+  }
+  else {
+    Init();
+  }
+}
+
+#else
+

 // 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
 

-  // NB: GNU libc5 wcstombs() is completely broken, don't use it (it doesn't
-  //     honor the 3rd parameter, thus it will happily crash here).
-#ifdef wxUSE_WCSRTOMBS
-  // don't know if it's really needed (or if we can pass NULL), but better safe
-  // than quick
-  mbstate_t mbstate;  
-  size_t nLen = wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
-#else  // !GNU libc
-  size_t nLen = wcstombs((char *) NULL, pwz, 0);
-#endif // GNU
+  size_t nLen = wxWC2MB((char *) NULL, pwz, 0);

 
   // empty?
   if ( nLen != 0 ) {
     AllocBuffer(nLen);
 
   // empty?
   if ( nLen != 0 ) {
     AllocBuffer(nLen);

-    wcstombs(m_pchData, pwz, nLen);
+    wxWC2MB(m_pchData, pwz, nLen);

   }
   else {
     Init();
   }
 }
 
   }
   else {
     Init();
   }
 }
 

+#endif
+

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


@@ -264,12 +310,12 @@ void wxString::AllocBuffer(size_t nLen)
   // 1) one extra character for '\0' termination
   // 2) sizeof(wxStringData) for housekeeping info
   wxStringData* pData = (wxStringData*)
   // 1) one extra character for '\0' termination
   // 2) sizeof(wxStringData) for housekeeping info
   wxStringData* pData = (wxStringData*)

-    malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(char));
+    malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxChar));

   pData->nRefs        = 1;
   pData->nDataLength  = nLen;
   pData->nAllocLength = nLen + EXTRA_ALLOC;
   m_pchData           = pData->data();  // data starts after wxStringData
   pData->nRefs        = 1;
   pData->nDataLength  = nLen;
   pData->nAllocLength = nLen + EXTRA_ALLOC;
   m_pchData           = pData->data();  // data starts after wxStringData

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

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


@@ -281,7 +327,7 @@ void wxString::CopyBeforeWrite()
     pData->Unlock();                // memory not freed because shared
     size_t nLen = pData->nDataLength;
     AllocBuffer(nLen);
     pData->Unlock();                // memory not freed because shared
     size_t nLen = pData->nDataLength;
     AllocBuffer(nLen);

-    memcpy(m_pchData, pData->data(), nLen*sizeof(char));
+    memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));

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


@@ -299,6 +345,10 @@ void wxString::AllocBeforeWrite(size_t nLen)
     pData->Unlock();
     AllocBuffer(nLen);
   }
     pData->Unlock();
     AllocBuffer(nLen);
   }

+  else {
+    // update the string length
+    pData->nDataLength = nLen;
+  }

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


@@ -312,24 +362,24 @@ void wxString::Alloc(size_t nLen)
       nLen += EXTRA_ALLOC;
 
       wxStringData* pData = (wxStringData*)
       nLen += EXTRA_ALLOC;
 
       wxStringData* pData = (wxStringData*)

-        malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(char));
+        malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));

       pData->nRefs = 1;
       pData->nDataLength = 0;
       pData->nAllocLength = nLen;
       m_pchData = pData->data();  // data starts after wxStringData
       pData->nRefs = 1;
       pData->nDataLength = 0;
       pData->nAllocLength = nLen;
       m_pchData = pData->data();  // data starts after wxStringData

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

     }
     else if ( pData->IsShared() ) {
       pData->Unlock();                // memory not freed because shared
       size_t nOldLen = pData->nDataLength;
       AllocBuffer(nLen);
     }
     else if ( pData->IsShared() ) {
       pData->Unlock();                // memory not freed because shared
       size_t nOldLen = pData->nDataLength;
       AllocBuffer(nLen);

-      memcpy(m_pchData, pData->data(), nOldLen*sizeof(char));
+      memcpy(m_pchData, pData->data(), nOldLen*sizeof(wxChar));

     }
     else {
       nLen += EXTRA_ALLOC;
 
       wxStringData *p = (wxStringData *)
     }
     else {
       nLen += EXTRA_ALLOC;
 
       wxStringData *p = (wxStringData *)

-        realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(char));
+        realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));

 
       if ( p == NULL ) {
         // @@@ what to do on memory error?
 
       if ( p == NULL ) {
         // @@@ what to do on memory error?


@@ -355,14 +405,14 @@ void wxString::Shrink()
 #ifdef __WXDEBUG__
   void *p =
 #endif
 #ifdef __WXDEBUG__
   void *p =
 #endif

-  realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(char));
+  realloc(pData, sizeof(wxStringData) + (pData->nDataLength + 1)*sizeof(wxChar));

 
   wxASSERT( p != NULL );  // can't free memory?
   wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move!
 }
 
 // get the pointer to writable buffer of (at least) nLen bytes
 
   wxASSERT( p != NULL );  // can't free memory?
   wxASSERT( p == pData ); // we're decrementing the size - block shouldn't move!
 }
 
 // get the pointer to writable buffer of (at least) nLen bytes

-char *wxString::GetWriteBuf(size_t nLen)
+wxChar *wxString::GetWriteBuf(size_t nLen)

 {
   AllocBeforeWrite(nLen);
 
 {
   AllocBeforeWrite(nLen);
 


@@ -375,7 +425,7 @@ char *wxString::GetWriteBuf(size_t nLen)
 // put string back in a reasonable state after GetWriteBuf
 void wxString::UngetWriteBuf()
 {
 // put string back in a reasonable state after GetWriteBuf
 void wxString::UngetWriteBuf()
 {

-  GetStringData()->nDataLength = strlen(m_pchData);
+  GetStringData()->nDataLength = wxStrlen(m_pchData);

   GetStringData()->Validate(TRUE);
 }
 
   GetStringData()->Validate(TRUE);
 }
 


@@ -390,16 +440,16 @@ void wxString::UngetWriteBuf()
 // ---------------------------------------------------------------------------
 
 // helper function: does real copy
 // ---------------------------------------------------------------------------
 
 // helper function: does real copy

-void wxString::AssignCopy(size_t nSrcLen, const char *pszSrcData)
+void wxString::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)

 {
   if ( nSrcLen == 0 ) {
     Reinit();
   }
   else {
     AllocBeforeWrite(nSrcLen);
 {
   if ( nSrcLen == 0 ) {
     Reinit();
   }
   else {
     AllocBeforeWrite(nSrcLen);

-    memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(char));
+    memcpy(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar));

     GetStringData()->nDataLength = nSrcLen;
     GetStringData()->nDataLength = nSrcLen;

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

   }
 }
 
   }
 }
 


@@ -425,19 +475,21 @@ wxString& wxString::operator=(const wxString& stringSrc)
 }
 
 // assigns a single character
 }
 
 // assigns a single character

-wxString& wxString::operator=(char ch)
+wxString& wxString::operator=(wxChar ch)

 {
   AssignCopy(1, &ch);
   return *this;
 }
 
 // assigns C string
 {
   AssignCopy(1, &ch);
   return *this;
 }
 
 // assigns C string

-wxString& wxString::operator=(const char *psz)
+wxString& wxString::operator=(const wxChar *psz)

 {
 {

-  AssignCopy(Strlen(psz), psz);
+  AssignCopy(wxStrlen(psz), psz);

   return *this;
 }
 
   return *this;
 }
 

+#if !wxUSE_UNICODE
+

 // same as 'signed char' variant
 wxString& wxString::operator=(const unsigned char* psz)
 {
 // same as 'signed char' variant
 wxString& wxString::operator=(const unsigned char* psz)
 {


@@ -452,12 +504,14 @@ wxString& wxString::operator=(const wchar_t *pwz)
   return *this;
 }
 
   return *this;
 }
 

+#endif
+

 // ---------------------------------------------------------------------------
 // string concatenation
 // ---------------------------------------------------------------------------
 
 // add something to this string
 // ---------------------------------------------------------------------------
 // string concatenation
 // ---------------------------------------------------------------------------
 
 // add something to this string

-void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData)
+void wxString::ConcatSelf(int nSrcLen, const wxChar *pszSrcData)

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


@@ -474,7 +528,7 @@ void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData)
       // we have to allocate another buffer
       wxStringData* pOldData = GetStringData();
       AllocBuffer(nNewLen);
       // we have to allocate another buffer
       wxStringData* pOldData = GetStringData();
       AllocBuffer(nNewLen);

-      memcpy(m_pchData, pOldData->data(), nLen*sizeof(char));
+      memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar));

       pOldData->Unlock();
     }
     else if ( nNewLen > pData->nAllocLength ) {
       pOldData->Unlock();
     }
     else if ( nNewLen > pData->nAllocLength ) {


@@ -493,9 +547,9 @@ void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData)
     wxASSERT( nNewLen <= GetStringData()->nAllocLength );
 
     // fast concatenation - all is done in our buffer
     wxASSERT( nNewLen <= GetStringData()->nAllocLength );
 
     // fast concatenation - all is done in our buffer

-    memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char));
+    memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar));

 
 

-    m_pchData[nNewLen] = '\0';              // put terminating '\0'
+    m_pchData[nNewLen] = _T('\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


@@ -519,7 +573,7 @@ wxString operator+(const wxString& string1, const wxString& string2)
   return s;
 }
 
   return s;
 }
 

-wxString operator+(const wxString& string, char ch)
+wxString operator+(const wxString& string, wxChar ch)

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


@@ -529,7 +583,7 @@ wxString operator+(const wxString& string, char ch)
   return s;
 }
 
   return s;
 }
 

-wxString operator+(char ch, const wxString& string)
+wxString operator+(wxChar ch, const wxString& string)

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


@@ -539,24 +593,24 @@ wxString operator+(char ch, const wxString& string)
   return s;
 }
 
   return s;
 }
 

-wxString operator+(const wxString& string, const char *psz)
+wxString operator+(const wxString& string, const wxChar *psz)

 {
   wxASSERT( string.GetStringData()->IsValid() );
 
   wxString s;
 {
   wxASSERT( string.GetStringData()->IsValid() );
 
   wxString s;

-  s.Alloc(Strlen(psz) + string.Len());
+  s.Alloc(wxStrlen(psz) + string.Len());

   s = string;
   s += psz;
 
   return s;
 }
 
   s = string;
   s += psz;
 
   return s;
 }
 

-wxString operator+(const char *psz, const wxString& string)
+wxString operator+(const wxChar *psz, const wxString& string)

 {
   wxASSERT( string.GetStringData()->IsValid() );
 
   wxString s;
 {
   wxASSERT( string.GetStringData()->IsValid() );
 
   wxString s;

-  s.Alloc(Strlen(psz) + string.Len());
+  s.Alloc(wxStrlen(psz) + string.Len());

   s = psz;
   s += string;
 
   s = psz;
   s += string;
 


@@ -579,7 +633,7 @@ void wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
   }
   else {
     dest.AllocBuffer(nCopyLen);
   }
   else {
     dest.AllocBuffer(nCopyLen);

-    memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(char));
+    memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar));

   }
 }
 
   }
 }
 


@@ -589,8 +643,8 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const
   wxStringData *pData = GetStringData();
   size_t nLen = pData->nDataLength;
 
   wxStringData *pData = GetStringData();
   size_t nLen = pData->nDataLength;
 

-  // default value of nCount is STRING_MAXLEN and means "till the end"
-  if ( nCount == STRING_MAXLEN )
+  // default value of nCount is wxSTRING_MAXLEN and means "till the end"
+  if ( nCount == wxSTRING_MAXLEN )

   {
     nCount = nLen - nFirst;
   }
   {
     nCount = nLen - nFirst;
   }


@@ -626,11 +680,11 @@ 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::Right(char ch) const
+wxString wxString::AfterLast(wxChar ch) const

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

-  if ( iPos == NOT_FOUND )
+  if ( iPos == wxNOT_FOUND )

     str = *this;
   else
     str = c_str() + iPos + 1;
     str = *this;
   else
     str = c_str() + iPos + 1;


@@ -651,10 +705,10 @@ 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::Left(char ch) const
+wxString wxString::BeforeFirst(wxChar ch) const

 {
   wxString str;
 {
   wxString str;

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

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


@@ -662,11 +716,11 @@ wxString wxString::Left(char 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::Before(char ch) const
+wxString wxString::BeforeLast(wxChar ch) const

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

-  if ( iPos != NOT_FOUND && iPos != 0 )
+  if ( iPos != wxNOT_FOUND && iPos != 0 )

     str = wxString(c_str(), iPos);
 
   return str;
     str = wxString(c_str(), iPos);
 
   return str;


@@ -674,28 +728,28 @@ wxString wxString::Before(char 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::After(char ch) const
+wxString wxString::AfterFirst(wxChar ch) const

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

-  if ( iPos != NOT_FOUND )
+  if ( iPos != wxNOT_FOUND )

     str = c_str() + iPos + 1;
 
   return str;
 }
 
 // replace first (or all) occurences of some substring with another one
     str = c_str() + iPos + 1;
 
   return str;
 }
 
 // replace first (or all) occurences of some substring with another one

-size_t wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll)
+size_t wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll)

 {
   size_t uiCount = 0;   // count of replacements made
 
 {
   size_t uiCount = 0;   // count of replacements made
 

-  size_t uiOldLen = Strlen(szOld);
+  size_t uiOldLen = wxStrlen(szOld);

 
   wxString strTemp;
 
   wxString strTemp;

-  const char *pCurrent = m_pchData;
-  const char *pSubstr;
-  while ( *pCurrent != '\0' ) {
-    pSubstr = strstr(pCurrent, szOld);
+  const wxChar *pCurrent = m_pchData;
+  const wxChar *pSubstr;
+  while ( *pCurrent != _T('\0') ) {
+    pSubstr = wxStrstr(pCurrent, szOld);

     if ( pSubstr == NULL ) {
       // strTemp is unused if no replacements were made, so avoid the copy
       if ( uiCount == 0 )
     if ( pSubstr == NULL ) {
       // strTemp is unused if no replacements were made, so avoid the copy
       if ( uiCount == 0 )


@@ -728,7 +782,7 @@ size_t wxString::Replace(const char *szOld, const char *szNew, bool bReplaceAll)
 
 bool wxString::IsAscii() const
 {
 
 bool wxString::IsAscii() const
 {

-  const char *s = (const char*) *this;
+  const wxChar *s = (const wxChar*) *this;

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


@@ -738,9 +792,9 @@ bool wxString::IsAscii() const
 
 bool wxString::IsWord() const
 {
 
 bool wxString::IsWord() const
 {

-  const char *s = (const char*) *this;
+  const wxChar *s = (const wxChar*) *this;

   while(*s){
   while(*s){

-    if(!isalpha(*s)) return(FALSE);
+    if(!wxIsalpha(*s)) return(FALSE);

     s++;
   }
   return(TRUE);
     s++;
   }
   return(TRUE);


@@ -748,9 +802,9 @@ bool wxString::IsWord() const
 
 bool wxString::IsNumber() const
 {
 
 bool wxString::IsNumber() const
 {

-  const char *s = (const char*) *this;
+  const wxChar *s = (const wxChar*) *this;

   while(*s){
   while(*s){

-    if(!isdigit(*s)) return(FALSE);
+    if(!wxIsdigit(*s)) return(FALSE);

     s++;
   }
   return(TRUE);
     s++;
   }
   return(TRUE);


@@ -772,8 +826,8 @@ wxString& wxString::MakeUpper()
 {
   CopyBeforeWrite();
 
 {
   CopyBeforeWrite();
 

-  for ( char *p = m_pchData; *p; p++ )
-    *p = (char)toupper(*p);
+  for ( wxChar *p = m_pchData; *p; p++ )
+    *p = (wxChar)wxToupper(*p);

 
   return *this;
 }
 
   return *this;
 }


@@ -782,8 +836,8 @@ wxString& wxString::MakeLower()
 {
   CopyBeforeWrite();
 
 {
   CopyBeforeWrite();
 

-  for ( char *p = m_pchData; *p; p++ )
-    *p = (char)tolower(*p);
+  for ( wxChar *p = m_pchData; *p; p++ )
+    *p = (wxChar)wxTolower(*p);

 
   return *this;
 }
 
   return *this;
 }


@@ -798,8 +852,8 @@ wxString& wxString::Trim(bool bFromRight)
   // first check if we're going to modify the string at all
   if ( !IsEmpty() && 
        ( 
   // first check if we're going to modify the string at all
   if ( !IsEmpty() && 
        ( 

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

        )
      )
   {
        )
      )
   {


@@ -809,24 +863,24 @@ wxString& wxString::Trim(bool bFromRight)
     if ( bFromRight )
     {
       // find last non-space character
     if ( bFromRight )
     {
       // find last non-space character

-      char *psz = m_pchData + GetStringData()->nDataLength - 1;
-      while ( isspace(*psz) && (psz >= m_pchData) )
+      wxChar *psz = m_pchData + GetStringData()->nDataLength - 1;
+      while ( wxIsspace(*psz) && (psz >= m_pchData) )

         psz--;
 
       // truncate at trailing space start
         psz--;
 
       // truncate at trailing space start

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

       GetStringData()->nDataLength = psz - m_pchData;
     }
     else
     {
       // find first non-space character
       GetStringData()->nDataLength = psz - m_pchData;
     }
     else
     {
       // find first non-space character

-      const char *psz = m_pchData;
-      while ( isspace(*psz) )
+      const wxChar *psz = m_pchData;
+      while ( wxIsspace(*psz) )

         psz++;
 
       // fix up data and length
         psz++;
 
       // fix up data and length

-      int nDataLength = GetStringData()->nDataLength - (psz - m_pchData);
-      memmove(m_pchData, psz, (nDataLength + 1)*sizeof(char));
+      int nDataLength = GetStringData()->nDataLength - (psz - (const wxChar*) m_pchData);
+      memmove(m_pchData, psz, (nDataLength + 1)*sizeof(wxChar));

       GetStringData()->nDataLength = nDataLength;
     }
   }
       GetStringData()->nDataLength = nDataLength;
     }
   }


@@ -835,7 +889,7 @@ wxString& wxString::Trim(bool bFromRight)
 }
 
 // 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, char chPad, bool bFromRight)
+wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight)

 {
   wxString s(chPad, nCount);
 
 {
   wxString s(chPad, nCount);
 


@@ -853,30 +907,35 @@ wxString& wxString::Pad(size_t nCount, char chPad, bool bFromRight)
 // truncate the string
 wxString& wxString::Truncate(size_t uiLen)
 {
 // truncate the string
 wxString& wxString::Truncate(size_t uiLen)
 {

-  *(m_pchData + uiLen) = '\0';
-  GetStringData()->nDataLength = uiLen;
+  if ( uiLen < Len() ) {
+    CopyBeforeWrite();
+
+    *(m_pchData + uiLen) = _T('\0');
+    GetStringData()->nDataLength = uiLen;
+  }
+  //else: nothing to do, string is already short enough

 
   return *this;
 }
 
 // ---------------------------------------------------------------------------
 
   return *this;
 }
 
 // ---------------------------------------------------------------------------

-// finding (return NOT_FOUND if not found and index otherwise)
+// finding (return wxNOT_FOUND if not found and index otherwise)

 // ---------------------------------------------------------------------------
 
 // find a character
 // ---------------------------------------------------------------------------
 
 // find a character

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

 {
 {

-  const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch);
+  const wxChar *psz = bFromEnd ? wxStrrchr(m_pchData, ch) : wxStrchr(m_pchData, ch);

 
 

-  return (psz == NULL) ? NOT_FOUND : psz - m_pchData;
+  return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData;

 }
 
 // find a sub-string (like strstr)
 }
 
 // find a sub-string (like strstr)

-int wxString::Find(const char *pszSub) const
+int wxString::Find(const wxChar *pszSub) const

 {
 {

-  const char *psz = strstr(m_pchData, pszSub);
+  const wxChar *psz = wxStrstr(m_pchData, pszSub);

 
 

-  return (psz == NULL) ? NOT_FOUND : psz - m_pchData;
+  return (psz == NULL) ? wxNOT_FOUND : psz - (const wxChar*) m_pchData;

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


@@ -885,7 +944,7 @@ int wxString::Find(const char *pszSub) const
 wxString& wxString::operator<<(int i)
 {
     wxString res;
 wxString& wxString::operator<<(int i)
 {
     wxString res;

-    res.Printf("%d", i);
+    res.Printf(_T("%d"), i);

 
     return (*this) << res;
 }
 
     return (*this) << res;
 }


@@ -893,7 +952,7 @@ wxString& wxString::operator<<(int i)
 wxString& wxString::operator<<(float f)
 {
     wxString res;
 wxString& wxString::operator<<(float f)
 {
     wxString res;

-    res.Printf("%f", f);
+    res.Printf(_T("%f"), f);

 
     return (*this) << res;
 }
 
     return (*this) << res;
 }


@@ -901,7 +960,7 @@ wxString& wxString::operator<<(float f)
 wxString& wxString::operator<<(double d)
 {
     wxString res;
 wxString& wxString::operator<<(double d)
 {
     wxString res;

-    res.Printf("%g", d);
+    res.Printf(_T("%g"), d);

 
     return (*this) << res;
 }
 
     return (*this) << res;
 }


@@ -909,7 +968,7 @@ wxString& wxString::operator<<(double d)
 // ---------------------------------------------------------------------------
 // formatted output
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // formatted output
 // ---------------------------------------------------------------------------

-int wxString::Printf(const char *pszFormat, ...)
+int wxString::Printf(const wxChar *pszFormat, ...)

 {
   va_list argptr;
   va_start(argptr, pszFormat);
 {
   va_list argptr;
   va_start(argptr, pszFormat);


@@ -921,44 +980,260 @@ int wxString::Printf(const char *pszFormat, ...)
   return iLen;
 }
 
   return iLen;
 }
 

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

 {
 {

-#ifdef __BORLANDC__
+  // static buffer to avoid dynamic memory allocation each time

   static char s_szScratch[1024];
   static char s_szScratch[1024];

+#if wxUSE_THREADS
+  // protect the static buffer
+  static wxCriticalSection critsect;
+  wxCriticalSectionLocker lock(critsect);
+#endif

 
 

-  int iLen = vsprintf(s_szScratch, pszFormat, argptr);
-  AllocBeforeWrite(iLen);
-  strcpy(m_pchData, s_szScratch);
-
-  return iLen;
+#if 1 // the new implementation
+
+  Reinit();
+  for (size_t n = 0; pszFormat[n]; n++)
+    if (pszFormat[n] == _T('%')) {
+      static char s_szFlags[256] = "%";
+      size_t flagofs = 1;
+      bool adj_left = FALSE, in_prec = 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; }
+       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) {
+#if SIZEOF_LONG_LONG
+           long long int val = va_arg(argptr, long long int);
+           ::sprintf(s_szScratch, s_szFlags, val);

 #else
 #else

-#ifdef __WXMSW__
-  #ifdef _MSC_VER
-    #define wxVsprintf     _vsnprintf
-  #endif
-#else // guess that any Unix has snprintf() - feel free to insert additional
-      // platform/compiler tests here if this is not the case for you
-  #define wxVsprintf       vsnprintf
+           long int val = va_arg(argptr, long int);
+           ::sprintf(s_szScratch, s_szFlags, val);

 #endif
 #endif

-  
-#ifndef wxVsprintf
-  #pragma message("Using sprintf() because no snprintf()-like function defined")
-  #define wxVsprintf vsprintf
+         }
+         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 *);
+#if wxUSE_UNICODE
+           // ASCII->Unicode constructor handles max_width right
+           wxString s(val, wxConv_libc, max_width);
+#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);

 #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;
+       }
+#undef CHECK_PREC
+      } while (!done);
+    } else *this += pszFormat[n];

 
 

-  // static buffer to avoid dynamic memory allocation each time
-  static char s_szScratch[1024];
-
-  int iLen = wxVsprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr);
+#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;
   char *buffer;

-  if ( (size_t)iLen < WXSIZEOF(s_szScratch) ) {
+  if ( iLen < (int)WXSIZEOF(s_szScratch) ) {

     buffer = s_szScratch;
   }
   else {
       int size = WXSIZEOF(s_szScratch) * 2;
       buffer = (char *)malloc(size);
       while ( buffer != NULL ) {
     buffer = s_szScratch;
   }
   else {
       int size = WXSIZEOF(s_szScratch) * 2;
       buffer = (char *)malloc(size);
       while ( buffer != NULL ) {

-          iLen = wxVsprintf(buffer, WXSIZEOF(s_szScratch), pszFormat, argptr);
+          iLen = wxVsnprintf(buffer, WXSIZEOF(s_szScratch), pszFormat, argptr);

           if ( iLen < size ) {
               // ok, there was enough space
               break;
           if ( iLen < size ) {
               // ok, there was enough space
               break;


@@ -974,46 +1249,46 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
       }
   }
 
       }
   }
 

-  AllocBeforeWrite(iLen);
-  strcpy(m_pchData, buffer);
+  wxString s(buffer);
+  *this = s;

 
   if ( buffer != s_szScratch )
       free(buffer);
 
   if ( buffer != s_szScratch )
       free(buffer);

-
-  return iLen;

 #endif
 #endif

+
+  return Len();

 }
 
 // ----------------------------------------------------------------------------
 // misc other operations
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // misc other operations
 // ----------------------------------------------------------------------------

-bool wxString::Matches(const char *pszMask) const
+bool wxString::Matches(const wxChar *pszMask) const

 {
   // check char by char
 {
   // check char by char

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

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

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

           return FALSE;
 
         pszTxt++;
         pszMask++;
         break;
 
           return FALSE;
 
         pszTxt++;
         pszMask++;
         break;
 

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

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

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

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

-          if ( *pszMask == '\0' )
+          if ( *pszMask == _T('\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 char *pEndMask = strpbrk(pszMask, "*?");
+          const wxChar *pEndMask = wxStrpbrk(pszMask, _T("*?"));

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


@@ -1021,11 +1296,11 @@ bool wxString::Matches(const char *pszMask) const
           }
           else {
             // we have to match the remainder of the string
           }
           else {
             // we have to match the remainder of the string

-            uiLenMask = strlen(pszMask);
+            uiLenMask = wxStrlen(pszMask);

           }
 
           wxString strToMatch(pszMask, uiLenMask);
           }
 
           wxString strToMatch(pszMask, uiLenMask);

-          const char* pMatch = strstr(pszTxt, strToMatch);
+          const wxChar* pMatch = wxStrstr(pszTxt, strToMatch);

           if ( pMatch == NULL )
             return FALSE;
 
           if ( pMatch == NULL )
             return FALSE;
 


@@ -1043,13 +1318,42 @@ bool wxString::Matches(const char *pszMask) const
   }
 
   // match only if nothing left
   }
 
   // match only if nothing left

-  return *pszTxt == '\0';
+  return *pszTxt == _T('\0');
+}
+
+// Count the number of chars
+int wxString::Freq(wxChar ch) const
+{
+    int count = 0;
+    int len = Len();
+    for (int i = 0; i < len; i++)
+    {
+        if (GetChar(i) == ch)
+            count ++;
+    }
+    return count;

 }
 
 }
 

+// convert to upper case, return the copy of the string
+wxString wxString::Upper() const
+{ wxString s(*this); return s.MakeUpper(); }
+
+// 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;
+  }
+

 // ---------------------------------------------------------------------------
 // standard C++ library string functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // standard C++ library string functions
 // ---------------------------------------------------------------------------

-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY

 
 wxString& wxString::insert(size_t nPos, const wxString& str)
 {
 
 wxString& wxString::insert(size_t nPos, const wxString& str)
 {


@@ -1058,10 +1362,10 @@ wxString& wxString::insert(size_t nPos, const wxString& str)
 
   if ( !str.IsEmpty() ) {
     wxString strTmp;
 
   if ( !str.IsEmpty() ) {
     wxString strTmp;

-    char *pc = strTmp.GetWriteBuf(Len() + str.Len());
-    strncpy(pc, c_str(), nPos);
-    strcpy(pc + nPos, str);
-    strcpy(pc + nPos + str.Len(), c_str() + nPos);
+    wxChar *pc = strTmp.GetWriteBuf(Len() + str.Len());
+    wxStrncpy(pc, c_str(), nPos);
+    wxStrcpy(pc + nPos, str);
+    wxStrcpy(pc + nPos + str.Len(), c_str() + nPos);

     strTmp.UngetWriteBuf();
     *this = strTmp;
   }
     strTmp.UngetWriteBuf();
     *this = strTmp;
   }


@@ -1074,27 +1378,30 @@ size_t wxString::find(const wxString& str, size_t nStart) const
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 
   wxASSERT( str.GetStringData()->IsValid() );
   wxASSERT( nStart <= Len() );
 

-  const char *p = strstr(c_str() + nStart, str);
+  const wxChar *p = wxStrstr(c_str() + nStart, str);

 
   return p == NULL ? npos : p - c_str();
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.
 
   return p == NULL ? npos : p - c_str();
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
-size_t wxString::find(const char* 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 == npos ? 0 : n), nStart);
 }

-#endif
+#endif // VC++ 1.5

 
 

-size_t wxString::find(char ch, size_t nStart) const
+// Gives a duplicate symbol (presumably a case-insensitivity problem)
+#if !defined(__BORLANDC__)
+size_t wxString::find(wxChar ch, size_t nStart) const

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

-  const char *p = strchr(c_str() + nStart, ch);
+  const wxChar *p = wxStrchr(c_str() + nStart, ch);

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

+#endif

 
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
 
 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {


@@ -1102,9 +1409,9 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
   wxASSERT( nStart <= Len() );
 
   // # could be quicker than that
   wxASSERT( nStart <= Len() );
 
   // # could be quicker than that

-  const char *p = c_str() + (nStart == npos ? Len() : nStart);
+  const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);

   while ( p >= c_str() + str.Len() ) {
   while ( p >= c_str() + str.Len() ) {

-    if ( strncmp(p - str.Len(), str, str.Len()) == 0 )
+    if ( wxStrncmp(p - str.Len(), str, str.Len()) == 0 )

       return p - str.Len() - c_str();
     p--;
   }
       return p - str.Len() - c_str();
     p--;
   }


@@ -1113,21 +1420,21 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
-size_t wxString::rfind(const char* 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(char ch, size_t nStart) const
+size_t wxString::rfind(wxChar ch, size_t nStart) const

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

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

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

-#endif
+#endif // VC++ 1.5

 
 wxString wxString::substr(size_t nStart, size_t nLen) const
 {
 
 wxString wxString::substr(size_t nStart, size_t nLen) const
 {


@@ -1153,9 +1460,9 @@ wxString& wxString::erase(size_t nStart, size_t nLen)
   return *this;
 }
 
   return *this;
 }
 

-wxString& wxString::replace(size_t nStart, size_t nLen, const char *sz)
+wxString& wxString::replace(size_t nStart, size_t nLen, const wxChar *sz)

 {
 {

-  wxASSERT( nStart + nLen <= Strlen(sz) );
+  wxASSERT( nStart + nLen <= wxStrlen(sz) );

 
   wxString strTmp;
   if ( nStart != 0 )
 
   wxString strTmp;
   if ( nStart != 0 )


@@ -1167,7 +1474,7 @@ wxString& wxString::replace(size_t nStart, size_t nLen, const char *sz)
   return *this;
 }
 
   return *this;
 }
 

-wxString& wxString::replace(size_t nStart, size_t nLen, size_t nCount, char ch)
+wxString& wxString::replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch)

 {
   return replace(nStart, nLen, wxString(ch, nCount));
 }
 {
   return replace(nStart, nLen, wxString(ch, nCount));
 }


@@ -1179,7 +1486,7 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
 }
 
 wxString& wxString::replace(size_t nStart, size_t nLen,
 }
 
 wxString& wxString::replace(size_t nStart, size_t nLen,

-                        const char* sz, size_t nCount)
+                        const wxChar* sz, size_t nCount)

 {
   return replace(nStart, nLen, wxString(sz, nCount));
 }
 {
   return replace(nStart, nLen, wxString(sz, nCount));
 }


@@ -1203,7 +1510,7 @@ wxArrayString::wxArrayString()
 {
   m_nSize  =
   m_nCount = 0;
 {
   m_nSize  =
   m_nCount = 0;

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

 }
 
 // copy ctor
 }
 
 // copy ctor


@@ -1211,7 +1518,7 @@ wxArrayString::wxArrayString(const wxArrayString& src)
 {
   m_nSize  =
   m_nCount = 0;
 {
   m_nSize  =
   m_nCount = 0;

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

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


@@ -1231,7 +1538,7 @@ wxArrayString& wxArrayString::operator=(const wxArrayString& src)
     Add(src[n]);
 
   if ( m_nCount != 0 )
     Add(src[n]);
 
   if ( m_nCount != 0 )

-    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(char *));
+    memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(wxChar *));

 
   return *this;
 }
 
   return *this;
 }


@@ -1244,7 +1551,7 @@ void wxArrayString::Grow()
     if( m_nSize == 0 ) {
       // was empty, alloc some memory
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
     if( m_nSize == 0 ) {
       // was empty, alloc some memory
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;

-      m_pItems = new char *[m_nSize];
+      m_pItems = new wxChar *[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


@@ -1257,10 +1564,10 @@ void wxArrayString::Grow()
       if ( nIncrement > ARRAY_MAXSIZE_INCREMENT )
         nIncrement = ARRAY_MAXSIZE_INCREMENT;
       m_nSize += nIncrement;
       if ( nIncrement > ARRAY_MAXSIZE_INCREMENT )
         nIncrement = ARRAY_MAXSIZE_INCREMENT;
       m_nSize += nIncrement;

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

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

-      memcpy(pNew, m_pItems, m_nCount*sizeof(char *));
+      memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));

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


@@ -1313,7 +1620,7 @@ void wxArrayString::Alloc(size_t nSize)
   if ( nSize > m_nSize ) {
     Free();
     wxDELETEA(m_pItems);
   if ( nSize > m_nSize ) {
     Free();
     wxDELETEA(m_pItems);

-    m_pItems = new char *[nSize];
+    m_pItems = new wxChar *[nSize];

     m_nSize  = nSize;
   }
 
     m_nSize  = nSize;
   }
 


@@ -1321,7 +1628,7 @@ void wxArrayString::Alloc(size_t nSize)
 }
 
 // searches the array for an item (forward or backwards)
 }
 
 // searches the array for an item (forward or backwards)

-int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const
+int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const

 {
   if ( bFromEnd ) {
     if ( m_nCount > 0 ) {
 {
   if ( bFromEnd ) {
     if ( m_nCount > 0 ) {


@@ -1340,7 +1647,7 @@ int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const
     }
   }
 
     }
   }
 

-  return NOT_FOUND;
+  return wxNOT_FOUND;

 }
 
 // add item at the end
 }
 
 // add item at the end


@@ -1352,7 +1659,7 @@ void wxArrayString::Add(const wxString& str)
 
   // the string data must not be deleted!
   str.GetStringData()->Lock();
 
   // the string data must not be deleted!
   str.GetStringData()->Lock();

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

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


@@ -1360,15 +1667,15 @@ 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, _("bad index in wxArrayString::Insert") );

 
   Grow();
 
   memmove(&m_pItems[nIndex + 1], &m_pItems[nIndex],
 
   Grow();
 
   memmove(&m_pItems[nIndex + 1], &m_pItems[nIndex],

-          (m_nCount - nIndex)*sizeof(char *));
+          (m_nCount - nIndex)*sizeof(wxChar *));

 
   str.GetStringData()->Lock();
 
   str.GetStringData()->Lock();

-  m_pItems[nIndex] = (char *)str.c_str();
+  m_pItems[nIndex] = (wxChar *)str.c_str();

 
   m_nCount++;
 }
 
   m_nCount++;
 }


@@ -1382,25 +1689,198 @@ void wxArrayString::Remove(size_t nIndex)
   Item(nIndex).GetStringData()->Unlock();
 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
   Item(nIndex).GetStringData()->Unlock();
 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],

-          (m_nCount - nIndex - 1)*sizeof(char *));
+          (m_nCount - nIndex - 1)*sizeof(wxChar *));

   m_nCount--;
 }
 
 // removes item from array (by value)
   m_nCount--;
 }
 
 // removes item from array (by value)

-void wxArrayString::Remove(const char *sz)
+void wxArrayString::Remove(const wxChar *sz)

 {
   int iIndex = Index(sz);
 
 {
   int iIndex = Index(sz);
 

-  wxCHECK_RET( iIndex != NOT_FOUND,
+  wxCHECK_RET( iIndex != wxNOT_FOUND,

                _("removing inexistent element in wxArrayString::Remove") );
 
   Remove(iIndex);
 }
 
                _("removing inexistent element in wxArrayString::Remove") );
 
   Remove(iIndex);
 }
 

+// ----------------------------------------------------------------------------
+// sorting
+// ----------------------------------------------------------------------------
+
+// we can only sort one array at a time with the quick-sort based
+// implementation
+#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()
+#endif // wxUSE_THREADS
+
+// function to use for string comparaison
+static wxArrayString::CompareFunction gs_compareFunction = NULL;
+
+// if we don't use the compare function, this flag tells us if we sort the
+// array in ascending or descending order
+static bool gs_sortAscending = TRUE;
+
+// function which is called by quick sort
+static int wxStringCompareFunction(const void *first, const void *second)
+{
+  wxString *strFirst = (wxString *)first;
+  wxString *strSecond = (wxString *)second;
+
+  if ( gs_compareFunction ) {
+    return gs_compareFunction(*strFirst, *strSecond);
+  }
+  else {
+    // maybe we should use wxStrcoll
+    int result = wxStrcmp(strFirst->c_str(), strSecond->c_str());
+
+    return gs_sortAscending ? result : -result;
+  }
+}
+

 // sort array elements using passed comparaison function
 // sort array elements using passed comparaison function

+void wxArrayString::Sort(CompareFunction compareFunction)
+{
+  START_SORT();
+
+  wxASSERT( !gs_compareFunction );  // must have been reset to NULL
+  gs_compareFunction = compareFunction;
+
+  DoSort();
+
+  END_SORT();
+}

 
 

-void wxArrayString::Sort(bool WXUNUSED(bCase), bool WXUNUSED(bReverse) )
+void wxArrayString::Sort(bool reverseOrder)

 {
 {

-  //@@@@ TO DO
-  //qsort(m_pItems, m_nCount, sizeof(char *), fCmp);
+  START_SORT();
+
+  wxASSERT( !gs_compareFunction );  // must have been reset to NULL
+  gs_sortAscending = !reverseOrder;
+
+  DoSort();
+
+  END_SORT();

 }
 }

+
+void wxArrayString::DoSort()
+{
+  // 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_libc;
+
+// ----------------------------------------------------------------------------
+// standard libc conversion
+// ----------------------------------------------------------------------------
+
+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);
+}
+
+// ----------------------------------------------------------------------------
+// UTF-7
+// ----------------------------------------------------------------------------
+
+class wxMBConv_UTF7
+{
+public:
+  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
+};
+
+// WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
+WXDLLEXPORT_DATA(wxMBConv) 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
+// ----------------------------------------------------------------------------
+
+class wxMBConv_UTF8
+{
+public:
+  virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+  virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
+};
+
+// WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
+WXDLLEXPORT_DATA(wxMBConv) 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
+// ----------------------------------------------------------------------------
+
+// TODO: write actual implementation of character set conversion here
+wxCSConv::wxCSConv(const wxChar *charset)
+{
+  data = (wxChar *) NULL;
+}
+
+size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+  if (buf && !data) {
+    // 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
+{
+  if (buf && !data) {
+    // latin-1 (direct)
+    for (size_t c=0; c<=n; c++)
+      buf[c] = (psz[c]>0xff) ? '?' : psz[c];
+  }
+  return n;
+}
+