From fd5114e43cd986d454a5e03cdf1ac074842632f1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 2 Feb 2014 01:46:39 +0000 Subject: [PATCH] Compilation fix after r75765. 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 --- include/wx/msw/bitmap.h | 1 + src/msw/bitmap.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index a79d497587..c677af8ca3 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -171,6 +171,7 @@ public: // disappear in the future bool HasAlpha() const; void UseAlpha(); + void ResetAlpha(); // support for scaled bitmaps virtual double GetScaleFactor() const { return 1.0; } diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index be45716e64..44a236defa 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -1241,6 +1241,12 @@ void wxBitmap::UseAlpha() GetBitmapData()->m_hasAlpha = true; } +void wxBitmap::ResetAlpha() +{ + if ( GetBitmapData() ) + GetBitmapData()->m_hasAlpha = false; +} + bool wxBitmap::HasAlpha() const { return GetBitmapData() && GetBitmapData()->m_hasAlpha;