From 1c786fa848a69b5c2338bbb5e0b6587e026e32c3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 11 Dec 2007 23:00:15 +0000 Subject: [PATCH] don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpwnd.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp index 9cf872577c..69c8418644 100644 --- a/src/html/helpwnd.cpp +++ b/src/html/helpwnd.cpp @@ -315,17 +315,6 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id, { m_hfStyle = helpStyle; - wxImageList *ContentsImageList = new wxImageList(16, 16); - ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK, - wxART_HELP_BROWSER, - wxSize(16, 16))); - ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER, - wxART_HELP_BROWSER, - wxSize(16, 16))); - ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE, - wxART_HELP_BROWSER, - wxSize(16, 16))); - // Do the config in two steps. We read the HtmlWindow customization after we // create the window. if (m_Config) @@ -365,7 +354,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id, #ifdef __WXMSW__ wxBorder htmlWindowBorder = GetThemedBorderStyle(); if (htmlWindowBorder == wxBORDER_SUNKEN) - htmlWindowBorder = wxBORDER_SIMPLE; + htmlWindowBorder = wxBORDER_SIMPLE; #else wxBorder htmlWindowBorder = wxBORDER_SIMPLE; #endif @@ -459,6 +448,17 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id, #endif ); + wxImageList *ContentsImageList = new wxImageList(16, 16); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK, + wxART_HELP_BROWSER, + wxSize(16, 16))); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER, + wxART_HELP_BROWSER, + wxSize(16, 16))); + ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE, + wxART_HELP_BROWSER, + wxSize(16, 16))); + m_ContentsBox->AssignImageList(ContentsImageList); topsizer->Add(m_ContentsBox, 1,