Motif compile fixes

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 7bed3cbf118fc8778eb01faff1a79f24b00ab901..c6a58a04a19263c3ef1c6b2e6e54d67c5d71a3aa 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -13,128 +13,55 @@
 #pragma implementation "mstream.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
 #include <stdlib.h>
 #include <wx/stream.h>
 #include <wx/mstream.h>
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxMemoryStreamBase, wxStream)
-IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
-#endif
+// ----------------------------------------------------------------------------
+// wxMemoryInputStream
+// ----------------------------------------------------------------------------
 
-wxMemoryStreamBase::wxMemoryStreamBase(char *data, size_t length, int iolimit)
+wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
+  : wxInputStream()
 {
-  m_buffer = data;
-  m_iolimit = iolimit;
-  m_persistent = FALSE;
-  m_length = length;
-  m_position_i = m_position_o = 0;
+  m_i_streambuf->SetBufferIO((char*) data, (char*) (data+len));
+  m_i_streambuf->SetIntPosition(0); // seek to start pos
+  m_i_streambuf->Fixed(TRUE);
+  m_length = len;
 }
 
-wxMemoryStreamBase::~wxMemoryStreamBase()
+wxMemoryInputStream::~wxMemoryInputStream()
 {
-  free(m_buffer);
 }
 
-wxInputStream& wxMemoryStreamBase::Read(void *buffer, size_t size)
+char wxMemoryInputStream::Peek()
 {
-  if (m_iolimit == 2) {
-    m_eof = TRUE;
-    return *this;
-  }
-  if (m_position_i+size > m_length)
-    size = m_length-m_position_i;
-
-  memcpy((void *)((unsigned long)buffer+m_position_i), m_buffer, size);
-  m_position_i += size;
-  m_lastread = size;
-
-  return *this;
+  return m_i_streambuf->GetBufferStart()[m_i_streambuf->GetIntPosition()];
 }
 
-size_t wxMemoryStreamBase::SeekI(int pos, wxWhenceType whence)
-{
-  if (m_iolimit == 2)
-    return 0;
-
-  switch (whence) {
-  case wxBeginPosition:
-    if ((size_t)pos > m_length)
-      return m_position_i;
-    return (m_position_i = pos);
-
-  case wxCurrentPosition:
-    if ((size_t)(m_position_i+pos) > m_length)
-      return m_position_i;
-
-    return (m_position_i += pos);
+// ----------------------------------------------------------------------------
+// wxMemoryOutputStream
+// ----------------------------------------------------------------------------
 
-  case wxEndPosition:
-    if ((size_t)(m_length-pos) > m_length)
-      return m_position_i;
-
-    return (m_position_i = m_length-pos);
-  }
-
-  return m_position_i;
-}
-
-wxOutputStream& wxMemoryStreamBase::Write(const void *buffer, size_t size)
+wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
+  : wxOutputStream()
 {
-  if (m_iolimit == 1) {
-    m_bad = TRUE;
-    return *this;
-  }
-  
-  if (m_position_o+size > m_length)
-    if (!ChangeBufferSize(m_position_o+size)) {
-      m_bad = TRUE;
-      return *this;
-    }
-
-  memcpy(m_buffer+m_position_o, buffer, size);
-  m_position_o += size;
-  m_lastwrite = size;
-
-  return *this;
+  if (data)
+    m_o_streambuf->SetBufferIO(data, data+len);
+  m_o_streambuf->Fixed(TRUE);
 }
 
-size_t wxMemoryStreamBase::SeekO(int pos, wxWhenceType whence)
+wxMemoryOutputStream::~wxMemoryOutputStream()
 {
-  if (m_iolimit == 2)
-    return 0;
-
-  switch (whence) {
-  case wxBeginPosition:
-    if ((size_t)pos > m_length)
-      return m_position_o;
-    return (m_position_o = pos);
-
-  case wxCurrentPosition:
-    if ((size_t)(m_position_o+pos) > m_length)
-      return m_position_o;
-
-    return (m_position_o += pos);
-
-  case wxEndPosition:
-    if ((size_t)(m_length-pos) > m_length)
-      return m_position_o;
-
-    return (m_position_o = m_length-pos);
-  }
-
-  return m_position_o;
 }
 
-bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size)
-{
-  m_length = new_size;
-  if (!m_buffer)
-    m_buffer = (char *)malloc(m_length);
-  else
-    m_buffer = (char *)realloc(m_buffer, m_length);
-
-  return (m_buffer != NULL);
-}
+#endif