X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a96d2f45fec76a2d0da1c0c7672b62c19280f43..5b7352027902bebecd06e2a124492fc0ee27f4e2:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index 5112d93f6b..433c90472a 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 28/06/98 // RCS-ID: $Id$ -// Copyright: (c) Guilhem Lavaux +// Copyright: (c) Guilhem Lavaux // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -86,22 +86,17 @@ double wxDataInputStream::ReadDouble() wxString wxDataInputStream::ReadString() { - wxString wx_string; - char *string; - unsigned long len; + wxString s; + size_t len; len = Read32(); - string = new char[len+1]; - m_input->Read(string, len); + m_input->Read(s.GetWriteBuf(len), len); + s.UngetWriteBuf(); - string[len] = 0; - wx_string = string; - delete string; - - return wx_string; + return s; } - + wxDataInputStream& wxDataInputStream::operator>>(wxString& s) { s = ReadString(); @@ -161,7 +156,7 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f) // --------------------------------------------------------------------------- wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) - : m_output(&s) + : m_output(&s), m_be_order(FALSE) { } @@ -214,8 +209,10 @@ void wxDataOutputStream::WriteDouble(double d) #if wxUSE_APPLE_IEEE ConvertToIeeeExtended(d, (unsigned char *)buf); #else -# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" - buf[0] = '\0'; +#ifndef __VMS__ +# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" +#endif + buf[0] = '\0'; #endif m_output->Write(buf, 10); } @@ -283,4 +280,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f) #endif // wxUSE_STREAMS - +