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

Compilation fix for wxUSE_IMAGE==0 wxMSW build.

Browse Source 
Declare the variable used in any case outside of wxUSE_IMAGE-only block.

See #2609.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-18 15:13:04 +00:00
parent f1aac9d707
commit 0181aaf822
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/imaglist.cpp
View File

@@ -142,6 +142,7 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask) int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
{ {
HBITMAP hbmp; HBITMAP hbmp;
bool useMask;
#if wxUSE_WXDIB && wxUSE_IMAGE #if wxUSE_WXDIB && wxUSE_IMAGE
// wxBitmap normally stores alpha in pre-multiplied format but // wxBitmap normally stores alpha in pre-multiplied format but
@@ -150,7 +151,6 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
// course, very inefficient but it's better than wrong appearance so we do // course, very inefficient but it's better than wrong appearance so we do
// this for now until a better way can be found. // this for now until a better way can be found.
AutoHBITMAP hbmpRelease; AutoHBITMAP hbmpRelease;
bool useMask;
if ( bitmap.HasAlpha() ) if ( bitmap.HasAlpha() )
{ {
wxImage img = bitmap.ConvertToImage(); wxImage img = bitmap.ConvertToImage();