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

Fix wxString::ToStdString(wxMBConv) to compile in ANSI build

Browse Source 
70ddab243e broke compilation without Unicode as
mb_str() doesn't return a buffer in this case.

See #17461.
This commit is contained in:
Vadim Zeitlin
2016-04-24 18:12:31 +02:00
parent 5266f4785c
commit 875a40be13
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -1241,10 +1241,12 @@ public:
// wxStringImpl is std::string in the encoding we want // wxStringImpl is std::string in the encoding we want
#define wxStringToStdStringRetType const std::string& #define wxStringToStdStringRetType const std::string&
const std::string& ToStdString() const { return m_impl; } const std::string& ToStdString() const { return m_impl; }
std::string ToStdString(const wxMBConv& conv) const std::string ToStdString(const wxMBConv& WXUNUSED(conv)) const
{ {
wxScopedCharBuffer buf(mb_str(conv)); // No conversions are done when not using Unicode as everything is
return std::string(buf.data(), buf.length()); // supposed to be in 7 bit ASCII anyhow, this method is provided just
// for compatibility with the Unicode build.
return ToStdString();
} }
#else #else
// wxStringImpl is either not std::string or needs conversion // wxStringImpl is either not std::string or needs conversion