X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf..c33edc08d6a5f6937624347f25934937164c13a1:/include/wx/zipstrm.h?ds=sidebyside diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index be3ff8790c..6486492a5a 100644 --- a/include/wx/zipstrm.h +++ b/include/wx/zipstrm.h @@ -112,8 +112,8 @@ enum wxZipFlags // Forward decls // -class WXDLLIMPEXP_BASE wxZipEntry; -class WXDLLIMPEXP_BASE wxZipInputStream; +class WXDLLIMPEXP_FWD_BASE wxZipEntry; +class WXDLLIMPEXP_FWD_BASE wxZipInputStream; ///////////////////////////////////////////////////////////////////////////// @@ -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,9 +440,9 @@ 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)