X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..aa2f364e34bc8798f68a1585d089bdf11f56e648:/src/xml/xml.cpp diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp index 28b83e829b..25ffc91ea9 100644 --- a/src/xml/xml.cpp +++ b/src/xml/xml.cpp @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" + #include "wx/app.h" #endif #include "wx/wfstream.h" @@ -32,7 +33,6 @@ #include "expat.h" // from Expat // DLL options compatibility check: -#include "wx/app.h" WX_CHECK_BUILD_OPTIONS("wxXML") @@ -385,7 +385,7 @@ static wxString CharToString(wxMBConv *conv, const wxWCharBuffer wbuf( wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL)); - return wxString(wbuf, conv); + return wxString(wbuf, *conv); } else // already in UTF-8, no conversion needed {