X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4708a349aff60155e71841f0f44422860ab8d98b..8c5b1f0faff5b26bc9b2d9052069e951e7b41c74:/src/common/stream.cpp

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 9763842c4a..a65c6154d8 100644
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -39,6 +39,7 @@
 #include "wx/stream.h"
 #include "wx/datstrm.h"
 #include "wx/objstrm.h"
+#include "wx/textfile.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -94,7 +95,14 @@ wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {
     Init();
 
-    m_stream = new wxStreamBase;
+    wxASSERT_MSG(mode != read_write, wxT("you have to use the other ctor for read_write mode") );
+    if ( mode == read )
+        m_stream = new wxInputStream;
+    else if ( mode == write)
+        m_stream = new wxOutputStream;
+    else
+        m_stream = NULL;
+
     m_mode = mode;
 
     m_flushable = FALSE;
@@ -1176,15 +1184,9 @@ void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
 
 wxOutputStream& wxEndL(wxOutputStream& stream)
 {
-#ifdef __MSW__
-  return stream.Write("\r\n", 2);
-#else
-#ifdef __WXMAC__
-  return stream.Write("\r", 1);
-#else
-  return stream.Write("\n", 1);
-#endif
-#endif
+    static const wxChar *eol = wxTextFile::GetEOL();
+
+    return stream.Write(eol, wxStrlen(eol));
 }
 
 #endif