X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd08ccd2466e64d5de0ab2a8aaa4455a74fe9eb0..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/common/iconbndl.cpp diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp index b59a47864e..186d4df0cc 100644 --- a/src/common/iconbndl.cpp +++ b/src/common/iconbndl.cpp @@ -163,7 +163,7 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type) if ( type == wxBITMAP_TYPE_ICON_RESOURCE ) { wxIcon tmp(file, type); - if (tmp.Ok()) + if (tmp.IsOk()) { AddIcon(tmp); return; @@ -245,7 +245,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const { wxIcon icon = GetIcon(size); - if ( icon.Ok() && + if ( icon.IsOk() && (icon.GetWidth() != size.x || icon.GetHeight() != size.y) ) { icon = wxNullIcon; @@ -267,7 +267,7 @@ void wxIconBundle::AddIcon(const wxIcon& icon) for ( size_t i = 0; i < count; ++i ) { wxIcon& tmp = iconArray[i]; - if ( tmp.Ok() && + if ( tmp.IsOk() && tmp.GetWidth() == icon.GetWidth() && tmp.GetHeight() == icon.GetHeight() ) {