another compilation fix for over-optimized #includes

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 68c82681d945ebfa52c1d052813584f2970f339f..d80cd3a401dd5ec62243cd552a9b1e367cbab093 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mstream.h
+// Name:        wx/mstream.h

 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -8,65 +8,71 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
-
-#include <wx/stream.h>
-
-class wxMemoryStreamBase: public wxStream {
- public:
-  wxMemoryStreamBase(char *data, size_t length, int iolimit);
-  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 m_bad, m_eof, m_persistent;
-  size_t m_lastread, m_lastwrite;
-  size_t m_length;
-  size_t m_position_i, m_position_o;
-  char *m_buffer;
-  int m_iolimit;
-};

 
 

+#ifndef _WX_WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__

 
 

-class wxMemoryInputStream: public wxMemoryStreamBase {
- public:
-  wxMemoryInputStream(char *data, size_t length)
-     : wxMemoryStreamBase(data, length, 1)
-    {}
-};
+#include "wx/stream.h"
+
+#if wxUSE_STREAMS
+
+class WXDLLEXPORT wxMemoryInputStream : public wxInputStream
+{
+public:
+    wxMemoryInputStream(const void *data, size_t length);
+    virtual ~wxMemoryInputStream();
+    virtual size_t GetSize() const { return m_length; }
+    virtual bool Eof() const;
+
+    char Peek();
+
+    wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
+
+    // deprecated, compatibility only
+    wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+
+protected:
+    wxStreamBuffer *m_i_streambuf;
+
+    size_t OnSysRead(void *buffer, size_t nbytes);
+    off_t OnSysSeek(off_t pos, wxSeekMode mode);
+    off_t OnSysTell() const;
+
+private:
+    size_t m_length;

 
 

-class wxMemoryOutputStream: public wxMemoryStreamBase {
- public:
-  wxMemoryOutputStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 2)
-   {}
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)

 };
 
 };
 

-class wxMemoryStream: public wxMemoryStreamBase {
- public:
-  wxMemoryStream(char *data = NULL, size_t length = 0)
-     : wxMemoryStreamBase(data, length, 0)
-   {}
+class WXDLLEXPORT wxMemoryOutputStream : public wxOutputStream
+{
+public:
+    // if data is !NULL it must be allocated with malloc()
+    wxMemoryOutputStream(void *data = NULL, size_t length = 0);
+    virtual ~wxMemoryOutputStream();
+    virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
+
+    size_t CopyTo(void *buffer, size_t len) const;
+
+    wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
+
+    // deprecated, compatibility only
+    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+
+protected:
+    wxStreamBuffer *m_o_streambuf;
+
+protected:
+    size_t OnSysWrite(const void *buffer, size_t nbytes);
+    off_t OnSysSeek(off_t pos, wxSeekMode mode);
+    off_t OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)

 };
 
 #endif
 };
 
 #endif

+  // wxUSE_STREAMS
+
+#endif
+  // _WX_WXMMSTREAM_H__
+