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

Add overloads of wxString::FromUTF8/FromUTF8Unchecked taking a std::string

Browse Source 
See #17461.
This commit is contained in:
ARATA Mizuki
2016-03-24 22:11:34 +09:00
parent ab891932cd
commit 81e6638585
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interface/wx/string.h
View File

@@ -1824,10 +1824,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);
//@}
//@{
@@ -1844,10 +1848,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);
//@}
};