X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45080c10b11190028e843b617564caec95e82dd..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/cocoa/icon.mm?ds=sidebyside

diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm
index 44983b7272..7bc65f4ba7 100644
--- a/src/cocoa/icon.mm
+++ b/src/cocoa/icon.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/08/11
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -107,14 +106,14 @@ wxGDIRefData *wxIcon::CreateGDIRefData() const
 
 wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+    return new wxIconRefData(*static_cast<const wxIconRefData *>(data));
 }
 
 bool wxIcon::CreateFromXpm(const char* const* xpm)
 {
     wxBitmap bitmap(xpm);
     CopyFromBitmap(bitmap);
-    return Ok();
+    return IsOk();
 }
 
 bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
@@ -122,7 +121,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
 {
     wxBitmap bitmap(filename, type);
     CopyFromBitmap(bitmap);
-    return bitmap.Ok();
+    return bitmap.IsOk();
 }
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
@@ -133,7 +132,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)
     M_ICONDATA->m_height = bitmap.GetHeight();
     wxAutoNSAutoreleasePool pool;
     M_ICONDATA->m_cocoaNSImage = [bitmap.GetNSImage(true) retain];
-    M_ICONDATA->m_ok = bitmap.Ok();
+    M_ICONDATA->m_ok = bitmap.IsOk();
     M_ICONDATA->m_numColors = 0;
     M_ICONDATA->m_quality = 0;
 }