Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed GetBitmap() to respect the "param" argument if !wxUSE_FILESYSTEM

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-03-20 22:26:39 +00:00
parent f52cbe909c
commit 45f3249bb6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xrc/xmlres.cpp
View File

@@ -1094,13 +1094,13 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
wxImage img(*(fsfile->GetStream())); wxImage img(*(fsfile->GetStream()));
delete fsfile; delete fsfile;
#else #else
wxImage img(GetParamValue(wxT("bitmap"))); wxImage img(name);
#endif #endif
if (!img.Ok()) if (!img.Ok())
{ {
wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
param.c_str()); name.c_str());
return wxNullBitmap; return wxNullBitmap;
} }
if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);