check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index d385c6d9c7741458c1d32bc927c5956d26132eed..91b059ba596f601f1781b26d7924e6b9762b875e 100644 (file)
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -14,10 +14,9 @@
 #include "wx/icon.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
 #endif //WX_PRECOMP
 
-#include "wx/bitmap.h"
-
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSImage.h>
@@ -109,17 +108,9 @@ bool wxIcon::CreateFromXpm(const char **xpm)
 bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight)
 {
-    UnRef();
-
-    m_refData = new wxIconRefData;
-    M_ICONDATA->m_width = 5;
-    M_ICONDATA->m_height = 5;
-    M_ICONDATA->m_cocoaNSImage = [[NSImage alloc] initWithSize:NSMakeSize(5,5)];
-    M_ICONDATA->m_ok = true;
-    M_ICONDATA->m_numColors = 0;
-    M_ICONDATA->m_quality = 0;
-
-    return false;
+    wxBitmap bitmap(filename, type);
+    CopyFromBitmap(bitmap);
+    return bitmap.Ok();
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
@@ -135,7 +126,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
     M_ICONDATA->m_quality = 0;
 }
 
-bool wxIcon::Ok() const
+bool wxIcon::IsOk() const
 {
     return m_refData && M_ICONDATA->m_ok;
 }