// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// CVS-ID: $Id$
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "fs_zip.h"
#endif
#include "wx/log.h"
#endif
-#include "wx/hashmap.h"
#include "wx/filesys.h"
#include "wx/zipstrm.h"
#include "wx/fs_zip.h"
#include "unzip.h"
#endif
-WX_DECLARE_EXPORTED_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual,
- wxLongToLongHashMap );
-
//----------------------------------------------------------------------------
// wxZipFSHandler
//----------------------------------------------------------------------------
m_ZipFile = left;
wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
- m_Archive = (void*) unzOpen(nativename.mb_str());
+ m_Archive = (void*) unzOpen(nativename.mb_str(wxConvFile));
m_Pattern = right.AfterLast(wxT('/'));
m_BaseDir = right.BeforeLast(wxT('/'));
{
unzGetCurrentFileInfo((unzFile)m_Archive, NULL, namebuf, 1024, NULL, 0, NULL, 0);
for (c = namebuf; *c; c++) if (*c == '\\') *c = '/';
- namestr = wxString::FromAscii( namebuf ); // TODO what encoding does ZIP use?
+ namestr = wxString::FromAscii(namebuf); // TODO what encoding does ZIP use?
if (m_AllowDirs)
{
wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
if (it == m_DirsFound->end())
{
- m_DirsFound[key] = 1;
+ (*m_DirsFound)[key] = 1;
filename = dir.AfterLast(wxT('/'));
dir = dir.BeforeLast(wxT('/'));
if (!filename.IsEmpty() && m_BaseDir == dir &&