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

Applied patch [ 805147 ] GDI objects are not deselected from DC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-12 16:08:47 +00:00
parent 3dd0697400
commit f8480f281c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/bitmap.cpp
View File

@@ -1463,8 +1463,8 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
wxLogLastError(wxT("CreateBitmap")); wxLogLastError(wxT("CreateBitmap"));
} }
::SelectObject(hdcSrc, hbmpMask); HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
::SelectObject(hdcDst, hbmpInvMask); HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);
if ( !::BitBlt(hdcDst, 0, 0, w, h, if ( !::BitBlt(hdcDst, 0, 0, w, h,
hdcSrc, 0, 0, hdcSrc, 0, 0,
NOTSRCCOPY) ) NOTSRCCOPY) )
@@ -1472,6 +1472,10 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
wxLogLastError(wxT("BitBlt")); wxLogLastError(wxT("BitBlt"));
} }
// Deselect objects
SelectObject(hdcSrc,srcTmp);
SelectObject(hdcDst,dstTmp);
::DeleteDC(hdcSrc); ::DeleteDC(hdcSrc);
::DeleteDC(hdcDst); ::DeleteDC(hdcDst);