From 7462bddbafe6ed4bd6186c07e6edc43dc16741eb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 1 Jul 2012 11:35:49 +0000 Subject: [PATCH] Fix the use of AutoHBITMAP in recently added LoadImageFromResource(). 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 --- src/common/image.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/image.cpp b/src/common/image.cpp index a3a5f0ada6..5d65ecaa9c 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -2254,7 +2254,7 @@ static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type) if ( type == wxBITMAP_TYPE_BMP_RESOURCE ) { - hBitmap = ::LoadBitmap(wxGetInstance(), name.t_str()); + hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) ); if ( !hBitmap ) { @@ -2278,8 +2278,8 @@ static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type) return wxImage(); } - hBitmap = info.hbmColor; - hMask = info.hbmMask; + hBitmap.Init(info.hbmColor); + hMask.Init(info.hbmMask); } } else if ( type == wxBITMAP_TYPE_CUR_RESOURCE ) -- 2.50.0