X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ef05b886ff281bcf477dc8cbc64299ddaa1a525..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/version.h

diff --git a/include/wx/version.h b/include/wx/version.h
index 40238c289b..32b40178cd 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -1,12 +1,12 @@
 /**
-*  Name:        wx/version.h 
-*  Purpose:     wxWidgets version numbers 
+*  Name:        wx/version.h
+*  Purpose:     wxWidgets version numbers
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
-*  Created:     29/01/98 
-*  RCS-ID:      $Id$ 
-*  Copyright:   (c) 1998 Julian Smart 
-*  Licence:     wxWindows licence 
+*  Created:     29/01/98
+*  RCS-ID:      $Id$
+*  Copyright:   (c) 1998 Julian Smart
+*  Licence:     wxWindows licence
 */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -21,16 +21,19 @@
 /*      so don't change its format too much or they could break */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5
-#define wxRELEASE_NUMBER     2
-#define wxSUBRELEASE_NUMBER  3
-#define wxVERSION_STRING   _T("wxWidgets 2.5.2")
+#define wxRELEASE_NUMBER     4
+#define wxSUBRELEASE_NUMBER  1
+#define wxVERSION_STRING   _T("wxWidgets 2.5.4")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
 
 /*  helpers for wxVERSION_NUM_XXX */
-#define wxMAKE_VERSION_STRING(x, y, z) #x #y #z
-#define wxMAKE_VERSION_DOT_STRING(x, y, z) #x "." #y "." #z
+#define wxSTRINGIZE(x)  #x
+#define wxMAKE_VERSION_STRING(x, y, z) \
+    wxSTRINGIZE(x) wxSTRINGIZE(y) wxSTRINGIZE(z)
+#define wxMAKE_VERSION_DOT_STRING(x, y, z) \
+    wxSTRINGIZE(x) "." wxSTRINGIZE(y) "." wxSTRINGIZE(z)
 
 /*  these are used by src/msw/version.rc and should always be ASCII, not Unicode */
 #define wxVERSION_NUM_STRING \
@@ -55,7 +58,7 @@
         ((major) != wxMAJOR_VERSION || \
             (minor) != wxMINOR_VERSION || \
                 (release) != wxRELEASE_NUMBER || \
-                    (subrel) >= wxSUBRELEASE_NUMBER)
+                    (subrel) <= wxSUBRELEASE_NUMBER)
 
 #endif /*  _WX_VERSION_H_ */