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

Add wxMBConv parameter to wxString::ToStdString

Browse Source 
See #17461.
This commit is contained in:
ARATA Mizuki
2016-03-25 16:22:52 +09:00
parent 81e6638585
commit 70ddab243e
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/string.h
View File

@@ -1241,12 +1241,17 @@ public:
// wxStringImpl is std::string in the encoding we want
#define wxStringToStdStringRetType const std::string&
const std::string& ToStdString() const { return m_impl; }
std::string ToStdString(const wxMBConv& conv) const
{
wxScopedCharBuffer buf(mb_str(conv));
return std::string(buf.data(), buf.length());
}
#else
// wxStringImpl is either not std::string or needs conversion
#define wxStringToStdStringRetType std::string
std::string ToStdString() const
std::string ToStdString(const wxMBConv& conv = wxConvLibc) const
{
wxScopedCharBuffer buf(mb_str());
wxScopedCharBuffer buf(mb_str(conv));
return std::string(buf.data(), buf.length());
}
#endif