minor fix that was part of helpbest.patch

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 9763842c4ac6c220b3dd4bdd050af3dd96e20a48..a65c6154d853f77c0693c38b2b5dd3faf25bc74f 100644 (file)
--- 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/stream.h"
 #include "wx/datstrm.h"
 #include "wx/objstrm.h"

+#include "wx/textfile.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -94,7 +95,14 @@ wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {
     Init();
 
 {
     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;
     m_mode = mode;
 
     m_flushable = FALSE;


@@ -1176,15 +1184,9 @@ void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
 
 wxOutputStream& wxEndL(wxOutputStream& stream)
 {
 
 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
 }
 
 #endif