X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdcade0a101893a5030ac2e91dabc79e1388b0a3..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/fs_zip.h

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index e9bbad3fb1..3276be7186 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
@@ -44,12 +41,13 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 
     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();
+        void CloseArchive(class wxZipInputStream *archive);
 
     DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };