X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdcade0a101893a5030ac2e91dabc79e1388b0a3..72e4e6a397fd04e6d8e0cc5ae22aaba740c3c8bc:/include/wx/fs_zip.h diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index e9bbad3fb1..46426f971f 100644 --- a/include/wx/fs_zip.h +++ b/include/wx/fs_zip.h @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik // CVS-ID: $Id$ -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FS_ZIP_H_ @@ -14,19 +14,16 @@ #pragma interface "fs_zip.h" #endif -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#include "wx/defs.h" #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS #include "wx/filesys.h" #include "wx/hashmap.h" -WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); + +WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap); + //--------------------------------------------------------------------------- // wxZipFSHandler @@ -40,14 +37,17 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); virtual wxString FindFirst(const wxString& spec, int flags = 0); virtual wxString FindNext(); +#if wxABI_VERSION >= 20602 /* 2.6.2+ only */ + void Cleanup(); +#endif ~wxZipFSHandler(); private: // these vars are used by FindFirst/Next: - void *m_Archive; + class wxZipInputStream *m_Archive; wxString m_Pattern, m_BaseDir, m_ZipFile; bool m_AllowDirs, m_AllowFiles; - wxLongToLongHashMap *m_DirsFound; + wxZipFilenameHashMap *m_DirsFound; wxString DoFind();