X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/016b064360b6018058a1c1cff688a055425956b1..7b4a652a8bf3da1b2dd20dd22c9e6db5dd03db59:/include/wx/cocoa/bitmap.h?ds=inline diff --git a/include/wx/cocoa/bitmap.h b/include/wx/cocoa/bitmap.h index 622aab943e..f1e4146d6b 100644 --- a/include/wx/cocoa/bitmap.h +++ b/include/wx/cocoa/bitmap.h @@ -86,6 +86,9 @@ public: // Convert from wxImage: wxBitmap(const wxImage& image, int depth = -1) { CreateFromImage(image, depth); } + // Convert from wxIcon + wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } + // destructor ~wxBitmap(); @@ -125,6 +128,7 @@ public: // raw bitmap access support functions void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); + void UseAlpha(); wxPalette* GetPalette() const; void SetPalette(const wxPalette& palette); @@ -148,6 +152,7 @@ public: // wxCocoa WX_NSBitmapImageRep GetNSBitmapImageRep(); void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep); + WX_NSImage GetNSImage(bool useMask) const; static void InitStandardHandlers() { } static void CleanUpHandlers() { }