X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc67fd514421c3e6e95c5f21d671eccfe4f1553..4f320d7c57daa1cd4bc86cbe1da1ef1619b22edc:/src/osx/core/bitmap.cpp diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index 331788487f..64d0b39e2d 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -782,11 +782,7 @@ void wxBitmapRefData::Free() m_hBitmap = NULL ; } - if (m_bitmapMask) - { - delete m_bitmapMask; - m_bitmapMask = NULL; - } + wxDELETE(m_bitmapMask); } wxBitmapRefData::~wxBitmapRefData() @@ -1028,7 +1024,7 @@ IconRef wxBitmap::CreateIconRef() const WX_NSImage wxBitmap::GetNSImage() const { wxCFRef< CGImageRef > cgimage(CreateCGImage()); - return wxOSXCreateNSImageFromCGImage( cgimage ); + return wxOSXGetNSImageFromCGImage( cgimage ); } #endif @@ -1038,7 +1034,7 @@ WX_NSImage wxBitmap::GetNSImage() const WX_UIImage wxBitmap::GetUIImage() const { wxCFRef< CGImageRef > cgimage(CreateCGImage()); - return wxOSXCreateUIImageFromCGImage( cgimage ); + return wxOSXGetUIImageFromCGImage( cgimage ); } #endif