X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a99acbb00a102458b8ad5ba4459712ba73d8b14d..77416abdc5e242946d16e1b087e1adea25f2a0d6:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 4b37033048..88cdcd4049 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -113,14 +113,14 @@ wxString wxDataInputStream::ReadString() char *tmp = new char[len + 1]; m_input->Read(tmp, len); tmp[len] = 0; - wxString s(tmp, m_conv); + wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) ); delete[] tmp; #else - wxString s; - m_input->Read(s.GetWriteBuf(len), len); - s.UngetWriteBuf(); + wxString ret; + m_input->Read( ret.GetWriteBuf(len), len); + ret.UngetWriteBuf(); #endif - return s; + return ret; } else return wxEmptyString;