X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..591d01bebacf365a654a9061cddeb7fae617a2f5:/include/wx/fs_zip.h?ds=sidebyside

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index fa1ddab430..6dc75eb25c 100644
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -4,31 +4,28 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "fs_zip.h"
 #endif
 
-#include "wx/wxprec.h"
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS
 
 #include "wx/filesys.h"
+#include "wx/hashmap.h"
 
-class WXDLLEXPORT wxHashTableLong;
-
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 // wxZipFSHandler
-//--------------------------------------------------------------------------------
+//---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
 {
     public:
         wxZipFSHandler();
@@ -43,12 +40,16 @@ class WXDLLEXPORT wxZipFSHandler : public wxFileSystemHandler
         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_
+