X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/zipstrm.h diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index be3ff8790c..9cd7631944 100644 --- a/include/wx/zipstrm.h +++ b/include/wx/zipstrm.h @@ -2,7 +2,6 @@ // Name: wx/zipstrm.h // Purpose: Streams for Zip files // Author: Mike Wetherell -// RCS-ID: $Id$ // Copyright: (c) Mike Wetherell // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -112,8 +111,8 @@ enum wxZipFlags // Forward decls // -class WXDLLIMPEXP_BASE wxZipEntry; -class WXDLLIMPEXP_BASE wxZipInputStream; +class WXDLLIMPEXP_FWD_BASE wxZipEntry; +class WXDLLIMPEXP_FWD_BASE wxZipInputStream; ///////////////////////////////////////////////////////////////////////////// @@ -346,8 +345,9 @@ private: int m_level; wxFileOffset m_offsetAdjustment; wxString m_Comment; + bool m_endrecWritten; - DECLARE_NO_COPY_CLASS(wxZipOutputStream) + wxDECLARE_NO_COPY_CLASS(wxZipOutputStream); }; @@ -383,7 +383,7 @@ protected: size_t WXZIPFIX OnSysRead(void *buffer, size_t size); wxFileOffset OnSysTell() const { return m_decomp ? m_decomp->TellI() : 0; } -#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE +#if WXWIN_COMPATIBILITY_2_6 wxFileOffset WXZIPFIX OnSysSeek(wxFileOffset seek, wxSeekMode mode); #endif @@ -440,12 +440,12 @@ private: friend bool wxZipOutputStream::CopyArchiveMetaData( wxZipInputStream& inputStream); -#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE +#if WXWIN_COMPATIBILITY_2_6 bool m_allowSeeking; - friend class wxZipFSInputStream; + friend class wxArchiveFSHandler; #endif - DECLARE_NO_COPY_CLASS(wxZipInputStream) + wxDECLARE_NO_COPY_CLASS(wxZipInputStream); };