X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1678ad780265f08fc8b84d180c04ae3a9900b1bb..695237bccd652c60deba347117ba5ab32067880c:/include/wx/mstream.h

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index dc8c6688d7..85e0b30e35 100644
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -8,62 +8,57 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
+#ifndef _WX_WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__
 
-#include <wx/stream.h>
+#include "wx/stream.h"
 
-class wxMemoryStreamBase {
- protected:
-  wxMemoryStreamBase();
-  virtual ~wxMemoryStreamBase();
-
-  bool ChangeBufferSize(size_t new_length);
+#if wxUSE_STREAMS
 
- protected:
-  bool m_persistent;
+class WXDLLEXPORT wxMemoryInputStream: public wxInputStream {
+ private:
   size_t m_length;
-  char *m_buffer;
-  int m_iolimit;
-};
-
-class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
+  
  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();
+  virtual size_t GetSize() const { return m_length; }
+
+  char Peek();
+
+  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
 
  protected:
- 
-  size_t DoRead(void *buffer, size_t size);
-  off_t DoSeekInput(off_t pos, wxSeekMode mode);
-  off_t DoTellInput() const { return m_position_i; }
+  wxStreamBuffer *m_i_streambuf;
 
  protected:
-  off_t m_position_i;
+  size_t OnSysRead(void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
 };
 
-class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
+class WXDLLEXPORT wxMemoryOutputStream:  public wxOutputStream {
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
+  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
 
-  char *GetData() { Sync(); return m_buffer; }
-  size_t GetLength() { Sync(); return m_length; }
+  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
 
- protected:
+  size_t CopyTo(char *buffer, size_t len) const;
 
-  size_t DoWrite(const void *buffer, size_t size);
-  off_t DoSeekOutput(off_t pos, wxSeekMode mode);
-  off_t DoTellOutput() const { return m_position_o; }
+ protected:
+  wxStreamBuffer *m_o_streambuf;
 
  protected:
-  off_t m_position_o;
+  size_t OnSysWrite(const void *buffer, size_t nbytes);
+  off_t OnSysSeek(off_t pos, wxSeekMode mode);
+  off_t OnSysTell() const;
 };
 
-class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0);
-  virtual ~wxMemoryStream();
-};
+#endif
+  // wxUSE_STREAMS
 
 #endif
+  // _WX_WXMMSTREAM_H__
+