X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1370b1d01658da0e16d252871c4b3585c834b9f1..682f3d0207027e96c34cc5a2f1e8311c4d370ba6:/src/common/zipstrm.cpp diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index c6b966fa30..c73a2aebd2 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -146,7 +146,7 @@ public: void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; } virtual char Peek() { return wxInputStream::Peek(); } - virtual size_t GetSize() const { return m_len; } + virtual wxFileOffset GetLength() const { return m_len; } protected: virtual size_t OnSysRead(void *buffer, size_t size); @@ -1751,7 +1751,7 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) { case wxFromCurrent : nextpos = seek + pos; break; case wxFromStart : nextpos = seek; break; - case wxFromEnd : nextpos = GetSize() - 1 + seek; break; + case wxFromEnd : nextpos = GetLength() - 1 + seek; break; default : nextpos = pos; break; /* just to fool compiler, never happens */ } @@ -1793,7 +1793,7 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode) ///////////////////////////////////////////////////////////////////////////// // Output stream -#include +#include "wx/listimpl.cpp" WX_DEFINE_LIST(_wxZipEntryList); wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,