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 f891349cbf0ba9dc2aad07d98d63f050d6512357..79bf8b5ec2d1ac16c461d294ba35bbff0b310626 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -1,46 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fs_zip.h
-// Purpose:     ZIP file system
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Name:        wx/fs_zip.h
+// Purpose:     wxZipFSHandler typedef for compatibility
+// Author:      Mike Wetherell
+// Copyright:   (c) 2006 Mike Wetherell
+// CVS-ID:      $Id$
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "wx/defs.h"
 
-#include <wx/wxprec.h>
+#if wxUSE_FS_ZIP
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
+#include "wx/fs_arc.h"
 
-#if wxUSE_FS_ZIP && wxUSE_STREAMS
+typedef wxArchiveFSHandler wxZipFSHandler;
 
+#endif // wxUSE_FS_ZIP
 
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
-
-#include <wx/filesys.h>
-
-
-
-//--------------------------------------------------------------------------------
-// wxZipFSHandler
-//--------------------------------------------------------------------------------
-
-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
-{
-    public:
-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-        ~wxZipFSHandler();
-};
-
-
-#endif
-  // wxUSE_FS_ZIP && wxUSE_STREAMS
-
+#endif // _WX_FS_ZIP_H_