AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wxString::utf8_str() in UTF8 build to return buffer with length

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2009-04-12 10:12:44 +00:00
parent bdaddbec6e
commit ed5e656088
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@ -1711,9 +1711,7 @@ public:
}
const wxScopedCharBuffer utf8_str() const
{ return wxCharBuffer::CreateNonOwned(wx_str()); }
const wxScopedCharBuffer ToUTF8() const
{ return wxCharBuffer::CreateNonOwned(wx_str()); }
{ return wxCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length()); }
// this function exists in UTF-8 build only and returns the length of the
// internal UTF-8 representation
@ -1729,7 +1727,6 @@ public:
return s;
}
const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }
const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }
#else // ANSI
static wxString FromUTF8(const char *utf8)
{ return wxString(wxMBConvUTF8().cMB2WC(utf8)); }
@ -1758,9 +1755,10 @@ public:
}
const wxScopedCharBuffer utf8_str() const
{ return wxMBConvUTF8().cWC2MB(wc_str()); }
const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }
#endif
const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }
// functions for storing binary data in wxString:
#if wxUSE_UNICODE
static wxString From8BitData(const char *data, size_t len)