Merge branch 'log-encoding'

See https://github.com/wxWidgets/wxWidgets/pull/552 Closes #17385.
2017-11-04 18:15:59 +01:00
parent 7872e8f7ef a7dddd9f3b
commit 56323b5aba
6 changed files with 120 additions and 28 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -91,6 +91,7 @@ All:
  wxLog::SetVerbose() which now only affects wxLogVerbose().
 - Add wxFileType::GetExpandedCommand() (troelsk).
 - Make it easier to convert to/from UTF-8-encoded std::string (ARATA Mizuki).
+- Support custom conversions in wxLogStream and wxLogStderr (Catalin Raceanu).
 - Add support for loading dynamic lexer in wxStyledTextCtrl (New Pagodi).
 - Handle strings with embedded NULs in wxDataStream (Nitch).
 - Don't crash in wxTextFile::GetLastLine() if the file is empty (crohr).