some != NULL checks

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 5d13a0a2e0d61e0135de406303d7abd02633fb39..b0819a26ce0ff91a404f349c49222b75429986d2 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -23,8 +23,8 @@
 #if wxUSE_STREAMS
 
 #include <stdlib.h>
 #if wxUSE_STREAMS
 
 #include <stdlib.h>

-#include <wx/stream.h>
-#include <wx/mstream.h>
+#include "wx/stream.h"
+#include "wx/mstream.h"

 
 // ----------------------------------------------------------------------------
 // wxMemoryInputStream
 
 // ----------------------------------------------------------------------------
 // wxMemoryInputStream


@@ -52,9 +52,13 @@ char wxMemoryInputStream::Peek()
 }
 
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
 }
 
 size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)

-{
-  m_lastcount = 0;
-  return m_i_streambuf->Read(buffer, nbytes);
+{ 
+  size_t bufsize = m_i_streambuf->GetBufferEnd() - m_i_streambuf->GetBufferStart();
+  size_t oldpos = m_i_streambuf->GetIntPosition();
+  m_i_streambuf->Read(buffer, nbytes);
+  size_t newpos = m_i_streambuf->GetIntPosition();
+  if (newpos == 0) return bufsize - oldpos;
+  else return newpos - oldpos;

 }
 
 off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 }
 
 off_t wxMemoryInputStream::OnSysSeek(off_t pos, wxSeekMode mode)


@@ -77,7 +81,8 @@ wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
   m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
   if (data)
     m_o_streambuf->SetBufferIO(data, data+len);
   m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
   if (data)
     m_o_streambuf->SetBufferIO(data, data+len);

-  m_o_streambuf->Fixed(TRUE);
+  m_o_streambuf->Fixed(FALSE);
+  m_o_streambuf->Flushable(FALSE);

 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()
 }
 
 wxMemoryOutputStream::~wxMemoryOutputStream()


@@ -87,8 +92,12 @@ wxMemoryOutputStream::~wxMemoryOutputStream()
 
 size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
 {
 
 size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
 {

-  m_lastcount = 0;
-  return m_o_streambuf->Write(buffer, nbytes);
+  size_t bufsize = m_o_streambuf->GetBufferEnd() - m_o_streambuf->GetBufferStart();
+  size_t oldpos = m_o_streambuf->GetIntPosition();
+  m_o_streambuf->Write(buffer, nbytes);
+  size_t newpos = m_o_streambuf->GetIntPosition();
+  if (newpos == 0) return bufsize - oldpos;
+  else return newpos - oldpos;

 }
 
 off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 }
 
 off_t wxMemoryOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)