No real changes, just clean up wxAbortProc mess.

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 3276be718641f2bcd3302d3ee6a28c916bfdd604..79bf8b5ec2d1ac16c461d294ba35bbff0b310626 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_zip.h
-// Purpose:     ZIP file system
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
+// Name:        wx/fs_zip.h
+// Purpose:     wxZipFSHandler typedef for compatibility
+// Author:      Mike Wetherell
+// Copyright:   (c) 2006 Mike Wetherell

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


@@ -10,51 +10,14 @@
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 

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

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
-
-#include "wx/filesys.h"
-#include "wx/hashmap.h"
-
-
-WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
-
+#if wxUSE_FS_ZIP

 
 

-//---------------------------------------------------------------------------
-// wxZipFSHandler
-//---------------------------------------------------------------------------
+#include "wx/fs_arc.h"

 
 

-class WXDLLIMPEXP_BASE 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();
+typedef wxArchiveFSHandler 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
-  // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
+#endif // wxUSE_FS_ZIP

 
 #endif // _WX_FS_ZIP_H_
 
 #endif // _WX_FS_ZIP_H_

-