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

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

diff --git a/docs/changes.txt b/docs/changes.txt
index e76ac4f83301f7f3dcf1d9daa9be92de7a5ee719..b7480f9fc4b691b3452262bb668ae8317fed5732 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -9,6 +9,7 @@ All:
 
 - Fixed wxScopeGuard to work with VC++, documented it.
 - Fixed proxy handling in wxURL.
 
 - Fixed wxScopeGuard to work with VC++, documented it.
 - Fixed proxy handling in wxURL.

+- Added wxZipFSHandler::Cleanup() (Stas Sergeev)

 
 All (GUI):
 
 
 All (GUI):
 

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index 3293151b121e9ec0c19c6354d04f9f301fc3db38..58ff653e8af4a5e2c09fa6fe2a239bdc71a093bf 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/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();
         virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
         virtual wxString FindFirst(const wxString& spec, int flags = 0);
         virtual wxString FindNext();

+        void Cleanup();

         ~wxZipFSHandler();
 
     private:
         ~wxZipFSHandler();
 
     private:

diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp
index d2b6100cc2086cc76b4910cf39b340375015d1e5..225159473b6ecf79701c717167bccdcc4d25fa13 100644 (file)
--- a/src/common/fs_zip.cpp
+++ b/src/common/fs_zip.cpp
@@ -71,13 +71,17 @@ wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler()
 
 wxZipFSHandler::~wxZipFSHandler()
 {
 
 wxZipFSHandler::~wxZipFSHandler()
 {

-    if (m_Archive)
-        delete m_Archive;
-    if (m_DirsFound)
-        delete m_DirsFound;
+    Cleanup();

 }
 
 
 }
 
 

+void wxZipFSHandler::Cleanup()
+{
+    wxDELETE(m_Archive);
+    wxDELETE(m_DirsFound);
+}
+ 
+

 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {
 
 bool wxZipFSHandler::CanOpen(const wxString& location)
 {

diff --git a/version-script.in b/version-script.in
index 42526223b0e67f4fdfd25980d15d6a44561fe000..cad768c7cc8339dce68ea5e5d0a696b6c5749e65 100644 (file)
--- a/version-script.in
+++ b/version-script.in
@@ -6,20 +6,21 @@
 #       new development branch.
 
 
 #       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:
 
 @WX_VERSION_TAG@.2 {
     global:

+        *wxDialog*GetEscapeId*;

         *wxLogBuffer*;
         *wxLogBuffer*;

+        *wxGenericListCtrl*SetItemFont*wxFont*;
+        *wxGenericListCtrl*GetItemFont*;

         *wxMessageOutputBest*;
         *wxMessageOutputBest*;

-        *wxDialog*GetEscapeId*;
+        *wxShadowObject*;

         *wxWizard*FinishLayout*;
         *wxXmlResource*ConvertFileNameToURL*wxString*;
         *wxWizard*FinishLayout*;
         *wxXmlResource*ConvertFileNameToURL*wxString*;

-        *wxXmlResource*Unload*wxString*;

         *wxXmlResource*IsArchive*wxString*;
         *wxXmlResource*IsArchive*wxString*;

-        *wxShadowObject*;
-        *wxGenericListCtrl*SetItemFont*wxFont*;
-        *wxGenericListCtrl*GetItemFont*;
+        *wxXmlResource*Unload*wxString*;
+        *wxZipFSHandler*Cleanup*;

 };
 
 
 };