Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wxSTRINGIZE to defs.h and made it work with macro argument, so that it can be used elsewhere

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-29 12:37:31 +00:00
parent da8cebb2f9
commit 74be7431f3
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/defs.h
View File

@@ -127,6 +127,19 @@
# define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name) # define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name)
#endif #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 */ /* wxWidgets version and compatibility defines */
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */
@@ -546,10 +559,6 @@ typedef int wxWindowID;
/* size of statically declared array */ /* size of statically declared array */
#define WXSIZEOF(array) (sizeof(array)/sizeof(array[0])) #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 */ /* 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 */ /* 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 */ /* probability of the conflict (it may still happen if this is used in the */

1
include/wx/version.h
View File

@@ -44,7 +44,6 @@
#endif #endif
/* helpers for wxVERSION_NUM_XXX */ /* helpers for wxVERSION_NUM_XXX */
#define wxSTRINGIZE(x) #x
#define wxMAKE_VERSION_STRING(x, y, z) \ #define wxMAKE_VERSION_STRING(x, y, z) \
wxSTRINGIZE(x) wxSTRINGIZE(y) wxSTRINGIZE(z) wxSTRINGIZE(x) wxSTRINGIZE(y) wxSTRINGIZE(z)
#define wxMAKE_VERSION_DOT_STRING(x, y, z) \ #define wxMAKE_VERSION_DOT_STRING(x, y, z) \