X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c39058f631b3a53682f00807a60bfff6c5aa2b7c:/include/wx/mstream.h diff --git a/include/wx/mstream.h b/include/wx/mstream.h index fca461b5dc..eb5e729ad5 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -12,36 +12,60 @@ #ifndef _WX_WXMMSTREAM_H__ #define _WX_WXMMSTREAM_H__ -#include "wx/stream.h" +#include "wx/defs.h" #if wxUSE_STREAMS +#include "wx/stream.h" + +class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream; + class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream { public: wxMemoryInputStream(const void *data, size_t length); + wxMemoryInputStream(const wxMemoryOutputStream& stream); + wxMemoryInputStream(wxInputStream& stream, + wxFileOffset lenFile = wxInvalidOffset) + { + InitFromStream(stream, lenFile); + } + wxMemoryInputStream(wxMemoryInputStream& stream) + : wxInputStream() + { + InitFromStream(stream, wxInvalidOffset); + } + virtual ~wxMemoryInputStream(); - virtual size_t GetSize() const { return m_length; } - virtual bool Eof() const; + virtual wxFileOffset GetLength() const { return m_length; } + virtual bool IsSeekable() const { return true; } - char Peek(); + virtual char Peek(); + virtual bool CanRead() const; wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; } +#if WXWIN_COMPATIBILITY_2_6 // deprecated, compatibility only - wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; } + wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const ); +#endif // WXWIN_COMPATIBILITY_2_6 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; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); + wxFileOffset OnSysTell() const; private: + // common part of ctors taking wxInputStream + void InitFromStream(wxInputStream& stream, wxFileOffset lenFile); + size_t m_length; - DECLARE_NO_COPY_CLASS(wxMemoryInputStream) + // copy ctor is implemented above: it copies the other stream in this one + DECLARE_ABSTRACT_CLASS(wxMemoryInputStream) + DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream) }; class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream @@ -50,29 +74,37 @@ 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(); } + 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 *GetOutputStreamBuffer() const { return m_o_streambuf; } +#if WXWIN_COMPATIBILITY_2_6 // deprecated, compatibility only - wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; } + wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const ); +#endif // WXWIN_COMPATIBILITY_2_6 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; + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); + wxFileOffset OnSysTell() const; + DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream) 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__ -