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

Fix the use of AutoHBITMAP in recently added LoadImageFromResource().

Browse Source 
Assignment operator of AutoHBITMAP doesn't work as expected (and probably
should be removed/fixed), avoid its use by explicitly calling Init().

Closes #14425.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-01 11:35:49 +00:00
parent d01ec0965c
commit 7462bddbaf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/image.cpp
View File

@@ -2254,7 +2254,7 @@ static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)
if ( type == wxBITMAP_TYPE_BMP_RESOURCE ) if ( type == wxBITMAP_TYPE_BMP_RESOURCE )
{ {
hBitmap = ::LoadBitmap(wxGetInstance(), name.t_str()); hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) );
if ( !hBitmap ) if ( !hBitmap )
{ {
@@ -2278,8 +2278,8 @@ static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)
return wxImage(); return wxImage();
} }
hBitmap = info.hbmColor; hBitmap.Init(info.hbmColor);
hMask = info.hbmMask; hMask.Init(info.hbmMask);
} }
} }
else if ( type == wxBITMAP_TYPE_CUR_RESOURCE ) else if ( type == wxBITMAP_TYPE_CUR_RESOURCE )