Some C++Builder fixes

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index ceec4b05bc3074705aa8249f5d47c449bab0404d..b0819a26ce0ff91a404f349c49222b75429986d2 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -15,14 +15,17 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include <stdlib.h>
-#include <wx/stream.h>
-#include <wx/mstream.h>

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STREAMS
+
+#include <stdlib.h>
+#include "wx/stream.h"
+#include "wx/mstream.h"
+

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


@@ -30,12 +33,17 @@
 wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
   : wxInputStream()
 {
 wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
   : wxInputStream()
 {

-  m_i_streambuf->SetBufferIO((char *)data, data+len);
+  m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
+  m_i_streambuf->SetBufferIO((char*) data, (char*) (data+len));
+  m_i_streambuf->SetIntPosition(0); // seek to start pos

   m_i_streambuf->Fixed(TRUE);
   m_i_streambuf->Fixed(TRUE);

+
+  m_length = len;

 }
 
 wxMemoryInputStream::~wxMemoryInputStream()
 {
 }
 
 wxMemoryInputStream::~wxMemoryInputStream()
 {

+  delete m_i_streambuf;

 }
 
 char wxMemoryInputStream::Peek()
 }
 
 char wxMemoryInputStream::Peek()


@@ -43,6 +51,26 @@ char wxMemoryInputStream::Peek()
   return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 
   return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 

+size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t 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)
+{
+  return m_i_streambuf->Seek(pos, mode);
+}
+
+off_t wxMemoryInputStream::OnSysTell() const
+{
+  return m_i_streambuf->Tell();
+}
+

 // ----------------------------------------------------------------------------
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMemoryOutputStream
 // ----------------------------------------------------------------------------


@@ -50,11 +78,48 @@ char wxMemoryInputStream::Peek()
 wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
   : wxOutputStream()
 {
 wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
   : wxOutputStream()
 {

+  m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);

   if (data)
     m_o_streambuf->SetBufferIO(data, data+len);
   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()
 {

+  delete m_o_streambuf;

 }
 }

+
+size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t 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)
+{
+  return m_o_streambuf->Seek(pos, mode);
+}
+
+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