From af2e6a4295d005d80eaec92aade434ef7f54fd4a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 2 Oct 2002 13:42:23 +0000 Subject: [PATCH] Applied patch [ 613113 ] "GDI Object" leak in wxOwnerDraw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ownerdrw.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 40aad406ba..03519026bc 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -241,8 +241,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, FillRect(hdc, &rectFill, hbr); - DeleteObject(hbr); - // use default font if no font set HFONT hfont; if ( m_font.Ok() ) { @@ -278,6 +276,8 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, (void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevFont); (void)SetBkMode(hdc, nPrevMode); + + DeleteObject(hbr); #else dc.SetFont(GetFont()); dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y);