From: David Elliott Date: Sun, 11 Apr 2004 03:25:14 +0000 (+0000) Subject: wxIcon::CopyFromBitmap: X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/be2e301fc079bfc94e2f03448d25c942bad4732b wxIcon::CopyFromBitmap: 1. retain NSImage from bitmap.GetNSImage (since it is alloc/autoreleased) 2. Use a wxAutoNSAutoreleasePool git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index 5299b5a645..f3cb56d6d7 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -15,6 +15,8 @@ #endif //WX_PRECOMP #include "wx/bitmap.h" +#include "wx/cocoa/autorelease.h" + #import // ======================================================================== @@ -122,7 +124,8 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap) m_refData = new wxIconRefData; M_ICONDATA->m_width = bitmap.GetWidth(); M_ICONDATA->m_height = bitmap.GetHeight(); - M_ICONDATA->m_cocoaNSImage = bitmap.GetNSImage(true); + wxAutoNSAutoreleasePool pool; + M_ICONDATA->m_cocoaNSImage = [bitmap.GetNSImage(true) retain]; M_ICONDATA->m_ok = bitmap.Ok(); M_ICONDATA->m_numColors = 0; M_ICONDATA->m_quality = 0;