Committed a couple of IPC changes I forgot to do

[wxWidgets.git] / include / wx / artprov.h

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 1c9807f160377aca3fedb01d4c3574389bc20992..3bba43e060bdad34b6bb1b3f88404d867a2112b5 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ARTPROV_H_
 #define _WX_ARTPROV_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "artprov.h"
 #endif
 
@@ -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