From 595a9945b55688421896a3bc24ff6b76cdb8f872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Tue, 26 Feb 2019 23:13:12 +0200 Subject: [PATCH] Do not leak the list of panes --- include/wx/qt/statusbar.h | 4 +++- src/qt/statusbar.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/qt/statusbar.h b/include/wx/qt/statusbar.h index 7e89426d25..7d289327fc 100644 --- a/include/wx/qt/statusbar.h +++ b/include/wx/qt/statusbar.h @@ -10,6 +10,8 @@ #include "wx/statusbr.h" +#include + class QLabel; class QStatusBar; @@ -45,7 +47,7 @@ private: void UpdateFields(); QStatusBar *m_qtStatusBar; - QList< QLabel* > *m_qtPanes; + QScopedPointer< QList > m_qtPanes; // should this really be a pointer? wxDECLARE_DYNAMIC_CLASS(wxStatusBar); }; diff --git a/src/qt/statusbar.cpp b/src/qt/statusbar.cpp index cbf8664d89..fa30dbb23a 100644 --- a/src/qt/statusbar.cpp +++ b/src/qt/statusbar.cpp @@ -48,7 +48,7 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID WXUNUSED(winid), long style, const wxString& WXUNUSED(name)) { m_qtStatusBar = new wxQtStatusBar( parent, this ); - m_qtPanes = new QList < QLabel* >; + m_qtPanes.reset(new QList()); if ( style & wxSTB_SIZEGRIP ) m_qtStatusBar->setSizeGripEnabled(true); @@ -106,7 +106,6 @@ void wxStatusBar::Refresh( bool eraseBackground, const wxRect *rect ) void wxStatusBar::Init() { m_qtStatusBar = NULL; - m_qtPanes = NULL; } void wxStatusBar::UpdateFields()