Reapply wxWeakRef patch again

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 0678587f36d9ec41869806ebb55c278b8ed9e2c7..79bf8b5ec2d1ac16c461d294ba35bbff0b310626 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -1,58 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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$
 // CVS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FS_ZIP_H_
 #define _WX_FS_ZIP_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "fs_zip.h"
-#endif
+#include "wx/defs.h"

 
 

-#include "wx/wxprec.h"
+#if wxUSE_FS_ZIP

 
 

-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/fs_arc.h"

 
 

-#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
+typedef wxArchiveFSHandler wxZipFSHandler;

 
 

-#include "wx/filesys.h"
-
-class WXDLLEXPORT wxHashTableLong;
-
-//--------------------------------------------------------------------------------
-// wxZipFSHandler
-//--------------------------------------------------------------------------------
-
-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_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
+#endif // wxUSE_FS_ZIP

 
 #endif // _WX_FS_ZIP_H_
 
 #endif // _WX_FS_ZIP_H_

-