]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/stream.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Needed some variation; got bored of seeing the compilation errors for this
[wxWidgets.git] / src / common / stream.cpp
diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 9750fef812d9aebf254c8a85196076dcc8dcd90d..61de20d228ea59d3bf87c71c3d35f4f49fbb3fd9 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -43,16 +43,14 @@
 
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
 
 wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
-    m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
+    m_buffer_size(0), m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)
 {
 }
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)
 {
 }
 
 wxStreamBuffer::wxStreamBuffer(BufMode mode)
   : m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
-    m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
-    m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
+    m_buffer_size(0), m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
 {
   m_stream = new wxStreamBase();
     m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
 {
   m_stream = new wxStreamBase();
@@ -70,48 +68,16 @@ wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
   m_mode = buffer.m_mode;
   m_destroybuf = FALSE;
   m_destroystream = FALSE;
   m_mode = buffer.m_mode;
   m_destroybuf = FALSE;
   m_destroystream = FALSE;
-  m_wback = NULL;
-  m_wbacksize = 0;
-  m_wbackcur = 0;
 }
 
 wxStreamBuffer::~wxStreamBuffer()
 {
 }
 
 wxStreamBuffer::~wxStreamBuffer()
 {
-  if (m_wback)
-    free(m_wback);
   if (m_destroybuf)
     wxDELETEA(m_buffer_start);
   if (m_destroystream)
     delete m_stream;
 }
 
   if (m_destroybuf)
     wxDELETEA(m_buffer_start);
   if (m_destroystream)
     delete m_stream;
 }
 
-size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
-{
-  char *ptrback;
-
-  if (m_mode != read)
-    return 0;
-
-  ptrback = AllocSpaceWBack(bufsize);
-  if (!ptrback)
-    return 0;
-
-  memcpy(ptrback, buf, bufsize);
-  return bufsize;
-}
-
-bool wxStreamBuffer::WriteBack(char c)
-{
-  char *ptrback;
-
-  ptrback = AllocSpaceWBack(1);
-  if (!ptrback)
-    return FALSE;
-
-  *ptrback = c;
-  return TRUE;
-}
-
 void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
 {
   if (m_destroybuf)
 void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
 {
   if (m_destroybuf)
@@ -154,44 +120,6 @@ void wxStreamBuffer::ResetBuffer()
     m_buffer_pos = m_buffer_start;
 }
 
     m_buffer_pos = m_buffer_start;
 }
 
