X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/fs_zip.h

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index a4e28d083f..46426f971f 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -14,17 +14,17 @@
 #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_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+
 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------
@@ -37,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();