X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be2e301fc079bfc94e2f03448d25c942bad4732b..f164c52bc761d08cbfe5b733198e9d21afc3c221:/src/cocoa/icon.mm?ds=sidebyside diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index f3cb56d6d7..9c5e15c950 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -6,14 +6,16 @@ // Created: 2003/08/11 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/icon.h" + #ifndef WX_PRECOMP - #include "wx/icon.h" + #include "wx/bitmap.h" #endif //WX_PRECOMP -#include "wx/bitmap.h" #include "wx/cocoa/autorelease.h" @@ -44,7 +46,7 @@ protected: wxIconRefData::wxIconRefData() { - m_ok = FALSE; + m_ok = false; m_width = 0; m_height = 0; m_depth = 0; @@ -66,6 +68,7 @@ wxIconRefData::wxIconRefData( const wxIconRefData& data) wxIconRefData::~wxIconRefData() { + wxAutoNSAutoreleasePool pool; [m_cocoaNSImage release]; m_cocoaNSImage = NULL; } @@ -115,7 +118,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, M_ICONDATA->m_numColors = 0; M_ICONDATA->m_quality = 0; - return FALSE; + return false; } void wxIcon::CopyFromBitmap(const wxBitmap& bitmap) @@ -156,4 +159,3 @@ WX_NSImage wxIcon::GetNSImage() const return nil; return M_ICONDATA->m_cocoaNSImage; } -