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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 6698d8a73cb3234f7685e23c78f7743d46703855..1de0a1ddfc8455b65fb9b60335fcf74b8652ad05 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1094,13 +1094,13 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else
     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'."),
 #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);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);