override OnAssertFailure(), not OnAssert() which is not called by wxOnAssert() any...

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

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 7a71e8059a3dd3cdb442922f6b6d763ae0a9f188..ef344236c35740c1b415b2529cc0b0ba00f6909e 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,57 +8,85 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 
 #ifndef _WX_WXMMSTREAM_H__
 #define _WX_WXMMSTREAM_H__
 

-#include "wx/stream.h"
+#include "wx/defs.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-class wxMemoryInputStream: public wxInputStream {
- private:
-  size_t m_length;
-  
- public:
-  wxMemoryInputStream(const char *data, size_t length);
-  virtual ~wxMemoryInputStream();
-  virtual size_t GetSize() const { return m_length; }
+#include "wx/stream.h"
+
+class WXDLLIMPEXP_BASE wxMemoryOutputStream;
+
+class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
+{
+public:
+    wxMemoryInputStream(const void *data, size_t length);
+    wxMemoryInputStream(const wxMemoryOutputStream& stream);
+    virtual ~wxMemoryInputStream();
+    virtual wxFileOffset GetLength() const { return m_length; }
+    virtual bool IsSeekable() const { return true; }
+
+    char Peek();

 
 

-  char Peek();
+    wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }

 
 

-  wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, compatibility only
+    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

- protected:
-  wxStreamBuffer *m_i_streambuf;
+protected:
+    wxStreamBuffer *m_i_streambuf;

 
 

- protected:
-  size_t OnSysRead(void *buffer, size_t nbytes);
-  off_t OnSysSeek(off_t pos, wxSeekMode mode);
-  off_t OnSysTell() const;
+    size_t OnSysRead(void *buffer, size_t nbytes);
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;
+
+private:
+    size_t m_length;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)

 };
 
 };
 

-class wxMemoryOutputStream:  public wxOutputStream {
- public:
-  wxMemoryOutputStream(char *data = NULL, size_t length = 0);
-  virtual ~wxMemoryOutputStream();
-  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
+class WXDLLIMPEXP_BASE 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 wxFileOffset GetLength() const { return m_o_streambuf->GetLastAccess(); }
+    virtual bool IsSeekable() const { return true; }
+
+    size_t CopyTo(void *buffer, size_t len) const;

 
 

-  wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }

 
 

-  size_t CopyTo(char *buffer, size_t len) const;
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, compatibility only
+    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 

- protected:
-  wxStreamBuffer *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;
+protected:
+    size_t OnSysWrite(const void *buffer, size_t nbytes);
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysTell() const;
+
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)

 };
 
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    inline wxStreamBuffer *wxMemoryInputStream::InputStreamBuffer() const { return m_i_streambuf; }
+    inline wxStreamBuffer *wxMemoryOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
+#endif // WXWIN_COMPATIBILITY_2_6
+

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

-