HP-UX compilation fixes (thanks to Zdravko Bas)

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 1bcf9bff838dde7aeed0890558a27691d978285f..37a116fa020d4e9561cad08cbee96e751e4e46f2 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,7 +28,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP


@@ -41,6 +41,14 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

+#ifdef __SALFORDC__
+  #include <clib.h>
+#endif
+
+#if wxUSE_WCSRTOMBS
+  #include <wchar.h>    // for wcsrtombs(), see comments where it's used
+#endif // GNU
+

 #ifdef  WXSTRING_IS_WXOBJECT
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT
 #ifdef  WXSTRING_IS_WXOBJECT
   IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
 #endif  //WXSTRING_IS_WXOBJECT


@@ -54,9 +62,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,37 +80,73 @@ static const struct
 } g_strEmpty = { {-1, 0, 0}, '\0' };
 
 // empty C style string: points to 'string data' byte of g_strEmpty
 } g_strEmpty = { {-1, 0, 0}, '\0' };
 
 // empty C style string: points to 'string data' byte of g_strEmpty

-extern const char *g_szNul = &g_strEmpty.dummy;
+extern const char 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 wxVsprintf     _vsnprintf
+    #endif
+#else   // !Windows
+    #ifdef HAVE_VSNPRINTF
+        #define wxVsprintf       vsnprintf
+    #endif
+#endif  // Windows/!Windows
+
+#ifndef wxVsprintf
+    // 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 wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
+#if defined(__VISUALC__)
+    #pragma message("Using sprintf() because no snprintf()-like function defined")
+#elif defined(__GNUG__)
+    #warning "Using sprintf() because no snprintf()-like function defined"
+#elif defined(__MWERKS__)
+       #warning "Using sprintf() because no snprintf()-like function defined"
+#elif defined(__WATCOMC__)
+    // No warning
+#elif defined(__BORLANDC__)
+       // No warning
+#elif defined(__SUNCC__)
+    // nothing -- I don't know about "#warning" for Sun's CC
+#elif defined(__DECCXX)
+   // nothing
+#else
+    // change this to some analogue of '#warning' for your compiler
+    #error "Using sprintf() because no snprintf()-like function defined"
+#endif //compiler
+
+#endif // no vsnprintf

 
 // ----------------------------------------------------------------------------
 // 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 0 // def  _MSC_VER
-  #include  <iostream>
-  #define   NAMESPACE   std::
-#else
-  #include  <iostream.h>
-  #define   NAMESPACE
-#endif  //Visual C++

 
 

-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) ) {


@@ -118,7 +162,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;
 }


@@ -136,7 +180,7 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
   {
   public:
     Averager(const char *sz) { m_sz = sz; m_nTotal = m_nCount = 0; }
   {
   public:
     Averager(const char *sz) { m_sz = sz; m_nTotal = m_nCount = 0; }

-   ~Averager() 
+   ~Averager()

    { printf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); }
 
     void Add(size_t n) { m_nTotal += n; m_nCount++; }
    { printf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); }
 
     void Add(size_t n) { m_nTotal += n; m_nCount++; }


@@ -183,7 +227,7 @@ void wxString::InitWith(const char *psz, size_t nPos, size_t nLength)
 
   wxASSERT( nPos <= Strlen(psz) );
 
 
   wxASSERT( nPos <= Strlen(psz) );
 

-  if ( nLength == STRING_MAXLEN )
+  if ( nLength == wxSTRING_MAXLEN )

     nLength = Strlen(psz + nPos);
 
   STATISTICS_ADD(InitialLength, nLength);
     nLength = Strlen(psz + nPos);
 
   STATISTICS_ADD(InitialLength, nLength);


@@ -201,7 +245,7 @@ wxString::wxString(const unsigned char* psz, size_t nLength)
   InitWith((const char *)psz, 0, 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)


@@ -216,7 +260,17 @@ wxString::wxString(const void *pStart, const void *pEnd)
 wxString::wxString(const wchar_t *pwz)
 {
   // first get necessary size
 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).
+#if 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);
   size_t nLen = wcstombs((char *) NULL, pwz, 0);

+#endif // GNU

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


