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

Add RAII AutoIconInfo class wrapping ICONINFO Windows struct.

Browse Source 
This ensures that we never forget to delete the handles returned by
GetIconInfo() and also centralizes the error message given if it fails in a
single place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-11-11 01:02:40 +00:00
parent e8a5baf061
commit 261e7eac73
6 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/msw/bitmap.cpp
View File

@@ -488,13 +488,9 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
// it may be either HICON or HCURSOR
HICON hicon = (HICON)icon.GetHandle();
ICONINFO iconInfo;
if ( !::GetIconInfo(hicon, &iconInfo) )
{
wxLogLastError(wxT("GetIconInfo"));
AutoIconInfo iconInfo;
if ( !iconInfo.GetFrom(hicon) )
return false;
}
wxBitmapRefData *refData = new wxBitmapRefData;
m_refData = refData;
@@ -508,6 +504,10 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
refData->m_height = h;
refData->m_depth = wxDisplayDepth();
refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
// Reset this field to prevent it from being destroyed by AutoIconInfo,
// we took ownership of it.
iconInfo.hbmColor = 0;
}
else // we only have monochrome icon/cursor
{
@@ -568,7 +568,7 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
// alpha, so check for this.
{
HBITMAP hdib = 0;
if ( CheckAlpha(iconInfo.hbmColor, &hdib) )
if ( CheckAlpha(refData->m_hBitmap, &hdib) )
refData->Set32bppHDIB(hdib);
}
break;
@@ -586,9 +586,6 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
refData->SetMask(wxInvertMask(iconInfo.hbmMask, w, h));
}
// delete the old one now as we don't need it any more
::DeleteObject(iconInfo.hbmMask);
return true;
#else // __WXMICROWIN__ || __WXWINCE__
wxUnusedVar(icon);