X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32a4b1d57c479a1c39def13df6c269c93d2fdf1a..61ecf6d34ffb087e4a02d1c4e29e1f155875eba0:/include/wx/mstream.h diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 8c57cb0323..b1b15cb8d6 100644 --- 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: @@ -8,64 +8,67 @@ // Copyright: (c) Guilhem Lavaux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __WXMMSTREAM_H__ -#define __WXMMSTREAM_H__ -#include +#ifndef _WX_WXMMSTREAM_H__ +#define _WX_WXMMSTREAM_H__ -class wxMemoryStreamBase { - protected: - wxMemoryStreamBase(); - virtual ~wxMemoryStreamBase(); +#include "wx/stream.h" - bool ChangeBufferSize(size_t new_length); +#if wxUSE_STREAMS - protected: - bool m_persistent; - size_t m_length; - char *m_buffer; - int m_iolimit; -}; +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(); -class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream { - public: - wxMemoryInputStream(const char *data, size_t length); - virtual ~wxMemoryInputStream(); + wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } - char Peek(); + // deprecated, compatibility only + 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; } +protected: + 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; + +private: + size_t m_length; }; -class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream { - public: - wxMemoryOutputStream(char *data = NULL, size_t length = 0); - virtual ~wxMemoryOutputStream(); +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(); } - char *GetData() { Sync(); return m_buffer; } - size_t GetLength() { Sync(); return m_length; } + size_t CopyTo(void *buffer, size_t len) const; - protected: + wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; } - 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; } + // deprecated, compatibility only + wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; } - protected: - off_t m_position_o; -}; +protected: + wxStreamBuffer *m_o_streambuf; -class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream { - public: - wxMemoryStream(char *data = NULL, size_t length = 0); - virtual ~wxMemoryStream(); +protected: + size_t OnSysWrite(const void *buffer, size_t nbytes); + off_t OnSysSeek(off_t pos, wxSeekMode mode); + off_t OnSysTell() const; }; #endif + // wxUSE_STREAMS + +#endif + // _WX_WXMMSTREAM_H__ +