@@ -279,6 +333,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
 }


@@ -441,43 +499,44 @@ void wxString::ConcatSelf(int nSrcLen, const char *pszSrcData)
 {
   STATISTICS_ADD(SummandLength, nSrcLen);
 
 {
   STATISTICS_ADD(SummandLength, nSrcLen);
 

-  // concatenating an empty string is a NOP, but it happens quite rarely,
-  // so we don't waste our time checking for it
-  // if ( nSrcLen > 0 )
-  wxStringData *pData = GetStringData();
-  size_t nLen = pData->nDataLength;
-  size_t nNewLen = nLen + nSrcLen;
+  // concatenating an empty string is a NOP
+  if ( nSrcLen > 0 ) {
+    wxStringData *pData = GetStringData();
+    size_t nLen = pData->nDataLength;
+    size_t nNewLen = nLen + nSrcLen;

 
 

-  // alloc new buffer if current is too small
-  if ( pData->IsShared() ) {
-    STATISTICS_ADD(ConcatHit, 0);
+    // alloc new buffer if current is too small
+    if ( pData->IsShared() ) {
+      STATISTICS_ADD(ConcatHit, 0);

 
 

-    // we have to allocate another buffer
-    wxStringData* pOldData = GetStringData();
-    AllocBuffer(nNewLen);
-    memcpy(m_pchData, pOldData->data(), nLen*sizeof(char));
-    pOldData->Unlock();
-  }
-  else if ( nNewLen > pData->nAllocLength ) {
-    STATISTICS_ADD(ConcatHit, 0);
+      // we have to allocate another buffer
+      wxStringData* pOldData = GetStringData();
+      AllocBuffer(nNewLen);
+      memcpy(m_pchData, pOldData->data(), nLen*sizeof(char));
+      pOldData->Unlock();
+    }
+    else if ( nNewLen > pData->nAllocLength ) {
+      STATISTICS_ADD(ConcatHit, 0);

 
 

-    // we have to grow the buffer
-    Alloc(nNewLen);
-  }
-  else {
-    STATISTICS_ADD(ConcatHit, 1);
+      // we have to grow the buffer
+      Alloc(nNewLen);
+    }
+    else {
+      STATISTICS_ADD(ConcatHit, 1);

 
 

-    // the buffer is already big enough
-  }
+      // the buffer is already big enough
+    }

 
 

-  // should be enough space
-  wxASSERT( nNewLen <= GetStringData()->nAllocLength );
+    // should be enough space
+    wxASSERT( nNewLen <= GetStringData()->nAllocLength );

 
 

-  // fast concatenation - all is done in our buffer
-  memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char));
+    // fast concatenation - all is done in our buffer
+    memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(char));

 
 

-  m_pchData[nNewLen] = '\0';              // put terminating '\0'
-  GetStringData()->nDataLength = nNewLen; // and fix the length
+    m_pchData[nNewLen] = '\0';              // put terminating '\0'
+    GetStringData()->nDataLength = nNewLen; // and fix the length
+  }
+  //else: the string to append was empty

 }
 
 /*
 }
 
 /*


@@ -563,20 +622,32 @@ void wxString::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
 }
 
 // extract string of length nCount starting at nFirst
 }
 
 // extract string of length nCount starting at nFirst

-// default value of nCount is 0 and means "till the end"

 wxString wxString::Mid(size_t nFirst, size_t nCount) const
 {
 wxString wxString::Mid(size_t nFirst, size_t nCount) const
 {

+  wxStringData *pData = GetStringData();
+  size_t nLen = pData->nDataLength;
+
+  // default value of nCount is wxSTRING_MAXLEN and means "till the end"
+  if ( nCount == wxSTRING_MAXLEN )
+  {
+    nCount = nLen - nFirst;
+  }
+

   // out-of-bounds requests return sensible things
   // out-of-bounds requests return sensible things

-  if ( nCount == 0 )
-    nCount = GetStringData()->nDataLength - nFirst;
+  if ( nFirst + nCount > nLen )
+  {
+    nCount = nLen - nFirst;
+  }

 
 

-  if ( nFirst + nCount > (size_t)GetStringData()->nDataLength )
-    nCount = GetStringData()->nDataLength - nFirst;
-  if ( nFirst > (size_t)GetStringData()->nDataLength )
+  if ( nFirst > nLen )
+  {
+    // AllocCopy() will return empty string

     nCount = 0;
     nCount = 0;

+  }

 
   wxString dest;
   AllocCopy(dest, nCount, nFirst);
 
   wxString dest;
   AllocCopy(dest, nCount, nFirst);

+

   return dest;
 }
 
   return dest;
 }
 


@@ -593,11 +664,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(char 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;


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

-wxString wxString::Left(char ch) const
+wxString wxString::BeforeFirst(char ch) const

 {
   wxString str;
   for ( const char *pc = m_pchData; *pc != '\0' && *pc != ch; pc++ )
 {
   wxString str;
   for ( const char *pc = m_pchData; *pc != '\0' && *pc != ch; pc++ )


@@ -629,11 +700,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(char 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;


@@ -641,11 +712,11 @@ 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(char 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;
     str = c_str() + iPos + 1;
 
   return str;


@@ -762,30 +833,40 @@ wxString& wxString::MakeLower()
 // trims spaces (in the sense of isspace) from left or right side
 wxString& wxString::Trim(bool bFromRight)
 {
 // trims spaces (in the sense of isspace) from left or right side
 wxString& wxString::Trim(bool bFromRight)
 {

-  CopyBeforeWrite();
-
-  if ( bFromRight )
-  {
-    // find last non-space character
-    char *psz = m_pchData + GetStringData()->nDataLength - 1;
-    while ( isspace(*psz) && (psz >= m_pchData) )
-      psz--;
-
-    // truncate at trailing space start
-    *++psz = '\0';
-    GetStringData()->nDataLength = psz - m_pchData;
-  }
-  else
+  // first check if we're going to modify the string at all
+  if ( !IsEmpty() && 
+       ( 
+        (bFromRight && isspace(GetChar(Len() - 1))) ||
+        (!bFromRight && isspace(GetChar(0u)))
+       )
+     )

   {
   {

-    // find first non-space character
-    const char *psz = m_pchData;
-    while ( isspace(*psz) )
-      psz++;
-
-    // fix up data and length
-    int nDataLength = GetStringData()->nDataLength - (psz - m_pchData);
-    memmove(m_pchData, psz, (nDataLength + 1)*sizeof(char));
-    GetStringData()->nDataLength = nDataLength;
+    // ok, there is at least one space to trim
+    CopyBeforeWrite();
+
+    if ( bFromRight )
+    {
+      // find last non-space character
+      char *psz = m_pchData + GetStringData()->nDataLength - 1;
+      while ( isspace(*psz) && (psz >= m_pchData) )
+        psz--;
+
+      // truncate at trailing space start
+      *++psz = '\0';
+      GetStringData()->nDataLength = psz - m_pchData;
+    }
+    else
+    {
+      // find first non-space character
+      const char *psz = m_pchData;
+      while ( isspace(*psz) )
+        psz++;
+
+      // fix up data and length
+      int nDataLength = GetStringData()->nDataLength - (psz - (const char*) m_pchData);
+      memmove(m_pchData, psz, (nDataLength + 1)*sizeof(char));
+      GetStringData()->nDataLength = nDataLength;
+    }

   }
 
   return *this;
   }
 
   return *this;


@@ -810,14 +891,19 @@ 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) = '\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


@@ -825,7 +911,7 @@ int wxString::Find(char ch, bool bFromEnd) const
 {
   const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch);
 
 {
   const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch);
 

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

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


@@ -833,7 +919,34 @@ int wxString::Find(const char *pszSub) const
 {
   const char *psz = strstr(m_pchData, pszSub);
 
 {
   const char *psz = strstr(m_pchData, pszSub);
 

-  return (psz == NULL) ? NOT_FOUND : psz - m_pchData;
+  return (psz == NULL) ? wxNOT_FOUND : psz - (const char*) m_pchData;
+}
+
+// ---------------------------------------------------------------------------
+// stream-like operators
+// ---------------------------------------------------------------------------
+wxString& wxString::operator<<(int i)
+{
+    wxString res;
+    res.Printf("%d", i);
+
+    return (*this) << res;
+}
+
+wxString& wxString::operator<<(float f)
+{
+    wxString res;
+    res.Printf("%f", f);
+
+    return (*this) << res;
+}
+
+wxString& wxString::operator<<(double d)
+{
+    wxString res;
+    res.Printf("%g", d);
+
+    return (*this) << res;

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


@@ -853,11 +966,41 @@ int wxString::Printf(const char *pszFormat, ...)
 
 int wxString::PrintfV(const char* pszFormat, va_list argptr)
 {
 
 int wxString::PrintfV(const char* pszFormat, va_list argptr)
 {

+  // static buffer to avoid dynamic memory allocation each time

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

-  int iLen = vsprintf(s_szScratch, pszFormat, argptr);
+  // NB: wxVsprintf() may return either less than the buffer size or -1 if there
+  //     is not enough place depending on implementation
+  int iLen = wxVsprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr);
+  char *buffer;
+  if ( iLen < (int)WXSIZEOF(s_szScratch) ) {
+    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);
+          if ( iLen < size ) {
+              // ok, there was enough space
+              break;
+          }
+
+          // still not enough, double it again
+          buffer = (char *)realloc(buffer, size *= 2);
+      }
+
+      if ( !buffer ) {
+          // out of memory
+          return -1;
+      }
+  }
+

   AllocBeforeWrite(iLen);
   AllocBeforeWrite(iLen);

-  strcpy(m_pchData, s_szScratch);
+  strcpy(m_pchData, buffer);
+
+  if ( buffer != s_szScratch )
+      free(buffer);

 
   return iLen;
 }
 
   return iLen;
 }


@@ -924,10 +1067,39 @@ bool wxString::Matches(const char *pszMask) const
   return *pszTxt == '\0';
 }
 
   return *pszTxt == '\0';
 }
 

+// Count the number of chars
+int wxString::Freq(char 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 char *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)
 {


@@ -958,13 +1130,15 @@ size_t wxString::find(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__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

 size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 {
   return find(wxString(sz, n == npos ? 0 : n), nStart);
 }
 size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 {
   return find(wxString(sz, n == npos ? 0 : n), nStart);
 }

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

 
 

+// Gives a duplicate symbol (presumably a case-insensitivity problem)
+#if !defined(__BORLANDC__)

 size_t wxString::find(char ch, size_t nStart) const
 {
   wxASSERT( nStart <= Len() );
 size_t wxString::find(char ch, size_t nStart) const
 {
   wxASSERT( nStart <= Len() );


@@ -973,6 +1147,7 @@ size_t wxString::find(char ch, size_t nStart) const
 
   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
 {


@@ -991,7 +1166,7 @@ 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__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

 size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const
 {
   return rfind(wxString(sz, n == npos ? 0 : n), nStart);
 size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const
 {
   return rfind(wxString(sz, n == npos ? 0 : n), nStart);


@@ -1005,7 +1180,7 @@ size_t wxString::rfind(char ch, size_t nStart) const
 
   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
 {


@@ -1218,7 +1393,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


@@ -1269,16 +1444,85 @@ void wxArrayString::Remove(const char *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
+  #include <wx/thread.h>
+
+  // need a critical section to protect access to gs_compareFunction and
+  // gs_sortAscending variables
+  static wxCriticalSection gs_critsectStringSort;
+
+  // call this before the value of the global sort vars is changed/after
+  // you're finished with them
+  #define START_SORT()     gs_critsectStringSort.Enter()
+  #define END_SORT()       gs_critsectStringSort.Leave()
+#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 {
+    int result = strcmp(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 reverseOrder)
+{
+  START_SORT();
+
+  wxASSERT( !gs_compareFunction );  // must have been reset to NULL
+  gs_sortAscending = !reverseOrder;
+
+  DoSort();
+
+  END_SORT();
+}

 
 

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

 {
 {

-  //@@@@ TO DO
-  //qsort(m_pItems, m_nCount, sizeof(char *), fCmp);
+  // 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(char *), wxStringCompareFunction);

 }
 }