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

Merge branch 'utf8-std-string'

Browse Source 
Add wxString::utf8_string().

See https://github.com/wxWidgets/wxWidgets/pull/2265
This commit is contained in:
Vadim Zeitlin
2021-03-14 13:05:41 +01:00
parent 57bba0b990 0f8e976ac3
commit 16495e424d
3 changed files with 246 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/string.h
View File

@@ -1715,6 +1715,8 @@ public:
return wxString();
return FromImpl(utf8);
}
std::string utf8_string() const { return m_impl; }
#endif
const wxScopedCharBuffer utf8_str() const
@@ -1738,6 +1740,8 @@ public:
{ return FromUTF8(utf8.c_str(), utf8.length()); }
static wxString FromUTF8Unchecked(const std::string& utf8)
{ return FromUTF8Unchecked(utf8.c_str(), utf8.length()); }
std::string utf8_string() const { return ToStdString(wxMBConvUTF8()); }
#endif
const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }
#else // ANSI
@@ -1771,6 +1775,8 @@ public:
{ return FromUTF8(utf8.c_str(), utf8.length()); }
static wxString FromUTF8Unchecked(const std::string& utf8)
{ return FromUTF8Unchecked(utf8.c_str(), utf8.length()); }
std::string utf8_string() const { return ToStdString(wxMBConvUTF8()); }
#endif
const wxScopedCharBuffer utf8_str() const
{