diff --git a/docs/changes.txt b/docs/changes.txt index 39c07a8333..f999254fb7 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -110,6 +110,8 @@ All (GUI): - Improve wximage::ResampleBox() (Mihai Ciocarlie). - Implemented ScrollList() in generic wxListCtrl (Tim Kosse). - SaveAs in docview takes into account path now. +- Fixed wxXmlResource::GetText() to convert data to current locale's + charset in ANSI build. All (Unix): diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 96242df826..a8e71bfeeb 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -942,7 +942,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate) #else // The string is internally stored as UTF-8, we have to convert // it into system's default encoding so that it can be displayed: - return wxString(str2.mb_str(wxConvUTF8), wxConvLocal); + return wxString(str2.wc_str(wxConvUTF8), wxConvLocal); #endif } }