fixed wxXmlResource::GetText() in ANSI build to correctly convert the string to current locale's charset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -967,7 +967,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
|
|||||||
#else
|
#else
|
||||||
// The string is internally stored as UTF-8, we have to convert
|
// The string is internally stored as UTF-8, we have to convert
|
||||||
// it into system's default encoding so that it can be displayed:
|
// 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
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user