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

fixed ReadString for wxUSE_UNICODE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-19 23:01:57 +00:00
parent 8211bdcc03
commit 2ae47e3f2b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/datstrm.cpp
View File

@@ -86,13 +86,21 @@ double wxDataInputStream::ReadDouble()
wxString wxDataInputStream::ReadString() wxString wxDataInputStream::ReadString()
{ {
wxString s;
size_t len; size_t len;
len = Read32(); len = Read32();
#if wxUSE_UNICODE
char *tmp = new char[len + 1];
m_input->Read(tmp, len);
tmp[len] = 0;
wxString s(tmp);
delete[] tmp;
#else
wxString s;
m_input->Read(s.GetWriteBuf(len), len); m_input->Read(s.GetWriteBuf(len), len);
s.UngetWriteBuf(); s.UngetWriteBuf();
#endif
return s; return s;
} }