Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 613113 ] "GDI Object" leak in wxOwnerDraw

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-10-02 13:42:23 +00:00
parent 6397b59b65
commit af2e6a4295
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/ownerdrw.cpp
View File

@@ -241,8 +241,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
FillRect(hdc, &rectFill, hbr); FillRect(hdc, &rectFill, hbr);
DeleteObject(hbr);
// use default font if no font set // use default font if no font set
HFONT hfont; HFONT hfont;
if ( m_font.Ok() ) { if ( m_font.Ok() ) {
@@ -278,6 +276,8 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
(void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevBrush);
(void)SelectObject(hdc, hPrevFont); (void)SelectObject(hdc, hPrevFont);
(void)SetBkMode(hdc, nPrevMode); (void)SetBkMode(hdc, nPrevMode);
DeleteObject(hbr);
#else #else
dc.SetFont(GetFont()); dc.SetFont(GetFont());
dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y); dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y);