X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/778adf4c30bcab4a8a4822975eeed6c88fb43006..1b88c4e4a6ee616da3309e28b7500fa80fbd5240:/src/msw/statusbar.cpp?ds=sidebyside

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index b057c0e260..72da7d9980 100644
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -108,7 +108,7 @@ bool wxStatusBar::Create(wxWindow *parent,
     m_hWnd = CreateWindow
              (
                 STATUSCLASSNAME,
-                _T(""),
+                wxT(""),
                 wstyle,
                 0, 0, 0, 0,
                 GetHwndOf(parent),
@@ -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);
 }
 
@@ -173,14 +183,17 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     wxStatusBarBase::SetFieldsCount(nFields, widths);
 
     SetFieldsWidth();
-    
+
     // keep in synch also our m_tooltips array
 
     // 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:
@@ -223,7 +236,9 @@ void wxStatusBar::SetFieldsWidth()
     }
 
     if ( !StatusBar_SetParts(GetHwnd(), m_panes.GetCount(), pWidths) )
+    {
         wxLogLastError("StatusBar_SetParts");
+    }
 
     delete [] pWidths;
 
@@ -296,22 +311,24 @@ void wxStatusBar::UpdateFieldText(int nField)
     }
     else
     {
-        text = wxControl::Ellipsize(text, 
+        text = wxControl::Ellipsize(text,
                                      *m_pDC,
                                      ellmode,
                                      maxWidth,
                                      wxELLIPSIZE_EXPAND_TAB);
-        
-        // update the ellipsization status for this pane; this is used later to 
-        // decide whether a tooltip should be shown or not for this pane 
+
+        // update the ellipsization status for this pane; this is used later to
+        // decide whether a tooltip should be shown or not for this pane
         // (if we have wxSTB_SHOW_TIPS)
         SetEllipsizedFlag(nField, text != GetStatusText(nField));
     }
 
-    // Set the status text in the native control passing both field number and style. 
+    // Set the status text in the native control passing both field number and style.
     // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
     if ( !StatusBar_SetText(GetHwnd(), nField | style, text.wx_str()) )
+    {
         wxLogLastError("StatusBar_SetText");
+    }
 
     if (HasFlag(wxSTB_SHOW_TIPS))
     {
@@ -375,7 +392,9 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
 
     RECT r;
     if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
+    {
         wxLogLastError("SendMessage(SB_GETRECT)");
+    }
 
 #if wxUSE_UXTHEME
     wxUxThemeHandle theme(const_cast<wxStatusBar*>(this), L"Status");
@@ -501,11 +520,13 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[])
         }
 
         // The SB_SETTEXT message is both used to set the field's text as well as
-        // the fields' styles. 
+        // the fields' styles.
         // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
         wxString text = GetStatusText(i);
         if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str()))
+        {
             wxLogLastError("StatusBar_SetText");
+        }
     }
 }