Added new stream tests to typetest.

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index f891349cbf0ba9dc2aad07d98d63f050d6512357..fa1ddab430f9a69137afccf6b776872bd3d3f68c 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -3,30 +3,26 @@
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     ZIP file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

+// CVS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma interface "fs_zip.h"

 #endif
 
 #endif
 

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

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 
 #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"

 
 

+class WXDLLEXPORT wxHashTableLong;

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


@@ -35,12 +31,24 @@
 class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 {
     public:
 class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
 {
     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;
+        wxHashTableLong *m_DirsFound;
+
+        wxString DoFind();

 };
 
 
 #endif
 };
 
 
 #endif

-  // wxUSE_FS_ZIP && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS