Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/datstrm.cpp
View File

@@ -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;