X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6418ad5ec8e66c3b367b59b56e0849399774f3ec..b85b06e13d22e7fc1604ec1a49caa1227a1b3d36:/src/msw/statusbar.cpp

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index 6d9ddf992d..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:
@@ -585,7 +598,7 @@ bool wxStatusBar::MSWProcessMessage(WXMSG* pMsg)
     return wxWindow::MSWProcessMessage(pMsg);
 }
 
-bool wxStatusBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM* WXUNUSED(result));
+bool wxStatusBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM* WXUNUSED(result))
 {
     if ( HasFlag(wxSTB_SHOW_TIPS) )
     {