No changes, just simplify preprocessor checks in wxMSW wxTextEntry.

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

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index e1267b03252d4858847b4ece9ea628bc4d5612f8..eb012f530883f094dbe6f1702bfe9d00d66447b0 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -28,6 +28,16 @@
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 

+/*
+    Special workarounds for compilers with broken "##" operator. For all the
+    other ones we can just use it directly.
+ */
+#ifdef wxCOMPILER_BROKEN_CONCAT_OPER
+    #define wxPREPEND_L(x)      L ## x
+    #define wxAPPEND_i64(x)     x ## i64
+    #define wxAPPEND_ui64(x)    x ## ui64
+#endif /* wxCOMPILER_BROKEN_CONCAT_OPER */
+

 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the
 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the