X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c70014d966bbfa08d201ca24c825f2d88cc3975..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/include/wx/mstream.h?ds=sidebyside diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 2719d90474..97d6f5e00b 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -12,25 +12,42 @@ #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) + { + 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; @@ -40,9 +57,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) + DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream) }; class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream @@ -58,8 +80,10 @@ public: 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; @@ -69,12 +93,17 @@ protected: 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__ -