X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d70471fe7204a4a6541c543db22323f98b1369cd..7275146d4d0ee1e2b7b459c383572faec5c4f5c2:/include/wx/version.h diff --git a/include/wx/version.h b/include/wx/version.h index be6eadca3c..0eb62becaf 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -20,10 +20,10 @@ /* 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 3 -#define wxSUBRELEASE_NUMBER 3 -#define wxVERSION_STRING _T("wxWidgets 2.5.3") +#define wxMINOR_VERSION 6 +#define wxRELEASE_NUMBER 1 +#define wxSUBRELEASE_NUMBER 1 +#define wxVERSION_STRING _T("wxWidgets 2.6.1") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ @@ -42,9 +42,9 @@ 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 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 +54,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_ */