X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd25b18c8e7e8d77b1a5847f289afec6e114fbd5..076bae67da7d0d6909f4a4f364b8fe04fdf59b9d:/src/common/mstream.cpp diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp index 8e81abd394..aed7cae179 100644 --- a/src/common/mstream.cpp +++ b/src/common/mstream.cpp @@ -23,8 +23,8 @@ #if wxUSE_STREAMS #include -#include -#include +#include "wx/stream.h" +#include "wx/mstream.h" // ---------------------------------------------------------------------------- // wxMemoryInputStream @@ -53,6 +53,7 @@ char wxMemoryInputStream::Peek() size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes) { + m_lastcount = 0; return m_i_streambuf->Read(buffer, nbytes); } @@ -76,7 +77,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->Fixed(TRUE); + m_o_streambuf->Fixed(FALSE); + m_o_streambuf->Flushable(FALSE); } wxMemoryOutputStream::~wxMemoryOutputStream() @@ -86,6 +88,7 @@ wxMemoryOutputStream::~wxMemoryOutputStream() size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes) { + m_lastcount = 0; return m_o_streambuf->Write(buffer, nbytes); }