Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/version.h b/include/wx/version.h
index defc78879f4b7a10af6e22d898d4111a6acb4ea5..32b40178cdd7df17c85e942bac9eed55c4aa0e39 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -1,13 +1,13 @@
-/* /////////////////////////////////////////////////////////////////////////// */
-/*  Name:        wx/version.h */
-/*  Purpose:     wxWindows version numbers */
-/*  Author:      Julian Smart */
-/*  Modified by: */
-/*  Created:     29/01/98 */
-/*  RCS-ID:      $Id$ */
-/*  Copyright:   (c) 1998 Julian Smart */
-/*  Licence:     wxWindows licence */
-/* /////////////////////////////////////////////////////////////////////////// */
+/**
+*  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
+*/
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
@@ -19,17 +19,21 @@
 
 /*  NB: this file is parsed by Perl code in tmake templates in distrib/msw/tmake */
 /*      so don't change its format too much or they could break */
-#define wxMAJOR_VERSION    2
-#define wxMINOR_VERSION    5
-#define wxRELEASE_NUMBER   1
-#define wxVERSION_STRING   _T("wxWindows 2.5.1")
+#define wxMAJOR_VERSION      2
+#define wxMINOR_VERSION      5
+#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 \
@@ -48,5 +52,13 @@
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
 
+/* the same but check the subrelease also */
+#define wxCHECK_VERSION_FULL(major,minor,release,subrel) \
+    wxCHECK_VERSION(major, minor, release) && \
+        ((major) != wxMAJOR_VERSION || \
+            (minor) != wxMINOR_VERSION || \
+                (release) != wxRELEASE_NUMBER || \
+                    (subrel) <= wxSUBRELEASE_NUMBER)
+
 #endif /*  _WX_VERSION_H_ */