Removed no longer needed "DECLARE_EVENT_TABLE()" completing the previous change.

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index d449cb072a852c0d0161d91a3a4d77a7149d07b5..ba864ce522a65c725c07f349b50eea8dd1246dbd 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -10,10 +10,6 @@
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "fs_zip.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
@@ -21,6 +17,10 @@
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 
+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+
 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------
@@ -33,6 +33,7 @@ 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();
+        void Cleanup();
         ~wxZipFSHandler();
 
     private:
@@ -40,10 +41,9 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
         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)
 };