*** empty log message ***

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index f891349cbf0ba9dc2aad07d98d63f050d6512357..6dc75eb25cf8d173d4014e59833e6dad4cce4a31 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,44 +3,53 @@
 // 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
-
-
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
-
-#include <wx/filesys.h>
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS

 
 

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

 
 

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

 // wxZipFSHandler
 // wxZipFSHandler

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

 
 

-class WXDLLEXPORT 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:
+        void *m_Archive;
+        wxString m_Pattern, m_BaseDir, m_ZipFile;
+        bool m_AllowDirs, m_AllowFiles;
+        wxLongToLongHashMap *m_DirsFound;
+
+        wxString DoFind();
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)

 };
 
 
 #endif
 };
 
 
 #endif

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