X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d76b6d8c3d13ce08f0aef47f859078368f7fed7..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/mstream.h?ds=sidebyside diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 9ed77087f9..8e12d63274 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); } @@ -63,7 +64,8 @@ private: size_t m_length; // copy ctor is implemented above: it copies the other stream in this one - DECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream) + DECLARE_ABSTRACT_CLASS(wxMemoryInputStream) + wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream); }; class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream @@ -92,7 +94,8 @@ 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