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

Merge miscellaneous string-related fixes

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/237
This commit is contained in:
Vadim Zeitlin
2016-03-02 23:17:23 +01:00
parent c07523734f a17a3994ec
commit b0a6ed4262
7 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/ustring.h
View File

@@ -134,9 +134,9 @@ public:
return utf16_str();
}
#else
wchar_t *wc_str() const
const wchar_t *wc_str() const
{
return (wchar_t*) c_str();
return c_str();
}
#endif
@@ -154,18 +154,18 @@ public:
}
#if wxUSE_UNICODE_UTF8
wxScopedCharBuffer wx_str()
wxScopedCharBuffer wx_str() const
{
return utf8_str();
}
#else
#if SIZEOF_WCHAR_T == 2
wxScopedWCharBuffer wx_str()
wxScopedWCharBuffer wx_str() const
{
return utf16_str();
}
#else
const wchar_t* wx_str()
const wchar_t* wx_str() const
{
return c_str();
}