X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..6df6e35a3eae74404f15f8f7c09ce19c29f47b4a:/include/wx/fs_zip.h

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 33bf95155d..e98b3f82ad 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,33 +4,28 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#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);
 
-class WXDLLEXPORT_BASE wxHashTableLong;
 
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 // wxZipFSHandler
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {
     public:
         wxZipFSHandler();
@@ -38,14 +33,15 @@ class WXDLLEXPORT_BASE wxZipFSHandler : public wxFileSystemHandler
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
-        ~wxZipFSHandler();
+        void Cleanup();
+        virtual ~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;
-        wxHashTableLong *m_DirsFound;
+        wxZipFilenameHashMap *m_DirsFound;
 
         wxString DoFind();