fixed 64but bug with g_strEmpty initialization

[wxWidgets.git] / src / common / datstrm.cpp

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index df9095cdffda10a97719542b56426608e603bbd6..8056bdadedc5693536d51efcb5bf5d4d23bad2a7 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -26,36 +26,24 @@
 
 #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)
+  : wxFilterInputStream(s)
 {
-  m_istream = &s;
-  m_ostream = &s;
 }
 
-wxDataStream::~wxDataStream()
+wxDataInputStream::~wxDataInputStream()
 {
 }
 
-unsigned long wxDataStream::Read32()
+unsigned long wxDataInputStream::Read32()
 {
   char buf[4];
 
-  if (!m_istream)
-    return 0;
-
-  m_istream->read(buf, 4);
+  Read(buf, 4);
 
   return (unsigned long)buf[0] |
          ((unsigned long)buf[1] << 8) |
@@ -63,115 +51,124 @@ unsigned long wxDataStream::Read32()
          ((unsigned long)buf[3] << 24);
 }
 
-unsigned short wxDataStream::Read16()
+unsigned short wxDataInputStream::Read16()
 {
   char buf[2];
 
-  if (!m_istream)
-    return 0;
-
-  m_istream->read(buf, 2);
+  Read(buf, 2);
 
   return (unsigned short)buf[0] |
          ((unsigned short)buf[1] << 8);
 }
 
-unsigned char wxDataStream::Read8()
+unsigned char wxDataInputStream::Read8()
 {
   char buf;
 
-  if (!m_istream)
-    return 0;
-
-  m_istream->read(&buf, 1);
+  Read(&buf, 1);
   return (unsigned char)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
   char buf[10];
 
-  if (!m_istream)
-    return 0.0;
-
-  m_istream->read(buf, 10);
+  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::ReadLine()
+{
+  char c, last_endl = 0;
+  bool end_line = FALSE;
+  wxString line;
+
+  while (!end_line) {
+    c = GetC();
+    switch (c) {
+    case '\n':
+      end_line = TRUE;
+      break;
+    case '\r':
+      last_endl = '\r';
+      break;
+    default:
+      if (last_endl == '\r') {
+        end_line = TRUE;
+        InputStreamBuffer()->WriteBack(c);
+        break;
+      }
+      line += c;
+      break;
+    } 
+  }
+  return line;
+}
+
+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);
+  Read(string, len);
 
   string[len] = 0;
   wx_string = string;
   delete string;
 
-  return wx_string; 
+  return wx_string;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+ : wxFilterOutputStream(s)
+{
 }
 
-void wxDataStream::Write32(unsigned long i)
+wxDataOutputStream::~wxDataOutputStream()
 {
-  char buf[4];
+}
 
-  if (!m_ostream)
-    return;
+void wxDataOutputStream::Write32(unsigned long 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);
+  Write(buf, 4);
 }
 
-void wxDataStream::Write16(unsigned short i)
+void wxDataOutputStream::Write16(unsigned short i)
 {
   char buf[2];
 
-  if (!m_ostream)
-    return;
-
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
-  m_ostream->write(buf, 2);
+  Write(buf, 2);
 }
 
-void wxDataStream::Write8(unsigned char i)
+void wxDataOutputStream::Write8(unsigned char i)
 {
-  if (!m_ostream)
-    return;
-
-  m_ostream->write(&i, 1);
+  Write(&i, 1);
 }
 
-void wxDataStream::WriteLine(const wxString& line)
+void wxDataOutputStream::WriteLine(const wxString& line)
 {
 #ifdef __WXMSW__
   wxString tmp_string = line + "\r\n";
@@ -179,36 +176,36 @@ void wxDataStream::WriteLine(const wxString& line)
   wxString tmp_string = line + '\n';
 #endif
 
-  if (!m_ostream)
-    return;
-
-  m_ostream->write((const char *) tmp_string, tmp_string.Length());
+  Write((const char *) tmp_string, tmp_string.Length());
 }
 
-void wxDataStream::WriteString(const wxString& string)
+void wxDataOutputStream::WriteString(const wxString& string)
 {
-  if (!m_ostream)
-    return;
-
   Write32(string.Length());
-  m_ostream->write((const char *) string, string.Length());
+  Write((const char *) string, string.Length());
 }
 
 // Must be at global scope for VC++ 5
 extern "C" void ConvertToIeeeExtended(double num, unsigned char *bytes);
 
-void wxDataStream::WriteDouble(double d)
+void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
-  if (!m_ostream)
-    return;
-
 #if USE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
-#      pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"
+#  pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"
  buf[0] = '\0';
 #endif
-  m_ostream->write(buf, 10);
+  Write(buf, 10);
+}
+
+// ---------------------------------------------------------------------------
+// wxDataStream
+// ---------------------------------------------------------------------------
+
+wxDataStream::wxDataStream(wxStream& stream)
+ : wxDataInputStream(stream), wxDataOutputStream(stream)
+{
 }