char* -> wxString

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7e52adcda34852327d1358541c1b14485189a301..5329f085e2a062bfa271e9282dac0a1278fa45a8 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -41,6 +41,10 @@
 #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
@@ -58,9 +62,9 @@
 // static class variables definition
 // ---------------------------------------------------------------------------
 
-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY
   const size_t wxString::npos = STRING_MAXLEN;
-#endif
+#endif // wxSTD_STRING_COMPATIBILITY
 
 // ----------------------------------------------------------------------------
 // static data
@@ -76,7 +80,7 @@ static const struct
 } 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
@@ -109,7 +113,7 @@ extern const char *g_szNul = &g_strEmpty.dummy;
 // 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.
@@ -253,7 +257,7 @@ 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)
@@ -871,7 +875,7 @@ wxString& wxString::Trim(bool bFromRight)
         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;
     }
@@ -919,7 +923,7 @@ int wxString::Find(char ch, bool bFromEnd) const
 {
   const char *psz = bFromEnd ? strrchr(m_pchData, ch) : strchr(m_pchData, ch);
 
-  return (psz == NULL) ? wxNOT_FOUND : psz - m_pchData;
+  return (psz == NULL) ? wxNOT_FOUND : psz - (const char*) m_pchData;
 }
 
 // find a sub-string (like strstr)
@@ -927,7 +931,7 @@ int wxString::Find(const char *pszSub) const
 {
   const char *psz = strstr(m_pchData, pszSub);
 
-  return (psz == NULL) ? wxNOT_FOUND : psz - m_pchData;
+  return (psz == NULL) ? wxNOT_FOUND : psz - (const char*) m_pchData;
 }
 
 // ---------------------------------------------------------------------------
@@ -1091,7 +1095,7 @@ int wxString::Freq(char ch) const
 // ---------------------------------------------------------------------------
 // standard C++ library string functions
 // ---------------------------------------------------------------------------
-#ifdef  STD_STRING_COMPATIBILITY
+#ifdef  wxSTD_STRING_COMPATIBILITY
 
 wxString& wxString::insert(size_t nPos, const wxString& str)
 {