1. implemented wxRegKey::Copy() and CopyValue()

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 4555d350620e77356e03dc02ec3edb51ecf61465..aed7cae179c214efb077790d6877b94328bfac0c 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


@@ -53,6 +53,7 @@ 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);
 }
 
   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 = 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()


@@ -86,6 +88,7 @@ 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);
 }
 
   return m_o_streambuf->Write(buffer, nbytes);
 }
 


@@ -99,5 +102,16 @@ off_t wxMemoryOutputStream::OnSysTell() const
   return m_o_streambuf->Tell();
 }
 
   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
 
 #endif