define wxUSE_LINE_IN_LISTBOOK to avoid -Wundef warnings (but define it as 0 so thje...

[wxWidgets.git] / include / wx / fs_zip.h

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 6dc75eb25cf8d173d4014e59833e6dad4cce4a31..46426f971f705ee6105dcb22a0d7c03a46424b29 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -21,6 +21,10 @@
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 
+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+
 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------
@@ -33,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();