X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c980c992630e94e71139660631a77ffbca8ed958..8487f8874288a8e4fe40ead153c73dfc7777f41b:/src/common/mstream.cpp

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 4555d35062..3e656ba3e8 100644
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -23,8 +23,8 @@
 #if wxUSE_STREAMS
 
 #include <stdlib.h>
-#include <wx/stream.h>
-#include <wx/mstream.h>
+#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);
 }
 
@@ -86,6 +87,7 @@ wxMemoryOutputStream::~wxMemoryOutputStream()
 
 size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
 {
+  m_lastcount = 0;
   return m_o_streambuf->Write(buffer, nbytes);
 }
 
@@ -99,5 +101,16 @@ off_t wxMemoryOutputStream::OnSysTell() const
   return m_o_streambuf->Tell();
 }
 
+size_t wxMemoryOutputStream::CopyTo(char *buffer, size_t len) const
+{
+  if (!buffer)
+    return 0;
+
+  if (len > GetSize())
+    len = GetSize();
+
+  memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
+  return len;
+}
 
 #endif