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

Don't lose Unicode data in wxMessageOutputStderr

Browse Source 
Ensure that we do output the string contents even if we have to encode it in
UTF-8 instead of the current locale encoding -- this is still better than not
outputting anything at all.

Closes #17358.
This commit is contained in:
Vadim Zeitlin
2016-02-19 02:34:20 +01:00
parent 3bb98963fa
commit fa8a482593
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/msgout.cpp
View File

@@ -148,13 +148,8 @@ wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
void wxMessageOutputStderr::Output(const wxString& str) void wxMessageOutputStderr::Output(const wxString& str)
{ {
const wxString strWithLF = AppendLineFeedIfNeeded(str); const wxString strWithLF = AppendLineFeedIfNeeded(str);
const wxWX2MBbuf buf = strWithLF.mb_str();
if ( buf )
fprintf(m_fp, "%s", (const char*) buf);
else // print at least something
fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
fprintf(m_fp, "%s", (const char*) strWithLF.mb_str(wxConvWhateverWorks));
fflush(m_fp); fflush(m_fp);
} }