X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..3287f62ad3bd6dfcc78a8fcef0ac44d9ece904af:/src/cocoa/icon.mm diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index 77a622e4f7..7bc65f4ba7 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -4,7 +4,6 @@ // Author: David Elliott // Modified by: // Created: 2003/08/11 -// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -114,7 +113,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 +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; }