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 a4e28d083febe70f914dbaa8d2eb4944221bdd21..46426f971f705ee6105dcb22a0d7c03a46424b29 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -14,17 +14,17 @@
 #pragma interface "fs_zip.h"
 #endif
 
 #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"
 
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 #include "wx/filesys.h"
 #include "wx/hashmap.h"
 

+
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+
+

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


@@ -37,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();
         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:
         ~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();