Added size event for status bar

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 15976eb5e148c872ec53e27c52ee6158825f1518..5329f085e2a062bfa271e9282dac0a1278fa45a8 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -41,7 +41,11 @@
 #include <string.h>
 #include <stdlib.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 +62,9 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
 // static class variables definition
 // ---------------------------------------------------------------------------
 

-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY

   const size_t wxString::npos = STRING_MAXLEN;
   const size_t wxString::npos = STRING_MAXLEN;

-#endif
+#endif // wxSTD_STRING_COMPATIBILITY

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


@@ -76,13 +80,40 @@ 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 _MSC_VER
+        #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)
+#ifndef __SC__
+    #pragma message("Using sprintf() because no snprintf()-like function defined")
+#endif
+#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.
 
 // MS Visual C++ version 5.0 provides the new STL headers as well as the old
 // iostream ones.


@@ -102,22 +133,19 @@ extern const char *g_szNul = &g_strEmpty.dummy;
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-  #ifdef _MSC_VER
-    #define wxVsprintf     _vsnprintf
-  #endif
+    #ifdef _MSC_VER
+        #define wxVsprintf     _vsnprintf
+    #endif

 #else
 #else

-   #if defined ( HAVE_VSNPRINTF )
-     #define wxVsprintf       vsnprintf
-   #endif
+    #if defined ( HAVE_VSNPRINTF )
+        #define wxVsprintf       vsnprintf
+    #endif

 #endif
 
 #ifndef wxVsprintf
 #endif
 
 #ifndef wxVsprintf

-  #ifdef HAVE_VPRINTF
+    // vsprintf() is ANSI so we can always use it, but it's unsafe!

     #define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
     #pragma message("Using sprintf() because no snprintf()-like function defined")
     #define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
     #pragma message("Using sprintf() because no snprintf()-like function defined")

-  #else
-    #pragma error("No vsnprintf() or vsprintf() function available.")
-  #endif

 #endif
 
 NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
 #endif
 
 NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))


@@ -229,7 +257,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)


@@ -247,7 +275,7 @@ wxString::wxString(const wchar_t *pwz)
 
   // NB: GNU libc5 wcstombs() is completely broken, don't use it (it doesn't
   //     honor the 3rd parameter, thus it will happily crash here).
 
   // 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
+#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;  
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick
   mbstate_t mbstate;  


@@ -317,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
 }


@@ -644,11 +676,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;


@@ -669,7 +701,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++ )


@@ -680,11 +712,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;


@@ -692,11 +724,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;


@@ -843,7 +875,7 @@ wxString& wxString::Trim(bool bFromRight)
         psz++;
 
       // fix up data and length
         psz++;
 
       // fix up data and length

-      int nDataLength = GetStringData()->nDataLength - (psz - m_pchData);
+      int nDataLength = GetStringData()->nDataLength - (psz - (const char*) m_pchData);

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


@@ -871,14 +903,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


@@ -886,7 +923,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)


@@ -894,7 +931,7 @@ 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;

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


@@ -941,22 +978,14 @@ int wxString::Printf(const char *pszFormat, ...)
 
 int wxString::PrintfV(const char* pszFormat, va_list argptr)
 {
 
 int wxString::PrintfV(const char* pszFormat, va_list argptr)
 {

-#if defined(__BORLANDC__) || defined(__GNUWIN32__)
-  static char s_szScratch[1024];
-
-  int iLen = vsprintf(s_szScratch, pszFormat, argptr);
-  AllocBeforeWrite(iLen);
-  strcpy(m_pchData, s_szScratch);
-
-  return iLen;
-#else
-

   // static buffer to avoid dynamic memory allocation each time
   static char s_szScratch[1024];
 
   // static buffer to avoid dynamic memory allocation each time
   static char s_szScratch[1024];
 

+  // 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;
   int iLen = wxVsprintf(s_szScratch, WXSIZEOF(s_szScratch), pszFormat, argptr);
   char *buffer;

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

     buffer = s_szScratch;
   }
   else {
     buffer = s_szScratch;
   }
   else {


@@ -986,7 +1015,6 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
       free(buffer);
 
   return iLen;
       free(buffer);
 
   return iLen;

-#endif

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


@@ -1051,10 +1079,23 @@ 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;
+}
+

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


@@ -1092,6 +1133,8 @@ size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 }
 #endif
 
 }
 #endif
 

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


@@ -1100,6 +1143,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
 {


@@ -1345,7 +1389,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


@@ -1396,7 +1440,7 @@ 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);