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

Compilation fix after r75765.

Browse Source 
Forgot to backport ResetAlpha() addition which is used by the code of r75765.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-02 01:46:39 +00:00
parent 374c63b04b
commit fd5114e43c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/bitmap.h
View File

@@ -171,6 +171,7 @@ public:
// disappear in the future // disappear in the future
bool HasAlpha() const; bool HasAlpha() const;
void UseAlpha(); void UseAlpha();
void ResetAlpha();
// support for scaled bitmaps // support for scaled bitmaps
virtual double GetScaleFactor() const { return 1.0; } virtual double GetScaleFactor() const { return 1.0; }

6
src/msw/bitmap.cpp
View File

@@ -1241,6 +1241,12 @@ void wxBitmap::UseAlpha()
GetBitmapData()->m_hasAlpha = true; GetBitmapData()->m_hasAlpha = true;
} }
void wxBitmap::ResetAlpha()
{
if ( GetBitmapData() )
GetBitmapData()->m_hasAlpha = false;
}
bool wxBitmap::HasAlpha() const bool wxBitmap::HasAlpha() const
{ {
return GetBitmapData() && GetBitmapData()->m_hasAlpha; return GetBitmapData() && GetBitmapData()->m_hasAlpha;