From b3e85292088c961a0e74bb3a65a08b6d3034d23f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 4 Sep 2004 13:23:57 +0000 Subject: [PATCH] wxArtProvider fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 10 +++++++--- src/xrc/xmlres.cpp | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index a28ed3b039..8e80db11da 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -895,11 +895,15 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString); if ( !sid.empty() ) { - wxString scl = bmpNode->GetPropVal(wxT("stock_client"), defaultArtClient); + wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString); + if (scl.empty()) + scl = defaultArtClient; + else + scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl); + wxBitmap stockArt = wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid), - wxART_MAKE_CLIENT_ID_FROM_STR(scl), - size); + scl, size); if ( stockArt.Ok() ) return stockArt; } diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index a28ed3b039..8e80db11da 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -895,11 +895,15 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString); if ( !sid.empty() ) { - wxString scl = bmpNode->GetPropVal(wxT("stock_client"), defaultArtClient); + wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString); + if (scl.empty()) + scl = defaultArtClient; + else + scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl); + wxBitmap stockArt = wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid), - wxART_MAKE_CLIENT_ID_FROM_STR(scl), - size); + scl, size); if ( stockArt.Ok() ) return stockArt; } -- 2.45.2