X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..06a32e049c1bad9249079ad2e91659303424a774:/src/cocoa/icon.mm diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index 2f56004db6..3dc3027c48 100644 --- 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 -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -114,7 +114,7 @@ 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 +122,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 +133,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; }