X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..a800dc50d47f5ecd1bcba7601f33843c01db9a57:/include/wx/fs_zip.h diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index 33bf95155d..ae111492db 100644 --- 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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "fs_zip.h" #endif @@ -23,14 +23,13 @@ #if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS #include "wx/filesys.h" +#include "wx/hashmap.h" -class WXDLLEXPORT_BASE wxHashTableLong; - -//-------------------------------------------------------------------------------- +//--------------------------------------------------------------------------- // wxZipFSHandler -//-------------------------------------------------------------------------------- +//--------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxZipFSHandler : public wxFileSystemHandler +class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler { public: wxZipFSHandler(); @@ -45,7 +44,7 @@ class WXDLLEXPORT_BASE 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();