Switch to overriding OnAssertFailure instead of OnAssert

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

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index f3cb56d6d7d271fb57e2184d4b5056f426912eef..d385c6d9c7741458c1d32bc927c5956d26132eed 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -6,13 +6,16 @@
 // 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"

+
+#include "wx/icon.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/icon.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

+

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


@@ -44,7 +47,7 @@ protected:
 
 wxIconRefData::wxIconRefData()
 {
 
 wxIconRefData::wxIconRefData()
 {

-    m_ok = FALSE;
+    m_ok = false;

     m_width = 0;
     m_height = 0;
     m_depth = 0;
     m_width = 0;
     m_height = 0;
     m_depth = 0;


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

+    wxAutoNSAutoreleasePool pool;

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


@@ -115,7 +119,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     M_ICONDATA->m_numColors = 0;
     M_ICONDATA->m_quality = 0;
 
     M_ICONDATA->m_numColors = 0;
     M_ICONDATA->m_quality = 0;
 

-    return FALSE;
+    return false;

 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)


@@ -156,4 +160,3 @@ WX_NSImage wxIcon::GetNSImage() const
         return nil;
     return M_ICONDATA->m_cocoaNSImage;
 }
         return nil;
     return M_ICONDATA->m_cocoaNSImage;
 }

-