added wxZipFSHandler::Cleanup() (modified patch 1213615)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -9,6 +9,7 @@ All:
 
 - Fixed wxScopeGuard to work with VC++, documented it.
 - Fixed proxy handling in wxURL.
+- Added wxZipFSHandler::Cleanup() (Stas Sergeev)
 
 All (GUI):
 

include/wx/fs_zip.h

@@ -37,6 +37,7 @@ class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();
+        void Cleanup();
         ~wxZipFSHandler();
 
     private:

src/common/fs_zip.cpp

@@ -71,13 +71,17 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 
 wxZipFSHandler::~wxZipFSHandler()
 {
-    if (m_Archive)
+    Cleanup();
-        delete m_Archive;
-    if (m_DirsFound)
-        delete m_DirsFound;
 }
 
 
+void wxZipFSHandler::Cleanup()
+{
+    wxDELETE(m_Archive);
+    wxDELETE(m_DirsFound);
+}
+ 
+
 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {

version-script.in

@@ -6,20 +6,21 @@
 #       new development branch.
 
 
-# public symbols added in release 2.6.2:
+# public symbols added in release 2.6.2 (please keep in alphabetical order):
 
 @WX_VERSION_TAG@.2 {
     global:
-        *wxLogBuffer*;
-        *wxMessageOutputBest*;
         *wxDialog*GetEscapeId*;
-        *wxWizard*FinishLayout*;
+        *wxLogBuffer*;
-        *wxXmlResource*ConvertFileNameToURL*wxString*;
-        *wxXmlResource*Unload*wxString*;
-        *wxXmlResource*IsArchive*wxString*;
-        *wxShadowObject*;
         *wxGenericListCtrl*SetItemFont*wxFont*;
         *wxGenericListCtrl*GetItemFont*;
+        *wxMessageOutputBest*;
+        *wxShadowObject*;
+        *wxWizard*FinishLayout*;
+        *wxXmlResource*ConvertFileNameToURL*wxString*;
+        *wxXmlResource*IsArchive*wxString*;
+        *wxXmlResource*Unload*wxString*;
+        *wxZipFSHandler*Cleanup*;
 };