couple of minor bug fixes/enhancements (interface unchanged)

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index f5fdaa1bd42cbeed45f41f1c33971dc190598680..93850acd65e90aa9615f1d6caca4c17c08a8aee0 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -26,11 +26,6 @@
 
 #include "wx/datstrm.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxDataInputStream, wxFilterInputStream)
-IMPLEMENT_CLASS(wxDataOutputStream, wxFilterOutputStream)
-#endif
-
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : wxFilterInputStream(s)
 {
@@ -87,10 +82,30 @@ double wxDataInputStream::ReadDouble()
 
 wxString wxDataInputStream::ReadLine()
 {
-  char i_strg[255];
-
-  // 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()
@@ -108,7 +123,7 @@ wxString wxDataInputStream::ReadString()
   wx_string = string;
   delete string;
 
-  return wx_string; 
+  return wx_string;
 }
 
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
@@ -172,7 +187,7 @@ void wxDataOutputStream::WriteDouble(double d)
 #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
   Write(buf, 10);