fixed GetBitmap() to respect the "param" argument if !wxUSE_FILESYSTEM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1094,13 +1094,13 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
|
||||
wxImage img(*(fsfile->GetStream()));
|
||||
delete fsfile;
|
||||
#else
|
||||
wxImage img(GetParamValue(wxT("bitmap")));
|
||||
wxImage img(name);
|
||||
#endif
|
||||
|
||||
if (!img.Ok())
|
||||
{
|
||||
wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
|
||||
param.c_str());
|
||||
name.c_str());
|
||||
return wxNullBitmap;
|
||||
}
|
||||
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
|
||||
|
Reference in New Issue
Block a user