X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..9cc311d32c3eeca78030e3c45d7829f1059befcc:/include/wx/mstream.h diff --git a/include/wx/mstream.h b/include/wx/mstream.h index 1f9a8aea9f..525c6d9ccc 100644 --- a/include/wx/mstream.h +++ b/include/wx/mstream.h @@ -16,12 +16,12 @@ #if wxUSE_STREAMS -class WXDLLEXPORT_BASE wxMemoryInputStream : public wxInputStream +class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream { public: wxMemoryInputStream(const void *data, size_t length); virtual ~wxMemoryInputStream(); - virtual size_t GetSize() const { return m_length; } + virtual wxFileOffset GetLength() const { return m_length; } virtual bool Eof() const; char Peek(); @@ -35,8 +35,8 @@ 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: size_t m_length; @@ -44,13 +44,13 @@ private: DECLARE_NO_COPY_CLASS(wxMemoryInputStream) }; -class WXDLLEXPORT_BASE wxMemoryOutputStream : public wxOutputStream +class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream { 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(); } size_t CopyTo(void *buffer, size_t len) const; @@ -64,8 +64,8 @@ protected: 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_NO_COPY_CLASS(wxMemoryOutputStream) };