-char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
-{
-  char *temp_b;
-
-  m_wbacksize += needed_size;
-
-  if (!m_wback)
-    temp_b = (char *)malloc(m_wbacksize);
-  else
-    temp_b = (char *)realloc(m_wback, m_wbacksize);
-
-  if (!temp_b)
-    return NULL;
-  m_wback = temp_b;
-  
-  return (char *)(m_wback+(m_wbacksize-needed_size));
-}
-
-size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
-{
-  size_t s_toget = m_wbacksize-m_wbackcur;
-
-  if (bsize < s_toget)
-    s_toget = bsize;
-
-  memcpy(buf, (m_wback+m_wbackcur), s_toget);
-
-  m_wbackcur += s_toget;
-  if (m_wbackcur == m_wbacksize) {
-    free(m_wback);
-    m_wback = (char *)NULL;
-    m_wbacksize = 0;
-    m_wbackcur = 0;
-  }
-    
-  return s_toget;
-}
-
 bool wxStreamBuffer::FillBuffer()
 {
   size_t count;
 bool wxStreamBuffer::FillBuffer()
 {
   size_t count;
@@ -301,13 +229,6 @@ size_t wxStreamBuffer::Read(void *buffer, size_t size)
   // ------------------
 
   m_stream->m_lasterror = wxStream_NOERROR;
   // ------------------
 
   m_stream->m_lasterror = wxStream_NOERROR;
-  m_stream->m_lastcount = GetWBack((char *)buffer, size);
-  size -= m_stream->m_lastcount;
-  if (size == 0)
-    return m_stream->m_lastcount;
-
-  buffer = (void *)((char *)buffer+m_stream->m_lastcount);
-
   if (!m_buffer_size)
     return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
 
   if (!m_buffer_size)
     return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
 
@@ -408,15 +329,18 @@ size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
 {
   char buf[BUF_TEMP_SIZE];
   size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
 {
   char buf[BUF_TEMP_SIZE];
   size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
+  wxInputStream *in_stream;
 
   if (m_mode == read)
     return 0;
 
 
   if (m_mode == read)
     return 0;
 
+  in_stream = (wxInputStream *)sbuf->Stream();
+
   while (bytes_count == BUF_TEMP_SIZE) {
     b_count2 = sbuf->Read(buf, bytes_count);
     bytes_count = Write(buf, b_count2);
     if (b_count2 > bytes_count)
   while (bytes_count == BUF_TEMP_SIZE) {
     b_count2 = sbuf->Read(buf, bytes_count);
     bytes_count = Write(buf, b_count2);
     if (b_count2 > bytes_count)
-      sbuf->WriteBack(buf+bytes_count, b_count2-bytes_count);
+      in_stream->Ungetch(buf+bytes_count, b_count2-bytes_count);
     s += bytes_count;
   }
   return s;
     s += bytes_count;
   }
   return s;
@@ -523,47 +447,119 @@ off_t wxStreamBase::OnSysTell() const
 // ----------------------------------------------------------------------------
 
 wxInputStream::wxInputStream()
 // ----------------------------------------------------------------------------
 
 wxInputStream::wxInputStream()
-  : wxStreamBase()
+  : wxStreamBase(),
+    m_wback(NULL), m_wbacksize(0), m_wbackcur(0)
 {
 {
-  m_i_destroybuf = TRUE;
-  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
 }
 
 }
 
-wxInputStream::wxInputStream(wxStreamBuffer *buffer)
-  : wxStreamBase()
+wxInputStream::~wxInputStream()
 {
 {
-  m_i_destroybuf = FALSE;
-  m_i_streambuf = buffer;
+  if (m_wback)
+    free(m_wback);
 }
 
 }
 
-wxInputStream::~wxInputStream()
+char *wxInputStream::AllocSpaceWBack(size_t needed_size)
 {
 {
-  if (m_i_destroybuf)
-    delete m_i_streambuf;
+  char *temp_b;
+
+  m_wbacksize += needed_size;
+
+  if (!m_wback)
+    temp_b = (char *)malloc(m_wbacksize);
+  else
+    temp_b = (char *)realloc(m_wback, m_wbacksize);
+
+  if (!temp_b)
+    return NULL;
+  m_wback = temp_b;
+  
+  return (char *)(m_wback+(m_wbacksize-needed_size));
+}
+
+size_t wxInputStream::GetWBack(char *buf, size_t bsize)
+{
+  size_t s_toget = m_wbacksize-m_wbackcur;
+
+  if (!m_wback)
+    return 0;
+
+  if (bsize < s_toget)
+    s_toget = bsize;
+
+  memcpy(buf, (m_wback+m_wbackcur), s_toget);
+
+  m_wbackcur += s_toget;
+  if (m_wbackcur == m_wbacksize) {
+    free(m_wback);
+    m_wback = (char *)NULL;
+    m_wbacksize = 0;
+    m_wbackcur = 0;
+  }
+    
+  return s_toget;
+}
+
+size_t wxInputStream::Ungetch(void *buf, size_t bufsize)
+{
+  char *ptrback;
+
+  ptrback = AllocSpaceWBack(bufsize);
+  if (!ptrback)
+    return 0;
+
+  memcpy(ptrback, buf, bufsize);
+  return bufsize;
+}
+
+bool wxInputStream::Ungetch(char c)
+{
+  char *ptrback;
+
+  ptrback = AllocSpaceWBack(1);
+  if (!ptrback)
+    return FALSE;
+
+  *ptrback = c;
+  return TRUE;
 }
 
 char wxInputStream::GetC()
 {
   char c;
 }
 
 char wxInputStream::GetC()
 {
   char c;
-  m_i_streambuf->Read(&c, 1);
+  Read(&c, 1);
   return c;
 }
 
 wxInputStream& wxInputStream::Read(void *buffer, size_t size)
 {
   return c;
 }
 
 wxInputStream& wxInputStream::Read(void *buffer, size_t size)
 {
-  m_i_streambuf->Read(buffer, size);
-  // wxStreamBuffer sets all variables for us
+  size_t retsize;
+  char *buf = (char *)buffer;
+
+  retsize = GetWBack(buf, size);
+  if (retsize == size) {
+    m_lastcount = size;
+    m_lasterror = wxStream_NOERROR;
+    return *this;
+  }
+  size     -= retsize;
+  buf      += retsize;
+
+  m_lastcount = OnSysRead(buf, size);
   return *this;
 }
 
 char wxInputStream::Peek()
 {
   return *this;
 }
 
 char wxInputStream::Peek()
 {
-  m_i_streambuf->GetDataLeft();
+  char c;
 
 
-  return *(m_i_streambuf->GetBufferPos());
+  Read(&c, 1);
+  if (m_lasterror == wxStream_NOERROR) {
+    Ungetch(c);
+    return c;
+  }
+  return 0;
 }
 
 }
 
-
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
   char buf[BUF_TEMP_SIZE]; 
 wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 {
   char buf[BUF_TEMP_SIZE]; 
@@ -578,340 +574,222 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
 
 off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
 
 off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
-  return m_i_streambuf->Seek(pos, mode);
+  return wxInvalidOffset;
 }
 
 off_t wxInputStream::TellI() const
 {
 }
 
 off_t wxInputStream::TellI() const
 {
-  return m_i_streambuf->Tell();
+  return wxInvalidOffset;
 }
 
 // --------------------
 // Overloaded operators
 // --------------------
 
 }
 
 // --------------------
 // Overloaded operators
 // --------------------
 
-wxInputStream& wxInputStream::operator>>(wxString& line)
+#if wxUSE_SERIAL
+wxInputStream& wxInputStream::operator>>(wxObject *& obj)
 {
 {
-  wxDataInputStream s(*this);
-
-  line = s.ReadLine();
+  wxObjectInputStream obj_s(*this);
+  obj = obj_s.LoadObject();
   return *this;
 }
   return *this;
 }
+#endif
 
 
-wxInputStream& wxInputStream::operator>>(char& c)
-{
-  c = GetC();
-  return *this;
-}
 
 
-wxInputStream& wxInputStream::operator>>(signed short& i)
+// ----------------------------------------------------------------------------
+// wxOutputStream
+// ----------------------------------------------------------------------------
+wxOutputStream::wxOutputStream()
+  : wxStreamBase()
 {
 {
-  signed long l;
-
-  *this >> l;
-  i = (signed short)l;
-  return *this;
 }
 
 }
 
-wxInputStream& wxInputStream::operator>>(signed int& i)
+wxOutputStream::~wxOutputStream()
 {
 {
-  signed long l;
-
-  *this >> l;
-  i = (signed int)l;
-  return *this;
 }
 
 }
 
-wxInputStream& wxInputStream::operator>>(signed long& i)
+wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
 {
 {
-  /* I only implemented a simple integer parser */
-  int c; 
-  int sign;
-
-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
-
-  i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
-
-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = GetC();
-  } else {
-    sign = 1;
-  }
-
-  while (isdigit(c)) {
-    i = i*10 + (c - (int)'0');
-    c = GetC();
-  }
-
-  i *= sign;
-
+  m_lastcount = OnSysWrite(buffer, size);
   return *this;
 }
 
   return *this;
 }
 
-wxInputStream& wxInputStream::operator>>(unsigned short& i)
+wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
 {
 {
-  unsigned long l;
-
-  *this >> l;
-  i = (unsigned short)l;
+  stream_in.Read(*this);
   return *this;
 }
 
   return *this;
 }
 
-wxInputStream& wxInputStream::operator>>(unsigned int& i)
+off_t wxOutputStream::TellO() const
 {
 {
-  unsigned long l;
-
-  *this >> l;
-  i = (unsigned int)l;
-  return *this;
+  return wxInvalidOffset;
 }
 
 }
 
-wxInputStream& wxInputStream::operator>>(unsigned long& i)
+off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
 {
 {
-  /* I only implemented a simple integer parser */
-  int c;
-
-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
-
-  i = 0;
-  if (!isdigit(c)) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
-
-  while (isdigit(c)) {
-    i = i*10 + c - '0';
-    c = GetC();
-  }
-
-  return *this;
+  return wxInvalidOffset;
 }
 
 }
 
-wxInputStream& wxInputStream::operator>>(double& f)
+void wxOutputStream::Sync()
 {
 {
-  /* I only implemented a simple float parser */
-  int c, sign;
-
-  while (isspace( c = GetC() ) )
-     /* Do nothing */ ;
-
-  f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
-    InputStreamBuffer()->WriteBack(c);
-    return *this;
-  }
-
-  if (c == '-') {
-    sign = -1;
-    c = GetC();
-  } else if (c == '+') {
-    sign = 1;
-    c = GetC();
-  } else {
-    sign = 1;
-  }
-
-  while (isdigit(c)) {
-    f = f*10 + (c - '0');
-    c = GetC();
-  }
-
-  if (c == '.') {
-    double f_multiplicator = (double) 0.1;
-    c = GetC();
-
-    while (isdigit(c)) {
-      f += (c-'0')*f_multiplicator;
-      f_multiplicator /= 10;
-      c = GetC();
-    }
-  }
-
-  f *= sign;
-
-  return *this;
 }
 
 #if wxUSE_SERIAL
 }
 
 #if wxUSE_SERIAL
-wxInputStream& wxInputStream::operator>>(wxObject *& obj)
+wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
 {
 {
-  wxObjectInputStream obj_s(*this);
-  obj = obj_s.LoadObject();
+  wxObjectOutputStream obj_s(*this);
+  obj_s.SaveObject(obj);
   return *this;
 }
 #endif
 
   return *this;
 }
 #endif
 
-
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-// wxOutputStream
+// wxFilterInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
-wxOutputStream::wxOutputStream()
-  : wxStreamBase()
+wxFilterInputStream::wxFilterInputStream()
+  : wxInputStream()
 {
 {
-  m_o_destroybuf = TRUE;
-  m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
 }
 
 }
 
-wxOutputStream::wxOutputStream(wxStreamBuffer *buffer)
-  : wxStreamBase()
+wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
+  : wxInputStream()
 {
 {
-  m_o_destroybuf = FALSE;
-  m_o_streambuf = buffer;
+  m_parent_i_stream = &stream;
 }
 
 }
 
-wxOutputStream::~wxOutputStream()
+wxFilterInputStream::~wxFilterInputStream()
 {
 {
-  if (m_o_destroybuf)
-    delete m_o_streambuf;
 }
 
 }
 
-wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
+// ----------------------------------------------------------------------------
+// wxFilterOutputStream
+// ----------------------------------------------------------------------------
+wxFilterOutputStream::wxFilterOutputStream()
+  : wxOutputStream()
 {
 {
-  m_o_streambuf->Write(buffer, size);
-  return *this;
 }
 
 }
 
-wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
+  : wxOutputStream()
 {
 {
-  stream_in.Read(*this);
-  return *this;
+  m_parent_o_stream = &stream;
 }
 
 }
 
-off_t wxOutputStream::TellO() const
+wxFilterOutputStream::~wxFilterOutputStream()
 {
 {
-  return m_o_streambuf->Tell();
 }
 
 }
 
-off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+// ----------------------------------------------------------------------------
+// wxBufferedInputStream
+// ----------------------------------------------------------------------------
+wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s)
+  : wxFilterInputStream(s)
 {
 {
-  return m_o_streambuf->Seek(pos, mode);
+  m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+  m_i_streambuf->SetBufferIO(1024);
 }
 
 }
 
