X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32a4b1d57c479a1c39def13df6c269c93d2fdf1a..f924129679e25bdc0bb8d4accf47bc420d4b802d:/include/wx/mstream.h

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 8c57cb0323..3bd53e642d 100644
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -8,64 +8,27 @@
 // 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>
 
-class wxMemoryStreamBase {
- protected:
-  wxMemoryStreamBase();
-  virtual ~wxMemoryStreamBase();
-
-  bool ChangeBufferSize(size_t new_length);
-
- protected:
-  bool m_persistent;
+class 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 StreamSize() const { return m_length; }
 
   char Peek();
-
- 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; }
-
- protected:
-  off_t m_position_i;
 };
 
-class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
+class wxMemoryOutputStream:  public wxOutputStream {
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
-
-  char *GetData() { Sync(); return m_buffer; }
-  size_t GetLength() { Sync(); return m_length; }
-
- protected:
-
-  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:
-  off_t m_position_o;
-};
-
-class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0);
-  virtual ~wxMemoryStream();
 };
 
 #endif