X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d44bf31a6f0b4a261280e57842bbd53b5e26cd5..3e418ffc1002c514f0e3e876809c33ae9ad8695b:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index a4cecc093b..b9ad7564f9 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -25,7 +25,10 @@ #endif #include "wx/datstrm.h" -#include "wx/bufstrm.h" + +// --------------------------------------------------------------------------- +// wxDataInputStream +// --------------------------------------------------------------------------- wxDataInputStream::wxDataInputStream(wxInputStream& s) : wxFilterInputStream(s) @@ -71,7 +74,7 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes); double wxDataInputStream::ReadDouble() { -#if USE_APPLE_IEEE +#if wxUSE_APPLE_IEEE char buf[10]; Read(buf, 10); @@ -124,9 +127,13 @@ wxString wxDataInputStream::ReadString() wx_string = string; delete string; - return wx_string; + return wx_string; } +// --------------------------------------------------------------------------- +// wxDataOutputStream +// --------------------------------------------------------------------------- + wxDataOutputStream::wxDataOutputStream(wxOutputStream& s) : wxFilterOutputStream(s) { @@ -185,10 +192,10 @@ void wxDataOutputStream::WriteDouble(double d) { char buf[10]; -#if USE_APPLE_IEEE +#if wxUSE_APPLE_IEEE ConvertToIeeeExtended(d, (unsigned char *)buf); #else -# pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!" +# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!" buf[0] = '\0'; #endif Write(buf, 10);