Another one bites the dust.

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index f4ccc714a42e19bd0fac37c0e2847186a0e7ea33..b9ad7564f98a8dd8d10a468d5674b47f1be2409c 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -26,10 +26,9 @@
 
 #include "wx/datstrm.h"
 
 
 #include "wx/datstrm.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
-IMPLEMENT_CLASS(wxDataOutputStream, wxFilterOutputStream)
-#endif
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------

 
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : wxFilterInputStream(s)
 
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : wxFilterInputStream(s)


@@ -44,9 +43,6 @@ unsigned long wxDataInputStream::Read32()
 {
   char buf[4];
 
 {
   char buf[4];
 

-  if (!m_istream)
-    return 0;
-

   Read(buf, 4);
 
   return (unsigned long)buf[0] |
   Read(buf, 4);
 
   return (unsigned long)buf[0] |


@@ -59,9 +55,6 @@ unsigned short wxDataInputStream::Read16()
 {
   char buf[2];
 
 {
   char buf[2];
 

-  if (!m_istream)
-    return 0;
-

   Read(buf, 2);
 
   return (unsigned short)buf[0] |
   Read(buf, 2);
 
   return (unsigned short)buf[0] |


@@ -72,9 +65,6 @@ unsigned char wxDataInputStream::Read8()
 {
   char buf;
 
 {
   char buf;
 

-  if (!m_istream)
-    return 0;
-

   Read(&buf, 1);
   return (unsigned char)buf;
 }
   Read(&buf, 1);
   return (unsigned char)buf;
 }


@@ -84,12 +74,9 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 double wxDataInputStream::ReadDouble()
 {
 
 double wxDataInputStream::ReadDouble()
 {

-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   char buf[10];
 
   char buf[10];
 

-  if (!m_istream)
-    return 0.0;
-

   Read(buf, 10);
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else
   Read(buf, 10);
   return ConvertFromIeeeExtended((unsigned char *)buf);
 #else


@@ -99,13 +86,30 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadLine()
 {
 
 wxString wxDataInputStream::ReadLine()
 {

-  char i_strg[255];
-
-  if (!m_istream)
-    return "";
-
-  // TODO: Implement ReadLine
-  return i_strg;
+  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 wxDataInputStream::ReadString()


@@ -114,9 +118,6 @@ wxString wxDataInputStream::ReadString()
   char *string;
   unsigned long len;
 
   char *string;
   unsigned long len;
 

-  if (!m_istream)
-    return "";
-

   len = Read32();
   string = new char[len+1];
 
   len = Read32();
   string = new char[len+1];
 


@@ -126,21 +127,26 @@ wxString wxDataInputStream::ReadString()
   wx_string = string;
   delete string;
 
   wx_string = string;
   delete string;
 

-  return wx_string; 
+  return wx_string;

 }
 
 }
 

+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+

 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
  : wxFilterOutputStream(s)
 {
 }
 
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
  : wxFilterOutputStream(s)
 {
 }
 

+wxDataOutputStream::~wxDataOutputStream()
+{
+}
+

 void wxDataOutputStream::Write32(unsigned long i)
 {
   char buf[4];
 
 void wxDataOutputStream::Write32(unsigned long i)
 {
   char buf[4];
 

-  if (!m_ostream)
-    return;
-

   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   buf[2] = (i >> 16) & 0xff;
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   buf[2] = (i >> 16) & 0xff;


@@ -152,9 +158,6 @@ void wxDataOutputStream::Write16(unsigned short i)
 {
   char buf[2];
 
 {
   char buf[2];
 

-  if (!m_ostream)
-    return;
-

   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   Write(buf, 2);
   buf[0] = i & 0xff;
   buf[1] = (i >> 8) & 0xff;
   Write(buf, 2);


@@ -162,9 +165,6 @@ void wxDataOutputStream::Write16(unsigned short i)
 
 void wxDataOutputStream::Write8(unsigned char i)
 {
 
 void wxDataOutputStream::Write8(unsigned char i)
 {

-  if (!m_ostream)
-    return;
-

   Write(&i, 1);
 }
 
   Write(&i, 1);
 }
 


@@ -176,17 +176,11 @@ void wxDataOutputStream::WriteLine(const wxString& line)
   wxString tmp_string = line + '\n';
 #endif
 
   wxString tmp_string = line + '\n';
 #endif
 

-  if (!m_ostream)
-    return;
-

   Write((const char *) tmp_string, tmp_string.Length());
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write((const char *) tmp_string, tmp_string.Length());
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {

-  if (!m_ostream)
-    return;
-

   Write32(string.Length());
   Write((const char *) string, string.Length());
 }
   Write32(string.Length());
   Write((const char *) string, string.Length());
 }


@@ -198,13 +192,10 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
 {
   char buf[10];
 

-  if (!m_ostream)
-    return;
-
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
   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);
  buf[0] = '\0';
 #endif
   Write(buf, 10);