Applied patch [ 743248 ] wxArray::RemoveAt() error message fix

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

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index 46f94e5dabae6b8075eb9625bd94458d34ab4aa4..cee3933129b59cfe391899942a9e70306e90ec10 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -22,12 +22,7 @@
 
 // needed to resolve the conflict between global T and macro parameter T
 
-// VC++ can't cope with string concatenation in Unicode mode
-#if defined(wxUSE_UNICODE) && wxUSE_UNICODE
-#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ::RemoveAt()")
-#else
-#define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::RemoveAt()")
-#endif
+#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ") wxT(#x) wxT("::RemoveAt()")
 
 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)