use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

[wxWidgets.git] / src / common / fs_zip.cpp

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index 4d9d3aa3c5ae346c25b8e5decb315038cd7480fc..8c928d263af2e2817fba4017d9d9312ed9a80541 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -9,7 +9,7 @@
 
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "fs_zip.h"
 #endif
 
@@ -26,7 +26,7 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/hash.h"
+#include "wx/hashmap.h"
 #include "wx/filesys.h"
 #include "wx/zipstrm.h"
 #include "wx/fs_zip.h"
@@ -38,6 +38,8 @@
 #include "unzip.h"
 #endif
 
+WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
+                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
 
 //----------------------------------------------------------------------------
 // wxZipFSHandler
@@ -149,7 +151,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     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('/'));
 
@@ -165,7 +167,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
             if (m_AllowDirs)
             {
                 delete m_DirsFound;
-                m_DirsFound = new wxHashTableLong();
+                m_DirsFound = new wxLongToLongHashMap();
             }
             return DoFind();
         }
@@ -194,7 +196,7 @@ wxString wxZipFSHandler::DoFind()
     {
         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)
         {
@@ -203,9 +205,10 @@ wxString wxZipFSHandler::DoFind()
             {
                 long key = 0;
                 for (size_t i = 0; i < dir.Length(); i++) key += (wxUChar)dir[i];
-                if (m_DirsFound->Get(key) == wxNOT_FOUND)
+                wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
+                if (it == m_DirsFound->end())
                 {
-                    m_DirsFound->Put(key, 1);
+                    (*m_DirsFound)[key] = 1;
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&