corrected typo in check for icc

[wxWidgets.git] / src / cocoa / icon.mm

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index 5299b5a6453b4c6ef5f7a118eeff8c44d57d2a4c..889f03e7cd2b579b8d45dee54a8cf6c807a2c910 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -15,6 +15,8 @@
 #endif //WX_PRECOMP
 #include "wx/bitmap.h"
 
 #endif //WX_PRECOMP
 #include "wx/bitmap.h"
 

+#include "wx/cocoa/autorelease.h"
+

 #import <AppKit/NSImage.h>
 
 // ========================================================================
 #import <AppKit/NSImage.h>
 
 // ========================================================================


@@ -64,6 +66,7 @@ wxIconRefData::wxIconRefData( const wxIconRefData& data)
 
 wxIconRefData::~wxIconRefData()
 {
 
 wxIconRefData::~wxIconRefData()
 {

+    wxAutoNSAutoreleasePool pool;

     [m_cocoaNSImage release];
     m_cocoaNSImage = NULL;
 }
     [m_cocoaNSImage release];
     m_cocoaNSImage = NULL;
 }


@@ -122,7 +125,8 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
     m_refData = new wxIconRefData;
     M_ICONDATA->m_width = bitmap.GetWidth();
     M_ICONDATA->m_height = bitmap.GetHeight();
     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;
     M_ICONDATA->m_ok = bitmap.Ok();
     M_ICONDATA->m_numColors = 0;
     M_ICONDATA->m_quality = 0;