X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94245f6df05e758f52c8a3348799cf1ccf24c233..9c6e3c57143f79eb8b384f0f097f3934e86efb26:/src/xrc/xmlres.cpp?ds=inline diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 6698d8a73c..5a82615c3a 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -1094,21 +1094,17 @@ 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); -#if !defined(__WXMSW__) || wxUSE_WXDIB return wxBitmap(img); -#else - return wxBitmap(); -#endif }