From 28e17b005d48578721c1cd16ae23ea4597d5ca50 Mon Sep 17 00:00:00 2001 From: Catalin Date: Mon, 22 Jun 2015 14:20:15 +0300 Subject: [PATCH] Removed memory leak in the typetest sample. Free the font allocated in DoVariantDemo(). Closes https://github.com/wxWidgets/wxWidgets/pull/42 --- samples/typetest/typetest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index aede98a30f..67528d9789 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -1044,7 +1044,8 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) textCtrl << wxT("var1[") << (int) i << wxT("] (type ") << var1[i].GetType() << wxT(") = ") << var1[i].MakeString() << wxT("\n"); } - var1 = wxVariant(new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT))); + wxFont* sysFont = new wxFont(wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT)); + var1 = wxVariant(sysFont); textCtrl << wxT("var1 = (wxfont)\""); wxFont* font = wxGetVariantCast(var1,wxFont); if (font) @@ -1055,6 +1056,8 @@ void MyApp::DoVariantDemo(wxCommandEvent& WXUNUSED(event) ) { textCtrl << wxT("(null)\"\n"); } + + delete sysFont; } wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)