merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -85,7 +85,12 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
                            GetAnchor(location),
                            wxDateTime(wxFileModificationTime(left)));
    }
-    else return NULL;
+    else
+    {
+        if (s)
+            delete s;
+        return NULL;
+    }
 }


@@ -113,7 +118,7 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
    }

    m_ZipFile = left;
-    m_Archive = (void*) unzOpen(m_ZipFile.fn_str());
+    m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
    m_Pattern = right.AfterLast(wxT('/'));
    m_BaseDir = right.BeforeLast(wxT('/'));