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

Bring OSX API in sync with MSW

Browse Source
This commit is contained in:
Stefan Csomor
2017-06-25 13:55:06 +02:00
parent 81dfa2ae04
commit b0470eb91d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/bitmap.h
View File

@@ -177,7 +177,7 @@ public:
// these functions are internal and shouldn't be used, they risk to // these functions are internal and shouldn't be used, they risk to
// disappear in the future // disappear in the future
bool HasAlpha() const; bool HasAlpha() const;
void UseAlpha(); void UseAlpha(bool use = true);
// returns the 'native' implementation, a GWorldPtr for the content and one for the mask // returns the 'native' implementation, a GWorldPtr for the content and one for the mask
WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const; WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const;

4
src/osx/core/bitmap.cpp
View File

@@ -1867,9 +1867,9 @@ void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(dataBase))
EndRawAccess() ; EndRawAccess() ;
} }
void wxBitmap::UseAlpha() void wxBitmap::UseAlpha(bool use )
{ {
// remember that we are using alpha channel: // remember that we are using alpha channel:
// we'll need to create a proper mask in UngetRawData() // we'll need to create a proper mask in UngetRawData()
M_BITMAPDATA->UseAlpha( true ); M_BITMAPDATA->UseAlpha( use );
} }