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:
@@ -325,7 +325,7 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
|
||||
// TODO: load colourmap.
|
||||
bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.wx_str()));
|
||||
|
||||
if ( !bitmap->Ok() )
|
||||
if ( !bitmap->IsOk() )
|
||||
{
|
||||
// it's probably not found
|
||||
wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
|
||||
@@ -494,7 +494,7 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
|
||||
icon->SetHICON((WXHICON)hicon);
|
||||
icon->SetSize(size.x, size.y);
|
||||
|
||||
return icon->Ok();
|
||||
return icon->IsOk();
|
||||
}
|
||||
|
||||
bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
|
||||
@@ -559,7 +559,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
|
||||
|
||||
icon->SetHICON((WXHICON)hicon);
|
||||
|
||||
return icon->Ok();
|
||||
return icon->IsOk();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user