-void wxOutputStream::Sync()
+wxBufferedInputStream::~wxBufferedInputStream()
 {
 {
-  m_o_streambuf->FlushBuffer();
+  delete m_i_streambuf;
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(const char *string)
+wxInputStream& wxBufferedInputStream::Read(void *buffer, size_t size)
 {
 {
-  return Write(string, strlen(string));
-}
+  size_t retsize;
+  char *buf = (char *)buffer;
 
 
-wxOutputStream& wxOutputStream::operator<<(wxString& string)
-{
-#if wxUSE_UNICODE
-  const wxWX2MBbuf buf = string.mb_str();
-  return *this << buf;
-#else
-  return Write(string, string.Len());
-#endif
-}
+  retsize = GetWBack(buf, size);
+  m_lastcount = retsize;
+  if (retsize == size) {
+    m_lasterror = wxStream_NOERROR;
+    return *this;
+  }
+  size     -= retsize;
+  buf      += retsize;
 
 
-wxOutputStream& wxOutputStream::operator<<(char c)
-{
-  return Write(&c, 1);
+  m_i_streambuf->Read(buf, size);
+
+  return *this;
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(signed short i)
+off_t wxBufferedInputStream::SeekI(off_t pos, wxSeekMode mode)
 {
 {
-  signed long l = (signed long)i;
-  return *this << l;
+  return m_i_streambuf->Seek(pos, mode);
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(signed int i)
+off_t wxBufferedInputStream::TellI() const
 {
 {
-  signed long l = (signed long)i;
-  return *this << l;
+  return m_i_streambuf->Tell();
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(signed long i)
+size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)
 {
 {
-  wxString strlong;
-  strlong.Printf(_T("%ld"), i);
-  return *this << strlong;
+  return m_parent_i_stream->Read(buffer, bufsize).LastRead();
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(unsigned short i)
+off_t wxBufferedInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
 {
 {
-  unsigned long l = (unsigned long)i;
-  return *this << l;
+  return m_parent_i_stream->SeekI(seek, mode);
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(unsigned int i)
+off_t wxBufferedInputStream::OnSysTell() const
 {
 {
-  unsigned long l = (unsigned long)i;
-  return *this << l;
+  return m_parent_i_stream->TellI();
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(unsigned long i)
+// ----------------------------------------------------------------------------
+// wxBufferedOutputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s)
+  : wxFilterOutputStream(s)
 {
 {
-  wxString strlong;
-  strlong.Printf(_T("%lu"), i);
-  return *this << strlong;
+  m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+  m_o_streambuf->SetBufferIO(1024);
 }
 
 }
 
-wxOutputStream& wxOutputStream::operator<<(double f)
+wxBufferedOutputStream::~wxBufferedOutputStream()
 {
 {
-  wxString strfloat;
-
-  strfloat.Printf(_T("%f"), f);
-  return *this << strfloat;
+  delete m_o_streambuf;
 }
 
 }
 
-#if wxUSE_SERIAL
-wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
 {
 {
-  wxObjectOutputStream obj_s(*this);
-  obj_s.SaveObject(obj);
+  m_lastcount = 0;
+  m_o_streambuf->Write(buffer, size);
   return *this;
 }
   return *this;
 }
-#endif
 
 
-// ----------------------------------------------------------------------------
-// wxFilterInputStream
-// ----------------------------------------------------------------------------
-wxFilterInputStream::wxFilterInputStream()
-  : wxInputStream(NULL)
+off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode)
 {
 {
-  // WARNING streambuf set to NULL !
+  return m_o_streambuf->Seek(pos, mode);
 }
 
 }
 
-wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
-  : wxInputStream(stream.InputStreamBuffer())
+off_t wxBufferedOutputStream::TellO() const
 {
 {
-  m_parent_i_stream = &stream;
+  return m_o_streambuf->Tell();
 }
 
 }
 
-wxFilterInputStream::~wxFilterInputStream()
+void wxBufferedOutputStream::Sync()
 {
 {
+  m_o_streambuf->FlushBuffer();
+  m_parent_o_stream->Sync();
 }
 
 }
 
-// ----------------------------------------------------------------------------
-// wxFilterOutputStream
-// ----------------------------------------------------------------------------
-wxFilterOutputStream::wxFilterOutputStream()
-  : wxOutputStream(NULL)
+size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
 {
 {
+  return m_parent_o_stream->Write(buffer, bufsize).LastWrite();
 }
 
 }
 
-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
-  : wxOutputStream(stream.OutputStreamBuffer())
+off_t wxBufferedOutputStream::OnSysSeek(off_t seek, wxSeekMode mode)
 {
 {
-  m_parent_o_stream = &stream;
+  return m_parent_o_stream->SeekO(seek, mode);
 }
 
 }
 
-wxFilterOutputStream::~wxFilterOutputStream()
+off_t wxBufferedOutputStream::OnSysTell() const
 {
 {
+  return m_parent_o_stream->TellO();
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
@@ -922,9 +800,13 @@ wxOutputStream& wxEndL(wxOutputStream& stream)
 {
 #ifdef __MSW__
   return stream.Write("\r\n", 2);
 {
 #ifdef __MSW__
   return stream.Write("\r\n", 2);
+#else
+#ifdef __WXMAC__
+  return stream.Write("\r", 1);
 #else
   return stream.Write("\n", 1);
 #endif
 #else
   return stream.Write("\n", 1);
 #endif
+#endif
 }
 
 #endif
 }
 
 #endif
wxWidgets (Impactor)