X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/588066b7a39629e44bb39f1ab436b80f38c13f33..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/mstream.h?ds=sidebyside diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 525c6d9ccc..8e12d63274 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -12,24 +12,43 @@ #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 wxFileOffset GetLength() const { return m_length; } - virtual bool Eof() const; + 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; @@ -39,9 +58,14 @@ protected: 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) + wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream); }; class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream @@ -51,13 +75,16 @@ public: 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 *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; @@ -67,12 +94,17 @@ protected: wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); wxFileOffset OnSysTell() const; - DECLARE_NO_COPY_CLASS(wxMemoryOutputStream) + DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream) + wxDECLARE_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__ -