we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index c0161fec702b9ffdf5ba8fced3f91bd2d6573563..3276be718641f2bcd3302d3ee6a28c916bfdd604 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,44 +3,58 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// CVS-ID:      $Id$
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_

 
 

-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "fs_zip.h"

 #endif
 
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/defs.h"

 
 

-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS

 
 

+#include "wx/filesys.h"
+#include "wx/hashmap.h"

 
 

-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
-
-#include <wx/filesys.h>

 
 

+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);

 
 
 
 

-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 // wxZipFSHandler
 // wxZipFSHandler

-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 
 

-class wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler

 {
     public:
 {
     public:

+        wxZipFSHandler();

         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual bool CanOpen(const wxString& location);
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);

+        virtual wxString FindFirst(const wxString& spec, int flags = 0);
+        virtual wxString FindNext();

         ~wxZipFSHandler();
         ~wxZipFSHandler();

+
+    private:
+        // these vars are used by FindFirst/Next:
+        class wxZipInputStream *m_Archive;
+        wxString m_Pattern, m_BaseDir, m_ZipFile;
+        bool m_AllowDirs, m_AllowFiles;
+        wxZipFilenameHashMap *m_DirsFound;
+
+        wxString DoFind();
+        void CloseArchive(class wxZipInputStream *archive);
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)

 };
 
 
 #endif
 };
 
 
 #endif

-  // wxUSE_FS_ZIP && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
+
+#endif // _WX_FS_ZIP_H_