no changes, just updated the URL of KB article in a comment

[wxWidgets.git] / include / wx / string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index f08d162cadd4e3fc146e7042b09047c6d2d4cc92..aef07e6885a494d3e6ab6096250aec92dcdae3e3 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -78,14 +78,6 @@ class WXDLLIMPEXP_FWD_BASE wxString;
 #define   wxMBSTRINGCAST (char *)(const char *)
 #define   wxWCSTRINGCAST (wchar_t *)(const wchar_t *)
 
-// like _T(), but for literals in wxString's internal representation, i.e.
-// char* in UTF-8 build and wxChar* otherwise:
-#if wxUSE_UNICODE_UTF8
-    #define wxSTRING_TEXT(str) str
-#else
-    #define wxSTRING_TEXT(str) _T(str)
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -133,8 +125,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
   return _stricmp(psz1, psz2);
 #elif defined(__SC__)
   return _stricmp(psz1, psz2);
-#elif defined(__SALFORDC__)
-  return stricmp(psz1, psz2);
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
 #elif defined(__WATCOMC__)
@@ -934,7 +924,7 @@ public:
   wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { }
 
     // string containing nRepeat copies of ch
-  wxString(wxUniChar ch, size_t nRepeat = 1)
+  wxString(wxUniChar ch, size_t nRepeat = 1 )
     { assign(nRepeat, ch); }
   wxString(size_t nRepeat, wxUniChar ch)
     { assign(nRepeat, ch); }
@@ -1372,11 +1362,7 @@ public:
 #if wxUSE_WCHAR_T
     const wxWCharBuffer wc_str(const wxMBConv& conv = wxConvLibc) const;
 #endif // wxUSE_WCHAR_T
-#ifdef __WXOSX__
-    const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLocal ) ); }
-#else
-    const wxChar* fn_str() const { return c_str(); }
-#endif
+    const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLibc ) ); }
 #endif // Unicode/ANSI
 
   // overloaded assignment
@@ -1876,7 +1862,7 @@ public:
   wxString& append(const wxString& str, size_t pos, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(pos, n, &from, &len);
+    str.PosLenToImpl(pos, n, &from, &len);
     m_impl.append(str.m_impl, from, len);
     return *this;
   }
@@ -1943,7 +1929,7 @@ public:
   wxString& assign(const wxString& str, size_t pos, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(pos, n, &from, &len);
+    str.PosLenToImpl(pos, n, &from, &len);
     m_impl.assign(str.m_impl, from, len);
     return *this;
   }
@@ -2039,7 +2025,7 @@ public:
   wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n)
   {
     size_t from, len;
-    PosLenToImpl(nStart, n, &from, &len);
+    str.PosLenToImpl(nStart, n, &from, &len);
     m_impl.insert(PosToImpl(nPos), str.m_impl, from, len);
     return *this;
   }
@@ -2169,7 +2155,7 @@ public:
     PosLenToImpl(nStart, nLen, &from, &len);
 
     size_t from2, len2;
-    PosLenToImpl(nStart2, nLen2, &from2, &len2);
+    str.PosLenToImpl(nStart2, nLen2, &from2, &len2);
 
     m_impl.replace(from, len, str.m_impl, from2, len2);
     return *this;
@@ -2591,12 +2577,6 @@ private:
 private:
   wxStringImpl m_impl;
 
-#ifdef __VISUALC__
-    // "struct 'ConvertedBuffer<T>' needs to have dll-interface to be used by
-    // clients of class 'wxString'" - this is private, we don't care
-    #pragma warning (disable:4251)
-#endif
-
   // buffers for compatibility conversion from (char*)c_str() and
   // (wchar_t*)c_str():
   // FIXME-UTF8: bechmark various approaches to keeping compatibility buffers
@@ -2625,10 +2605,6 @@ private:
   ConvertedBuffer<wchar_t> m_convertedToWChar;
 #endif
 
-#ifdef __VISUALC__
-    #pragma warning (default:4251)
-#endif
-
 #if wxUSE_UNICODE_UTF8
   // FIXME-UTF8: (try to) move this elsewhere (TLS) or solve differently
   //             assigning to character pointer to by wxString::interator may