#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_STREAMS
#include "wx/datstrm.h"
-wxDataStream::wxDataStream(istream& s)
-{
- m_istream = &s;
- m_ostream = NULL;
-}
-
-wxDataStream::wxDataStream(ostream& s)
-{
- m_istream = NULL;
- m_ostream = &s;
-}
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
-wxDataStream::wxDataStream(iostream& s)
+wxDataInputStream::wxDataInputStream(wxInputStream& s)
+ : m_input(&s)
{
- m_istream = &s;
- m_ostream = &s;
}
-wxDataStream::~wxDataStream()
+wxDataInputStream::~wxDataInputStream()
{
}
-unsigned long wxDataStream::Read32()
+wxUint32 wxDataInputStream::Read32()
{
char buf[4];
- if (!m_istream)
- return 0;
+ m_input->Read(buf, 4);
- m_istream->read(buf, 4);
-
- return (unsigned long)buf[0] |
- ((unsigned long)buf[1] << 8) |
- ((unsigned long)buf[2] << 16) |
- ((unsigned long)buf[3] << 24);
+ return (wxUint32)buf[0] |
+ ((wxUint32)buf[1] << 8) |
+ ((wxUint32)buf[2] << 16) |
+ ((wxUint32)buf[3] << 24);
}
-unsigned short wxDataStream::Read16()
+wxUint16 wxDataInputStream::Read16()
{
char buf[2];
- if (!m_istream)
- return 0;
-
- m_istream->read(buf, 2);
+ m_input->Read(buf, 2);
- return (unsigned short)buf[0] |
- ((unsigned short)buf[1] << 8);
+ return (wxUint16)buf[0] |
+ ((wxUint16)buf[1] << 8);
}
-unsigned char wxDataStream::Read8()
+wxUint8 wxDataInputStream::Read8()
{
- char buf;
-
- if (!m_istream)
- return 0;
+ wxUint8 buf;
- m_istream->read(&buf, 1);
- return (unsigned char)buf;
+ m_input->Read((char *)&buf, 1);
+ return (wxUint8)buf;
}
// Must be at global scope for VC++ 5
extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
-double wxDataStream::ReadDouble()
+double wxDataInputStream::ReadDouble()
{
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE
char buf[10];
- if (!m_istream)
- return 0.0;
-
- m_istream->read(buf, 10);
+ m_input->Read(buf, 10);
return ConvertFromIeeeExtended((unsigned char *)buf);
#else
return 0.0;
#endif
}
-wxString wxDataStream::ReadLine()
-{
- char i_strg[255];
-
- if (!m_istream)
- return "";
-
- m_istream->getline(i_strg, 255);
- return i_strg;
-}
-
-wxString wxDataStream::ReadString()
+wxString wxDataInputStream::ReadString()
{
wxString wx_string;
char *string;
unsigned long len;
- if (!m_istream)
- return "";
-
len = Read32();
string = new char[len+1];
- m_istream->read(string, len);
+ m_input->Read(string, len);
string[len] = 0;
wx_string = string;
delete string;
- return wx_string;
+ return wx_string;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
+{
+ s = ReadString();
+ return *this;
}
-void wxDataStream::Write32(unsigned long i)
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
{
- char buf[4];
+ c = (wxInt8)Read8();
+ return *this;
+}
- if (!m_ostream)
- return;
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
+{
+ i = (wxInt16)Read16();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+ i = (wxInt32)Read32();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
+{
+ c = Read8();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+ i = Read16();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+ i = Read32();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+ i = ReadDouble();
+ return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(float& f)
+{
+ f = (float)ReadDouble();
+ return *this;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+ : m_output(&s)
+{
+}
+
+wxDataOutputStream::~wxDataOutputStream()
+{
+}
+
+void wxDataOutputStream::Write32(wxUint32 i)
+{
+ char buf[4];
buf[0] = i & 0xff;
buf[1] = (i >> 8) & 0xff;
buf[2] = (i >> 16) & 0xff;
buf[3] = (i >> 24) & 0xff;
- m_ostream->write(buf, 4);
+ m_output->Write(buf, 4);
}
-void wxDataStream::Write16(unsigned short i)
+void wxDataOutputStream::Write16(wxUint16 i)
{
char buf[2];
- if (!m_ostream)
- return;
-
buf[0] = i & 0xff;
buf[1] = (i >> 8) & 0xff;
- m_ostream->write(buf, 2);
+ m_output->Write(buf, 2);
}
-void wxDataStream::Write8(unsigned char i)
+void wxDataOutputStream::Write8(wxUint8 i)
{
- if (!m_ostream)
- return;
+ m_output->Write(&i, 1);
+}
- m_ostream->write(&i, 1);
+void wxDataOutputStream::WriteString(const wxString& string)
+{
+ const wxWX2MBbuf buf = string.mb_str();
+ Write32(string.Length());
+ m_output->Write(buf, string.Len());
}
-void wxDataStream::WriteLine(const wxString& line)
+// Must be at global scope for VC++ 5
+extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
+
+void wxDataOutputStream::WriteDouble(double d)
{
-#ifdef __WINDOWS__
- wxString tmp_string = line + "\r\n";
+ char buf[10];
+
+#if wxUSE_APPLE_IEEE
+ ConvertToIeeeExtended(d, (unsigned char *)buf);
#else
- wxString tmp_string = line + '\n';
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+ buf[0] = '\0';
#endif
+ m_output->Write(buf, 10);
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+{
+ Write32(wxStrlen(string));
+ m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
+ return *this;
+}
- if (!m_ostream)
- return;
+wxDataOutputStream& wxDataOutputStream::operator<<(wxString& string)
+{
+ WriteString(string);
+ return *this;
+}
- m_ostream->write((const char *) tmp_string, tmp_string.Length());
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
+{
+ Write8((wxUint8)c);
+ return *this;
}
-void wxDataStream::WriteString(const wxString& string)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
{
- if (!m_ostream)
- return;
+ Write16((wxUint16)i);
+ return *this;
+}
- Write32(string.Length());
- m_ostream->write((const char *) string, string.Length());
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
+{
+ Write32((wxUint32)i);
+ return *this;
}
-// Must be at global scope for VC++ 5
-extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
+{
+ Write8(c);
+ return *this;
+}
-void wxDataStream::WriteDouble(double d)
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
{
- char buf[10];
+ Write16(i);
+ return *this;
+}
- if (!m_ostream)
- return;
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
+{
+ Write32(i);
+ return *this;
+}
- ConvertToIeeeExtended(d, (unsigned char *)buf);
- m_ostream->write(buf, 10);
+wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+{
+ WriteDouble(f);
+ return *this;
}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(float f)
+{
+ WriteDouble((double)f);
+ return *this;
+}
+
+#endif
+ // wxUSE_STREAMS
+
projects / wxWidgets.git / blobdiff