moved wxSTRINGIZE to defs.h and made it work with macro argument, so that it can be used elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -127,6 +127,19 @@
|
||||
# define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name)
|
||||
#endif
|
||||
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
/* string manipulation helpers */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
||||
/* helper macros to concatenate two tokens together */
|
||||
#define wxCONCAT_HELPER(text, line) text ## line
|
||||
#define wxCONCAT(text, line) wxCONCAT_HELPER(text, line)
|
||||
|
||||
/* helper macros to convert a token into string literal */
|
||||
#define wxSTRINGIZE_HELPER(x) #x
|
||||
#define wxSTRINGIZE(x) wxSTRINGIZE_HELPER(x)
|
||||
|
||||
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
/* wxWidgets version and compatibility defines */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
@@ -546,10 +559,6 @@ typedef int wxWindowID;
|
||||
/* size of statically declared array */
|
||||
#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0]))
|
||||
|
||||
/* helper macros to concatenate two tokens together */
|
||||
#define wxCONCAT_HELPER(text, line) text ## line
|
||||
#define wxCONCAT(text, line) wxCONCAT_HELPER(text, line)
|
||||
|
||||
/* helper macros to be able to define unique/anonymous objects: this works by */
|
||||
/* appending the current line number to the given identifier to reduce the */
|
||||
/* probability of the conflict (it may still happen if this is used in the */
|
||||
|
Reference in New Issue
Block a user