Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk(). Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,7 +106,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
|
||||
int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
|
||||
{
|
||||
wxBitmap bmp(bitmap);
|
||||
if (mask.Ok())
|
||||
if (mask.IsOk())
|
||||
bmp.SetMask(new wxMask(mask));
|
||||
return Add(bmp);
|
||||
}
|
||||
@@ -214,7 +214,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap, const wxBit
|
||||
m_images.Insert( next, newBitmap );
|
||||
}
|
||||
|
||||
if (mask.Ok())
|
||||
if (mask.IsOk())
|
||||
newBitmap->SetMask(new wxMask(mask));
|
||||
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user