use wxImage to load icons in non-native formats
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -144,8 +144,14 @@ bool wxIcon::LoadFile(const wxString& filename,
|
|||||||
|
|
||||||
if ( !handler )
|
if ( !handler )
|
||||||
{
|
{
|
||||||
// say something?
|
// load via wxBitmap which, in turn, uses wxImage allowing us to
|
||||||
|
// support more formats
|
||||||
|
wxBitmap bmp;
|
||||||
|
if ( !bmp.LoadFile(filename, type) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
CopyFromBitmap(bmp);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return handler->Load(this, filename, type, desiredWidth, desiredHeight);
|
return handler->Load(this, filename, type, desiredWidth, desiredHeight);
|
||||||
|
Reference in New Issue
Block a user