Applied patch [ 805147 ] GDI objects are not deselected from DC
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:
@@ -1463,8 +1463,8 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
|
||||
wxLogLastError(wxT("CreateBitmap"));
|
||||
}
|
||||
|
||||
::SelectObject(hdcSrc, hbmpMask);
|
||||
::SelectObject(hdcDst, hbmpInvMask);
|
||||
HGDIOBJ srcTmp = ::SelectObject(hdcSrc, hbmpMask);
|
||||
HGDIOBJ dstTmp = ::SelectObject(hdcDst, hbmpInvMask);
|
||||
if ( !::BitBlt(hdcDst, 0, 0, w, h,
|
||||
hdcSrc, 0, 0,
|
||||
NOTSRCCOPY) )
|
||||
@@ -1472,6 +1472,10 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
|
||||
wxLogLastError(wxT("BitBlt"));
|
||||
}
|
||||
|
||||
// Deselect objects
|
||||
SelectObject(hdcSrc,srcTmp);
|
||||
SelectObject(hdcDst,dstTmp);
|
||||
|
||||
::DeleteDC(hdcSrc);
|
||||
::DeleteDC(hdcDst);
|
||||
|
||||
|
Reference in New Issue
Block a user