avoid a bug in Carbon headers

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

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 33bf95155d1a88b9372850d05f343565ceab9ef5..a17141d9672f50a6d04229821ecde3eee7884a35 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -10,7 +10,7 @@
 #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__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "fs_zip.h"
 #endif
 
 #pragma interface "fs_zip.h"
 #endif
 


@@ -24,13 +24,13 @@
 
 #include "wx/filesys.h"
 
 
 #include "wx/filesys.h"
 

-class WXDLLEXPORT_BASE wxHashTableLong;
+class WXDLLIMPEXP_BASE wxLongToLongHashMap;

 
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 // wxZipFSHandler
 //--------------------------------------------------------------------------------
 

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

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


@@ -45,7 +45,7 @@ class WXDLLEXPORT_BASE wxZipFSHandler : public wxFileSystemHandler
         void *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;
         void *m_Archive;
         wxString m_Pattern, m_BaseDir, m_ZipFile;
         bool m_AllowDirs, m_AllowFiles;

-        wxHashTableLong *m_DirsFound;
+        wxLongToLongHashMap *m_DirsFound;

 
         wxString DoFind();
 
 
         wxString DoFind();