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

Merge branch 'utf8-stdstring-interop' of https://github.com/minoki/wxWidgets

Browse Source 
Make it easier to interoperate with the code using UTF-8-encoded std::strings.

Closes #17461.
This commit is contained in:
Vadim Zeitlin
2016-03-28 21:43:36 +02:00
parent d3cb252c96 1809ade5ad
commit 4e4286f0e2
4 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
interface/wx/string.h
View File

@@ -85,8 +85,8 @@
- String in UTF-8 encoding using wxString::utf8_str().
- String in any given encoding using mb_str() with the appropriate
wxMBConv object. This is also a potentially destructive operation.
- Standard @c std::string using wxString::ToStdString(). The contents
of the returned string use the current locale encoding, so this
- Standard @c std::string using wxString::ToStdString(). The encoding
of the returned string is specified with a wxMBConv object, so this
conversion is potentially destructive as well.
- Wide C string using wxString::wc_str().
- Standard @c std::wstring using wxString::ToStdWstring().
@@ -745,10 +745,10 @@ public:
const TYPE ToAscii(char replaceWith = '_') const;
/**
Return the string as an std::string in current locale encoding.
Return the string as an std::string using @e conv's wxMBConv::cWC2MB method.
Note that if the conversion of (Unicode) string contents to the current
locale fails, the return string will be empty. Be sure to check for
Note that if the conversion of (Unicode) string contents using @e conv
fails, the return string will be empty. Be sure to check for
this to avoid silent data loss.
Instead of using this function it's also possible to write
@@ -760,9 +760,12 @@ public:
@endcode
but using ToStdString() may make the code more clear.
@param conv
The converter to be used. This parameter is new in wxWidgets 3.1.1.
@since 2.9.1
*/
std::string ToStdString() const;
std::string ToStdString(const wxMBConv& conv = wxConvLibc) const;
/**
Return the string as an std::wstring.
@@ -1813,10 +1816,14 @@ public:
alternative to this function called FromUTF8Unchecked() which, unlike
this one, doesn't check that the input string is valid.
The overload taking @c std::string is only available starting with
wxWidgets 3.1.1.
@since 2.8.4
*/
static wxString FromUTF8(const char* s);
static wxString FromUTF8(const char* s, size_t len);
static wxString FromUTF8(const std::string& s);
//@}
//@{
@@ -1833,10 +1840,14 @@ public:
string to this function will result in creating a corrupted wxString
and all the subsequent operations on it will be undefined.
The overload taking @c std::string is only available starting with
wxWidgets 3.1.1.
@since 2.8.9
*/
static wxString FromUTF8Unchecked(const char* s);
static wxString FromUTF8Unchecked(const char* s, size_t len);
static wxString FromUTF8Unchecked(const std::string& s);
//@}
};