We use native paths now in wxWindows. On the Mac, too.

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 1e2dc7e45714a6a38ad5064036f5d06d5b2f9fcd..9c006b8f7ad4133686cc0fb8dddfc0d6150bc40a 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


@@ -81,6 +82,8 @@ void wxStreamBuffer::Init()
 
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
 {
 
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
 {

+    Init();
+

     m_stream = &stream;
     m_mode = mode;
 
     m_stream = &stream;
     m_mode = mode;
 


@@ -90,6 +93,8 @@ wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
 {

+    Init();
+

     m_stream = new wxStreamBase;
     m_mode = mode;
 
     m_stream = new wxStreamBase;
     m_mode = mode;
 


@@ -161,7 +166,7 @@ void wxStreamBuffer::SetBufferIO(void *start,
     m_buffer_size = len;
 
     // if we own it, we free it
     m_buffer_size = len;
 
     // if we own it, we free it

-    m_destroybuf = !takeOwnership;
+    m_destroybuf = takeOwnership;

 
     ResetBuffer();
 }
 
     ResetBuffer();
 }


@@ -665,7 +670,12 @@ bool wxInputStream::Eof() const
 
     char c;
     self->Read(&c, 1);
 
     char c;
     self->Read(&c, 1);

-    if ( GetLastError() == wxSTREAM_EOF )
+
+    // some streams can know that they're at EOF before actually trying to
+    // read beyond the end of stream (e.g. files) while others have no way of
+    // knowing it, so to provide the same behaviour in all cases we only
+    // return TRUE from here if the character really couldn't be read
+    if ( !self->LastRead() && GetLastError() == wxSTREAM_EOF )

     {
         return TRUE;
     }
     {
         return TRUE;
     }


@@ -1020,7 +1030,8 @@ wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
 
 wxBufferedInputStream::~wxBufferedInputStream()
 {
 
 wxBufferedInputStream::~wxBufferedInputStream()
 {

-    m_parent_i_stream->SeekI(-m_i_streambuf->GetBytesLeft(), wxFromCurrent);
+    m_parent_i_stream->SeekI(-(off_t)m_i_streambuf->GetBytesLeft(),
+                             wxFromCurrent);

 
     delete m_i_streambuf;
 }
 
     delete m_i_streambuf;
 }


@@ -1166,15 +1177,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