X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764471557e06c8816b8cc8eb9924a1e3c78509d8..22188d7396b885721afb6214377a88708910b22b:/include/wx/mstream.h?ds=sidebyside diff --git a/include/wx/mstream.h b/include/wx/mstream.h index e5eb691566..eb5e729ad5 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -18,7 +18,7 @@ #include "wx/stream.h" -class WXDLLIMPEXP_BASE wxMemoryOutputStream; +class WXDLLIMPEXP_FWD_BASE wxMemoryOutputStream; class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream { @@ -31,6 +31,7 @@ public: InitFromStream(stream, lenFile); } wxMemoryInputStream(wxMemoryInputStream& stream) + : wxInputStream() { InitFromStream(stream, wxInvalidOffset); } @@ -39,7 +40,8 @@ public: 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; } @@ -62,6 +64,7 @@ private: size_t m_length; // copy ctor is implemented above: it copies the other stream in this one + DECLARE_ABSTRACT_CLASS(wxMemoryInputStream) DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream) }; @@ -91,6 +94,7 @@ protected: wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); wxFileOffset OnSysTell() const; + DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream) DECLARE_NO_COPY_CLASS(wxMemoryOutputStream) };