fixed VC++ warning in optimized build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -194,18 +194,13 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
|
|||||||
wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
|
wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
|
||||||
|
|
||||||
wxBitmap bmp = GetBitmap(id, client, size);
|
wxBitmap bmp = GetBitmap(id, client, size);
|
||||||
if ( bmp.Ok() )
|
if ( !bmp.Ok() )
|
||||||
{
|
|
||||||
wxIcon icon;
|
|
||||||
icon.CopyFromBitmap(bmp);
|
|
||||||
return icon;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return wxNullIcon;
|
return wxNullIcon;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
wxIcon icon;
|
||||||
|
icon.CopyFromBitmap(bmp);
|
||||||
|
return icon;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class wxArtProviderModule: public wxModule
|
class wxArtProviderModule: public wxModule
|
||||||
|
Reference in New Issue
Block a user