Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for UTF8+STL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 11:30:10 +00:00
parent 2b2883a5eb
commit 7d46f92bb0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/string.h
View File

@@ -2864,10 +2864,10 @@ typedef wxStringInternalBuffer wxStringBuffer;
typedef wxStringInternalBufferLength wxStringBufferLength; typedef wxStringInternalBufferLength wxStringBufferLength;
#endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 #endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
#if wxUSE_UNICODE_UTF8 && !wxUSE_STL_BASED_WXSTRING #if wxUSE_UNICODE_UTF8
typedef wxStringInternalBuffer wxUTF8StringBuffer; typedef wxStringInternalBuffer wxUTF8StringBuffer;
typedef wxStringInternalBufferLength wxUTF8StringBufferLength; typedef wxStringInternalBufferLength wxUTF8StringBufferLength;
#elif wxUSE_UNICODE // !wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING #elif wxUSE_UNICODE_WCHAR
class WXDLLIMPEXP_BASE wxUTF8StringBuffer : public wxStringTypeBufferBase<char> class WXDLLIMPEXP_BASE wxUTF8StringBuffer : public wxStringTypeBufferBase<char>
{ {
public: 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
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

4
src/common/string.cpp
View File

@@ -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() wxUTF8StringBuffer::~wxUTF8StringBuffer()
{ {
wxMBConvStrictUTF8 conv; wxMBConvStrictUTF8 conv;
@@ -1860,4 +1860,4 @@ wxUTF8StringBufferLength::~wxUTF8StringBufferLength()
conv.ToWChar(wbuf, wlen, m_buf, m_len); conv.ToWChar(wbuf, wlen, m_buf, m_len);
wbuf.SetLength(wlen); wbuf.SetLength(wlen);
} }
#endif // wxUSE_UNICODE && (!wxUSE_UNICODE_UTF8 || wxUSE_STL_BASED_WXSTRING) #endif // wxUSE_UNICODE_WCHAR