we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 94d10c8f25c4b791271c03a985e1860bff678301..3276be718641f2bcd3302d3ee6a28c916bfdd604 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,36 +4,32 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // CVS-ID:      $Id$

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_

 
 

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

 #endif
 
 #endif
 

-#include "wx/wxprec.h"
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 

+#include "wx/filesys.h"
+#include "wx/hashmap.h"

 
 

-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif

 
 

-#include "wx/filesys.h"
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);

 
 

-class WXDLLEXPORT wxHashTableLong;

 
 

-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 // wxZipFSHandler
 // wxZipFSHandler

-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler

 {
     public:
         wxZipFSHandler();
 {
     public:
         wxZipFSHandler();


@@ -42,18 +38,23 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
         ~wxZipFSHandler();
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
         ~wxZipFSHandler();

-        
+

     private:
         // these vars are used by FindFirst/Next:
     private:
         // these vars are used by FindFirst/Next:

-        void *m_Archive;
+        class wxZipInputStream *m_Archive;

         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

-        wxHashTableLong *m_DirsFound;
-        
+        wxZipFilenameHashMap *m_DirsFound;
+

         wxString DoFind();
         wxString DoFind();

+        void CloseArchive(class wxZipInputStream *archive);
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)

 };
 
 
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 };
 
 
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 

+#endif // _WX_FS_ZIP_H_
+