second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -85,12 +85,9 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
                            GetAnchor(location),
                            wxDateTime(wxFileModificationTime(left)));
    }
-    else
-    {
-        if (s)
-            delete s;
-        return NULL;
-    }
+
+    delete s;
+    return NULL;
 }