implement support for returning several elements at once from IEnumFORMATETC (part...

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 94d10c8f25c4b791271c03a985e1860bff678301..938a091e5edb161b5bf106476872580b42078068 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -7,33 +7,30 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_FS_ZIP_H_
+#define _WX_FS_ZIP_H_
 
-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "fs_zip.h"
 #endif
 
 #include "wx/wxprec.h"
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
-
-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "wx/filesys.h"
 
-class WXDLLEXPORT wxHashTableLong;
+class WXDLLIMPEXP_BASE wxLongToLongHashMap;
 
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------
 
-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {
     public:
         wxZipFSHandler();
@@ -42,18 +39,22 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         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;
-        
+        wxLongToLongHashMap *m_DirsFound;
+
         wxString DoFind();
+
+    DECLARE_NO_COPY_CLASS(wxZipFSHandler)
 };
 
 
 #endif
   // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
+#endif // _WX_FS_ZIP_H_
+