Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index d449cb072a852c0d0161d91a3a4d77a7149d07b5..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"
 
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 

+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+

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


@@ -33,6 +37,9 @@ 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();

+#if wxABI_VERSION >= 20602 /* 2.6.2+ only */
+        void Cleanup();
+#endif

         ~wxZipFSHandler();
 
     private:
         ~wxZipFSHandler();
 
     private:


@@ -40,10 +47,9 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
         class wxZipInputStream *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
         class wxZipInputStream *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

-        wxLongToLongHashMap *m_DirsFound;
+        wxZipFilenameHashMap *m_DirsFound;

 
         wxString DoFind();
 
         wxString DoFind();

-        void CloseArchive(class wxZipInputStream *archive);

 
     DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };
 
     DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };