Added some standard further identifiers to help with WinCE toolbars

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

diff --git a/include/wx/version.h b/include/wx/version.h
index 7fbe4a4c8d82dd59935f1d9c8ae8727c799b10ac..006be6ebae0417c8e1d3e12f96a59117a020c481 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -6,17 +6,36 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VERSIONH__
-#define _WX_VERSIONH__
+#ifndef _WX_VERSION_H_
+#define _WX_VERSION_H_
 
-// Bump-up with each new version
+// the constants below must be changed with each new version
+// ----------------------------------------------------------------------------
+
+// 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    3
+#define wxMINOR_VERSION    5
 #define wxRELEASE_NUMBER   0
-#define wxVERSION_STRING   _T("wxWindows 2.3.0")
+#define wxVERSION_STRING   _T("wxWindows 2.5.0")
+
+// 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
+
+// these are used by src/msw/version.rc and should always be ASCII, not Unicode
+#define wxVERSION_NUM_STRING \
+  wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
+#define wxVERSION_NUM_DOT_STRING \
+  wxMAKE_VERSION_DOT_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
+
+// some more defines, not really sure if they're [still] useful
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxBETA_NUMBER      0
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
@@ -27,5 +46,5 @@
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
     (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
 
-#endif
-// _WX_VERSIONH__
+#endif // _WX_VERSION_H_
+