X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ca21fe7bfda18e2da4e17eb529c4dfa0c824db2..f86190702bb433f139dc2c335e2c551755def81f:/src/osx/core/bitmap.cpp?ds=sidebyside diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index 1161256016..da236465dd 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -939,6 +939,11 @@ wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, i (void) Create(data, type, width, height, depth); } +wxBitmap::wxBitmap(int width, int height, const wxDC& WXUNUSED(dc)) +{ + (void) Create(width, height); +} + wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type) { LoadFile(filename, type); @@ -1005,6 +1010,17 @@ IconRef wxBitmap::CreateIconRef() const #if wxOSX_USE_COCOA +wxBitmap::wxBitmap(WX_NSImage image) +{ + (void)Create(image); +} + +bool wxBitmap::Create(WX_NSImage image) +{ + wxCFRef cgimage(wxOSXCreateCGImageFromNSImage(image)); + return Create(cgimage); +} + WX_NSImage wxBitmap::GetNSImage() const { wxCFRef< CGImageRef > cgimage(CreateCGImage()); @@ -1102,7 +1118,6 @@ bool wxBitmap::Create(int w, int h, int d) return M_BITMAPDATA->IsOk() ; } - bool wxBitmap::Create(CGImageRef image) { UnRef();