X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..6d2190fcb4ba8c0a297a90ac233e88ad0c5cd13f:/src/osx/imaglist.cpp diff --git a/src/osx/imaglist.cpp b/src/osx/imaglist.cpp index 0a5cc0c742..8dc07f1467 100644 --- a/src/osx/imaglist.cpp +++ b/src/osx/imaglist.cpp @@ -2,7 +2,6 @@ // Name: src/osx/imaglist.cpp // Purpose: // Author: Robert Roebling -// RCS_ID: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -79,7 +78,7 @@ int wxImageList::Add( const wxBitmap &bitmap ) wxT("invalid bitmap size in wxImageList: this might work ") wxT("on this platform but definitely won't under Windows.") ); - // Mimic behavior of Windows ImageList_Add that automatically breaks up the added + // Mimic behaviour of Windows ImageList_Add that automatically breaks up the added // bitmap into sub-images of the correct size if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height) { @@ -108,7 +107,7 @@ int wxImageList::Add( const wxBitmap &bitmap ) int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask ) { wxBitmap bmp( bitmap ); - if (mask.Ok()) + if (mask.IsOk()) bmp.SetMask( new wxMask( mask ) ); return Add( bmp ); @@ -231,7 +230,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap, const wxBitmap &ma m_images.Insert( next, newBitmap ); } - if (mask.Ok()) + if (mask.IsOk()) newBitmap->SetMask(new wxMask(mask)); return true;