added wxMBConv::Clone() to be able to copy conversion objects polymorphically

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 6dc75eb25cf8d173d4014e59833e6dad4cce4a31..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_
 
 #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
 #include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS


@@ -21,6 +17,10 @@
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 

+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+

 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 // wxZipFSHandler
 //---------------------------------------------------------------------------


@@ -33,14 +33,15 @@ 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();
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();

+        void Cleanup();

         ~wxZipFSHandler();
 
     private:
         // these vars are used by FindFirst/Next:
         ~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;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

-        wxLongToLongHashMap *m_DirsFound;
+        wxZipFilenameHashMap *m_DirsFound;

 
         wxString DoFind();
 
 
         wxString DoFind();