More work on wxQt integration, configure

[wxWidgets.git] / include / wx / mstream.h

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 9cc7aab26a5404b167ff5ccf8a1550317af3c0b2..8c57cb0323a0d33f326fa7cd8ed001ee43b9625a 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -13,64 +13,59 @@
 
 #include <wx/stream.h>
 
 
 #include <wx/stream.h>
 

-class wxMemoryStreamBase: public wxStream {
-  DECLARE_CLASS(wxMemoryStreamBase)
- public:
-  wxMemoryStreamBase(char *data, size_t length, int iolimit);
+class wxMemoryStreamBase {
+ protected:
+  wxMemoryStreamBase();

   virtual ~wxMemoryStreamBase();
 
   virtual ~wxMemoryStreamBase();
 

-  // Input part
-  wxInputStream& Read(void *buffer, size_t size);
-  size_t SeekI(int pos, wxWhenceType whence = wxBeginPosition);
-  size_t TellI() const { return m_position_i; }
-
-  bool Eof() const { return m_eof; }
-  size_t LastRead() const { return m_lastread; }
-
-  // Output part
-  wxOutputStream& Write(const void *buffer, size_t size);
-  size_t SeekO(int pos, wxWhenceType whence = wxBeginPosition);
-  size_t TellO() const { return m_position_o; }
-
-  bool Bad() const { return m_bad; }
-  size_t LastWrite() const { return m_lastwrite; }
-  void Sync() {}
-
- protected:

   bool ChangeBufferSize(size_t new_length);
 
  protected:
   bool ChangeBufferSize(size_t new_length);
 
  protected:

-  bool m_bad, m_eof, m_persistent;
-  size_t m_lastread, m_lastwrite;
+  bool m_persistent;

   size_t m_length;
   size_t m_length;

-  size_t m_position_i, m_position_o;

   char *m_buffer;
   int m_iolimit;
 };
 
   char *m_buffer;
   int m_iolimit;
 };
 

-
-class wxMemoryInputStream: public wxMemoryStreamBase {
-  DECLARE_CLASS(wxMemoryInputStream)
+class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {

  public:
  public:

-  wxMemoryInputStream(char *data, size_t length)
-     : wxMemoryStreamBase(data, length, 1)
-    {}
+  wxMemoryInputStream(const char *data, size_t length);
+  virtual ~wxMemoryInputStream();
+
+  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: public wxMemoryStreamBase {
-  DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
+class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {

  public:
  public:

-  wxMemoryOutputStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 2)
-   {}
+  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 wxMemoryStreamBase {
-  DECLARE_DYNAMIC_CLASS(wxMemoryStream)
+class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {

  public:
  public:

-  wxMemoryStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 0)
-   {}
+  wxMemoryStream(char *data = NULL, size_t length = 0);
+  virtual ~wxMemoryStream();

 };
 
 #endif
 };
 
 #endif