From 5834bef2f7dafe5b4f4c91f387f1ef6ec4f5bb16 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 31 Mar 2020 19:24:28 +0200 Subject: [PATCH] Fix memory leaks in wxGrid unit tests Use smart pointers to ensure that various objects are released, as they have to be. --- tests/controls/gridtest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp index 735d571d70..7277ab8817 100644 --- a/tests/controls/gridtest.cpp +++ b/tests/controls/gridtest.cpp @@ -899,7 +899,7 @@ TEST_CASE_METHOD(GridTestCase, "Grid::GetNonDefaultAlignment", "[grid]") // GetNonDefaultAlignment() is used by several renderers having their own // preferred alignment, so check that if we don't reset the alignment // explicitly, it doesn't override the alignment used by default. - wxGridCellAttr* attr = NULL; + wxGridCellAttrPtr attr; int hAlign = wxALIGN_RIGHT, vAlign = wxALIGN_INVALID; @@ -1174,9 +1174,9 @@ TEST_CASE_METHOD(GridTestCase, "Grid::AutoSizeColumn", "[grid]") // Hardcoded extra margin for the columns used in grid.cpp. const int margin = m_grid->FromDIP(10); - wxGridCellAttr *attr = m_grid->GetOrCreateCellAttr(0, 0); - wxGridCellRenderer *renderer = attr->GetRenderer(m_grid, 0, 0); - REQUIRE(renderer != NULL); + wxGridCellAttrPtr attr(m_grid->GetOrCreateCellAttr(0, 0)); + wxGridCellRendererPtr renderer(attr->GetRenderer(m_grid, 0, 0)); + REQUIRE(renderer); wxClientDC dcCell(m_grid->GetGridWindow());