From b0470eb91d7788c45c169964b294c3faad4c3c56 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 25 Jun 2017 13:55:06 +0200 Subject: [PATCH] Bring OSX API in sync with MSW --- include/wx/osx/bitmap.h | 2 +- src/osx/core/bitmap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index 200d5a26fa..f5cec1dac4 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -177,7 +177,7 @@ public: // these functions are internal and shouldn't be used, they risk to // disappear in the future bool HasAlpha() const; - void UseAlpha(); + void UseAlpha(bool use = true); // returns the 'native' implementation, a GWorldPtr for the content and one for the mask WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const; diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index c2fa882ced..46eeb49c23 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -1867,9 +1867,9 @@ void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(dataBase)) EndRawAccess() ; } -void wxBitmap::UseAlpha() +void wxBitmap::UseAlpha(bool use ) { // remember that we are using alpha channel: // we'll need to create a proper mask in UngetRawData() - M_BITMAPDATA->UseAlpha( true ); + M_BITMAPDATA->UseAlpha( use ); }