Better fix

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

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 37c58706f857b99b7a95814d551ed3b2e85e2800..82931e6dd7c6f5fd6f47ba0990245e01ea58a1be 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -17,10 +17,17 @@
 #define wxCONCAT_HELPER(text, line) text ## line
 #define wxCONCAT(text, line)        wxCONCAT_HELPER(text, line)
 
 #define wxCONCAT_HELPER(text, line) text ## line
 #define wxCONCAT(text, line)        wxCONCAT_HELPER(text, line)
 

+#define wxCONCAT3(x1, x2, x3) wxCONCAT(wxCONCAT(x1, x2), x3)
+#define wxCONCAT4(x1, x2, x3, x4) wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
+#define wxCONCAT5(x1, x2, x3, x4, x5) wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
+

 /* wxSTRINGIZE works as the preprocessor # operator but also works with macros */
 #define wxSTRINGIZE_HELPER(x)       #x
 #define wxSTRINGIZE(x)              wxSTRINGIZE_HELPER(x)
 
 /* wxSTRINGIZE works as the preprocessor # operator but also works with macros */
 #define wxSTRINGIZE_HELPER(x)       #x
 #define wxSTRINGIZE(x)              wxSTRINGIZE_HELPER(x)
 

+/* a Unicode-friendly version of wxSTRINGIZE_T */
+#define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
+

 /*
    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


@@ -44,5 +51,11 @@
 /* Create a "unique" name with the given prefix */
 #define wxMAKE_UNIQUE_NAME(text)    wxCONCAT_LINE(text)
 
 /* Create a "unique" name with the given prefix */
 #define wxMAKE_UNIQUE_NAME(text)    wxCONCAT_LINE(text)
 

-#endif // _WX_CPP_H_
+/*
+   This macro can be passed as argument to another macro when you don't have
+   anything to pass in fact.
+ */
+#define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
+
+#endif /* _WX_CPP_H_ */