second part of Markus' BC++ fix

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index f891349cbf0ba9dc2aad07d98d63f050d6512357..94d10c8f25c4b791271c03a985e1860bff678301 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,6 +3,7 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
+// CVS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -11,22 +12,22 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
-#include <wx/filesys.h>
-
+#include "wx/filesys.h"
 
+class WXDLLEXPORT wxHashTableLong;
 
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
@@ -35,12 +36,24 @@
 class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 {
     public:
+        wxZipFSHandler();
         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();
+        
+    private:
+        // these vars are used by FindFirst/Next:
+        void *m_Archive;
+        wxString m_Pattern, m_BaseDir, m_ZipFile;
+        bool m_AllowDirs, m_AllowFiles;
+        wxHashTableLong *m_DirsFound;
+        
+        wxString DoFind();
 };
 
 
 #endif
-  // wxUSE_FS_ZIP && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS