X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d1f22e7c2002395cc609c1b51fe8351cfef2186..9b12bd993b5151d9c67e2dd2bce6e0ac258fb797:/src/common/fs_zip.cpp diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp index d322d77547..59c7df889d 100644 --- a/src/common/fs_zip.cpp +++ b/src/common/fs_zip.cpp @@ -26,7 +26,6 @@ #include "wx/log.h" #endif -#include "wx/hashmap.h" #include "wx/filesys.h" #include "wx/zipstrm.h" #include "wx/fs_zip.h" @@ -38,9 +37,6 @@ #include "unzip.h" #endif -WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); - //---------------------------------------------------------------------------- // wxZipFSHandler //---------------------------------------------------------------------------- @@ -151,7 +147,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags) m_ZipFile = left; wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath(); - m_Archive = (void*) unzOpen(nativename.fn_str()); + m_Archive = (void*) unzOpen(nativename.mb_str(wxConvFile)); m_Pattern = right.AfterLast(wxT('/')); m_BaseDir = right.BeforeLast(wxT('/'));