moved wxDash typedef to gdicmn.h

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index e3461634b8df6361dcf7e350a41c861e8d598ac5..b884fe055b55116de7980e18a02a737c18180e6a 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS

 
 
 #ifndef WXPRECOMP
 
 
 #ifndef WXPRECOMP


@@ -33,12 +33,23 @@
 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;
+        
+        wxString DoFind();

 };
 
 
 #endif
 };
 
 
 #endif

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