From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Thu, 28 May 2009 20:31:38 +0000 (+0000)
Subject: avoid leaking allocated tooltips
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/421962befc8d6b340e9c2d6201cf73574319409d

avoid leaking allocated tooltips

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

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index b057c0e260..c8921219cb 100644
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -153,6 +153,16 @@ wxStatusBar::~wxStatusBar()
     // occupy
     PostSizeEventToParent();
 
+    // delete existing tooltips
+    for (size_t i=0; i<m_tooltips.size(); i++)
+    {
+        if (m_tooltips[i])
+        {
+            delete m_tooltips[i];
+            m_tooltips[i] = NULL;
+        }
+    }
+
     wxDELETE(m_pDC);
 }
 
@@ -179,8 +189,11 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
-        delete m_tooltips[i];
-        m_tooltips[i] = NULL;
+        if (m_tooltips[i])
+        {
+            delete m_tooltips[i];
+            m_tooltips[i] = NULL;
+        }
     }
 
     // shrink/expand the array: