X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2da0c077ce3d319f989bf172ce84f8752e9842f3..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/version.h?ds=sidebyside diff --git a/include/wx/version.h b/include/wx/version.h index 32b40178cd..5dd396cc2a 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -1,50 +1,77 @@ -/** -* 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 -*/ +/* + * 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 */ #ifndef _WX_VERSION_H_ #define _WX_VERSION_H_ +#include "wx/cpp.h" /* for wxSTRINGIZE */ + /* 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 */ +/* + Don't forget to update WX_CURRENT, WX_REVISION and WX_AGE in + build/bakefiles/version.bkl and regenerate the makefiles when you change + this! + */ + +/* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 -#define wxMINOR_VERSION 5 -#define wxRELEASE_NUMBER 4 -#define wxSUBRELEASE_NUMBER 1 -#define wxVERSION_STRING _T("wxWidgets 2.5.4") +#define wxMINOR_VERSION 9 +#define wxRELEASE_NUMBER 5 +#define wxSUBRELEASE_NUMBER 0 +#define wxVERSION_STRING wxT("wxWidgets 2.9.5") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ +/* Users can pre-define wxABI_VERSION to a lower value in their + * makefile/project settings to compile code that will be binary compatible + * with earlier versions of the ABI within the same minor version (between + * minor versions binary compatibility breaks anyway). The default is the + * version of wxWidgets being used. A single number with two decimal digits + * for each component, e.g. 20601 for 2.6.1 */ +#ifndef wxABI_VERSION +#define wxABI_VERSION ( wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99 ) +#endif + /* helpers for wxVERSION_NUM_XXX */ -#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) +#define wxMAKE_VERSION_STRING_T(x, y, z) \ + wxSTRINGIZE_T(x) wxSTRINGIZE_T(y) wxSTRINGIZE_T(z) +#define wxMAKE_VERSION_DOT_STRING_T(x, y, z) \ + wxSTRINGIZE_T(x) wxT(".") wxSTRINGIZE_T(y) wxT(".") wxSTRINGIZE_T(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) +/* those are Unicode-friendly */ +#define wxVERSION_NUM_STRING_T \ + wxMAKE_VERSION_STRING_T(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) +#define wxVERSION_NUM_DOT_STRING_T \ + wxMAKE_VERSION_DOT_STRING_T(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 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) +#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 */ #define wxCHECK_VERSION(major,minor,release) \ @@ -54,11 +81,11 @@ /* the same but check the subrelease also */ #define wxCHECK_VERSION_FULL(major,minor,release,subrel) \ - wxCHECK_VERSION(major, minor, release) && \ + (wxCHECK_VERSION(major, minor, release) && \ ((major) != wxMAJOR_VERSION || \ (minor) != wxMINOR_VERSION || \ (release) != wxRELEASE_NUMBER || \ - (subrel) <= wxSUBRELEASE_NUMBER) + (subrel) <= wxSUBRELEASE_NUMBER)) #endif /* _WX_VERSION_H_ */