X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/fs_zip.h?ds=inline

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 5f4dc0b883..46426f971f 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,33 +4,32 @@
 // 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__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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"
+
 
-class WXDLLEXPORT wxHashTableLong;
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
 
-//--------------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 // wxZipFSHandler
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {
     public:
         wxZipFSHandler();
@@ -38,14 +37,17 @@ class WXDLLEXPORT 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;
-        wxHashTableLong *m_DirsFound;
+        wxZipFilenameHashMap *m_DirsFound;
 
         wxString DoFind();