From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 20 Aug 2002 22:27:54 +0000 (+0000)
Subject: yet another variation on the same theme: wxMAKE_ART_ID_FROM_STR
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6ada5c335980d255e2fb315ed86c091010870c5e

yet another variation on the same theme: wxMAKE_ART_ID_FROM_STR


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 1c9807f160..d9a312e096 100644
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -30,10 +30,10 @@ class WXDLLEXPORT wxArtProviderCache;
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 
-#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  id _T("_C")
-#define wxART_MAKE_CLIENT_ID(id)           wxART_MAKE_CLIENT_ID_FROM_STR(_T(#id))
-#define wxART_MAKE_ART_ID_FROM_STR(id)     id
-#define wxART_MAKE_ART_ID(id)              wxART_MAKE_ART_ID_FROM_STR(_T(#id))
+#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  (wxString(id)+_T("_C"))
+#define wxART_MAKE_CLIENT_ID(id)           _T(#id) _T("_C")
+#define wxART_MAKE_ART_ID_FROM_STR(id)     (id)
+#define wxART_MAKE_ART_ID(id)              _T(#id)
 
 // ----------------------------------------------------------------------------
 // Art clients