compilation fix for UTF8+STL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 1de67ef9c56f11b4e52364e7a7d0dacafe2f16ad..436a6831f4544ee00cf9a47362a0811afb060c33 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -2864,10 +2864,10 @@ typedef wxStringInternalBuffer                wxStringBuffer;
 typedef wxStringInternalBufferLength          wxStringBufferLength;
 #endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
 
 typedef wxStringInternalBufferLength          wxStringBufferLength;
 #endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
 

-#if wxUSE_UNICODE_UTF8 && !wxUSE_STL_BASED_WXSTRING
+#if wxUSE_UNICODE_UTF8

 typedef wxStringInternalBuffer                wxUTF8StringBuffer;
 typedef wxStringInternalBufferLength          wxUTF8StringBufferLength;
 typedef wxStringInternalBuffer                wxUTF8StringBuffer;
 typedef wxStringInternalBufferLength          wxUTF8StringBufferLength;

-#elif wxUSE_UNICODE // !wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING
+#elif wxUSE_UNICODE_WCHAR

 class WXDLLIMPEXP_BASE wxUTF8StringBuffer : public wxStringTypeBufferBase<char>
 {
 public:
 class WXDLLIMPEXP_BASE wxUTF8StringBuffer : public wxStringTypeBufferBase<char>
 {
 public:


@@ -2888,7 +2888,7 @@ public:
 
     DECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength)
 };
 
     DECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength)
 };

-#endif // wxUSE_UNICODE_UTF8 && !wxUSE_STL_BASED_WXSTRING or not
+#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 852ea132ecaa6f9bc030b023c1a2015a12fe6612..76bd30862326287d52018378a9bcef5762d53a89 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1837,7 +1837,7 @@ wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); }
 // wxUTF8StringBuffer
 // ----------------------------------------------------------------------------
 
 // wxUTF8StringBuffer
 // ----------------------------------------------------------------------------
 

-#if wxUSE_UNICODE && (!wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING)
+#if wxUSE_UNICODE_WCHAR

 wxUTF8StringBuffer::~wxUTF8StringBuffer()
 {
     wxMBConvStrictUTF8 conv;
 wxUTF8StringBuffer::~wxUTF8StringBuffer()
 {
     wxMBConvStrictUTF8 conv;


@@ -1860,4 +1860,4 @@ wxUTF8StringBufferLength::~wxUTF8StringBufferLength()
     conv.ToWChar(wbuf, wlen, m_buf, m_len);
     wbuf.SetLength(wlen);
 }
     conv.ToWChar(wbuf, wlen, m_buf, m_len);
     wbuf.SetLength(wlen);
 }

-#endif // wxUSE_UNICODE && (!wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING)
+#endif // wxUSE_UNICODE_WCHAR