Use wxStringBuffer[Length] instead of explicit calls to

wxString::get/UngetWriteBuffer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-21 09:41:26 +00:00
parent 11d395f9d7
commit de564874d6
14 changed files with 60 additions and 77 deletions

View File

@@ -110,15 +110,13 @@ wxString wxDataInputStream::ReadString()
if (len > 0)
{
#if wxUSE_UNICODE
char *tmp = new char[len + 1];
m_input->Read(tmp, len);
tmp[len] = 0;
wxString ret( (const wxChar*) m_conv.cMB2WX(tmp) );
delete[] tmp;
wxCharBuffer tmp(len + 1);
m_input->Read(tmp.data(), len);
tmp.data()[len] = '\0';
wxString ret(m_conv.cMB2WX(tmp.data()));
#else
wxString ret;
m_input->Read( ret.GetWriteBuf(len), len);
ret.UngetWriteBuf();
m_input->Read( wxStringBuffer(ret, len), len);
#endif
return ret;
}