From 7d46f92bb09316fcdb11ce3801d33d6f1409bdbd Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 22 Aug 2007 11:30:10 +0000
Subject: [PATCH] compilation fix for UTF8+STL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/string.h | 6 +++---
src/common/string.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/wx/string.h b/include/wx/string.h
index 1de67ef9c5..436a6831f4 100644
--- 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
-#if wxUSE_UNICODE_UTF8 && !wxUSE_STL_BASED_WXSTRING
+#if wxUSE_UNICODE_UTF8
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:
@@ -2888,7 +2888,7 @@ public:
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 852ea132ec..76bd308623 100644
--- 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
// ----------------------------------------------------------------------------
-#if wxUSE_UNICODE && (!wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING)
+#if wxUSE_UNICODE_WCHAR
wxUTF8StringBuffer::~wxUTF8StringBuffer()
{
wxMBConvStrictUTF8 conv;
@@ -1860,4 +1860,4 @@ wxUTF8StringBufferLength::~wxUTF8StringBufferLength()
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
--
2.47.2