diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-12 18:56:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-12 18:56:14 (GMT) |
| commit | f43f72e2784d0139fb1610485983dac14bbf99e5 (patch) | |
| tree | 0e9865846c71b8fe09c23b392ebe90b4719108b6 /generic | |
| parent | 8acdad3fd67a17ad88c9ba7142574202c7b1aeff (diff) | |
| download | tk-f43f72e2784d0139fb1610485983dac14bbf99e5.zip tk-f43f72e2784d0139fb1610485983dac14bbf99e5.tar.gz tk-f43f72e2784d0139fb1610485983dac14bbf99e5.tar.bz2 | |
Prepare "trunk" for Tk 9.0 development
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/generic/tk.h b/generic/tk.h index 481714a..241eca5 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -17,8 +17,8 @@ #define _TK #include <tcl.h> -#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) -# error Tk 8.7 must be compiled with tcl.h from Tcl 8.6 or better +#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7) +# error Tk 9.0 must be compiled with tcl.h from Tcl 8.7 or better #endif #ifndef EXTERN @@ -66,17 +66,16 @@ extern "C" { */ #ifndef TK_MAJOR_VERSION -# define TK_MAJOR_VERSION 8 +# define TK_MAJOR_VERSION 9 #endif -#if TK_MAJOR_VERSION != 8 -# error "This header-file is for Tk 8 only" -#endif -#define TK_MINOR_VERSION 7 -#define TK_RELEASE_LEVEL TCL_ALPHA_RELEASE -#define TK_RELEASE_SERIAL 6 - -#define TK_VERSION "8.7" -#define TK_PATCH_LEVEL "8.7a6" +#if TK_MAJOR_VERSION == 9 +# define TK_MINOR_VERSION 0 +# define TK_RELEASE_LEVEL TCL_BETA_RELEASE +# define TK_RELEASE_SERIAL 0 + +# define TK_VERSION "9.0" +# define TK_PATCH_LEVEL "9.0b1" +#endif /* TK_MAJOR_VERSION */ /* * A special definition used to allow this header file to be included from @@ -146,14 +145,6 @@ typedef struct Tk_StyledElement_ *Tk_StyledElement; */ typedef const char *Tk_Uid; - -#if (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7) -# ifndef Tcl_Size -# define Tcl_Size int -# endif -# define TCL_SIZE_MAX INT_MAX -# define TCL_SIZE_MODIFIER "" -#endif /* *---------------------------------------------------------------------- |