X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64a044d5a64dd92473b4cc666a6877db78bd37d3..cbb003b1053e30ea93a5cb956c360a4a39c35622:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 99f0f816a0..2530f0718f 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -58,10 +58,6 @@
 //According to STL _must_ be a -1 size_t
 const size_t wxString::npos = (size_t) -1;
 
-#if wxUSE_UNICODE_UTF8
-wxString::PosToImplCache wxString::ms_cache;
-#endif // wxUSE_UNICODE_UTF8
-
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
@@ -1241,8 +1237,6 @@ size_t wxString::Replace(const wxString& strOld,
     wxCHECK_MSG( !strOld.empty(), 0,
                  _T("wxString::Replace(): invalid parameter") );
 
-    wxSTRING_INVALIDATE_INDEX_CACHE();
-
     size_t uiCount = 0;   // count of replacements made
 
     // optimize the special common case: replacement of one character by
@@ -2015,3 +2009,15 @@ wxUTF8StringBufferLength::~wxUTF8StringBufferLength()
     wbuf.SetLength(wlen);
 }
 #endif // wxUSE_UNICODE_WCHAR
+
+// ----------------------------------------------------------------------------
+// wxCharBufferType<T>
+// ----------------------------------------------------------------------------
+
+template<>
+wxCharTypeBuffer<char>::Data
+wxCharTypeBuffer<char>::NullData(NULL);
+
+template<>
+wxCharTypeBuffer<wchar_t>::Data
+wxCharTypeBuffer<wchar_t>::NullData(NULL);