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

fixed FromUTF8 in ANSI builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-05 19:19:48 +00:00
parent 93344f258a
commit 06c73b9852
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/string.h
View File

@@ -1154,7 +1154,11 @@ public:
static wxString FromUTF8(const char *utf8) static wxString FromUTF8(const char *utf8)
{ return wxString(wxConvUTF8.cMB2WC(utf8)); } { return wxString(wxConvUTF8.cMB2WC(utf8)); }
static wxString FromUTF8(const char *utf8, size_t len) static wxString FromUTF8(const char *utf8, size_t len)
{ return wxString(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len)); } {
size_t wlen;
wxWCharBuffer buf(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen));
return wxString(buf.data(), wlen);
}
const wxCharBuffer utf8_str() const { return wxConvUTF8.cWC2MB(wc_str()); } const wxCharBuffer utf8_str() const { return wxConvUTF8.cWC2MB(wc_str()); }
const wxCharBuffer ToUTF8() const { return utf8_str(); } const wxCharBuffer ToUTF8() const { return utf8_str(); }
#endif #endif