X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f46f4c86b234d87b9c1db889cc130d2d7d31c306:/include/wx/version.h diff --git a/include/wx/version.h b/include/wx/version.h index 325b51e592..18d2ad26cc 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -1,39 +1,52 @@ -///////////////////////////////////////////////////////////////////////////// -// 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 license -///////////////////////////////////////////////////////////////////////////// +/** +* Name: wx/version.h +* Purpose: wxWindows 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 */ #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 wxRELEASE_NUMBER 4 -#define wxVERSION_STRING _T("wxWindows 2.3.4") +#define wxMINOR_VERSION 5 +#define wxRELEASE_NUMBER 1 +#define wxVERSION_STRING _T("wxWidgets 2.5.1") + +/* nothing to update below this line when updating the version */ +/* ---------------------------------------------------------------------------- */ -// These are used by src/msw/version.rc and should always be ASCII, not Unicode -// and must be updated manually as well each time the version above changes -#define wxVERSION_NUM_DOT_STRING "2.3.4" -#define wxVERSION_NUM_STRING "234" +/* 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 -// nothing should be updated below this line when updating the version +/* 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) -// check if the current version is at least major.minor.release +/* check if the current version is at least major.minor.release */ #define wxCHECK_VERSION(major,minor,release) \ (wxMAJOR_VERSION > (major) || \ (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \ (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release))) -#endif // _WX_VERSION_H_ +#endif /* _WX_VERSION_H_ */