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 73f404a8888452a27aeef80811ac47be59e59bab..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
 
 #pragma implementation "fs_zip.h"
 #endif
 


@@ -151,7 +151,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
 
     m_ZipFile = left;
     wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
 
     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('/'));
 
     m_Pattern = right.AfterLast(wxT('/'));
     m_BaseDir = right.BeforeLast(wxT('/'));
 


@@ -196,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 = '/';
     {
         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)
         {
 
         if (m_AllowDirs)
         {


@@ -208,7 +208,7 @@ wxString wxZipFSHandler::DoFind()
                 wxLongToLongHashMap::iterator it = m_DirsFound->find(key);
                 if (it == m_DirsFound->end())
                 {
                 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 &&
                     filename = dir.AfterLast(wxT('/'));
                     dir = dir.BeforeLast(wxT('/'));
                     if (!filename.IsEmpty() && m_BaseDir == dir &&