diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-13 22:13:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-13 22:13:12 (GMT) |
| commit | 6eb17d212faf798cf9cd89c85467d8f8893ca614 (patch) | |
| tree | e8cd4b88b670d5f7e6e0546026cbd5d6abf83e7c /generic/tkInt.h | |
| parent | cffc7b487cdbf3425c65ac71f4153919f4b48e8b (diff) | |
| download | tk-6eb17d212faf798cf9cd89c85467d8f8893ca614.zip tk-6eb17d212faf798cf9cd89c85467d8f8893ca614.tar.gz tk-6eb17d212faf798cf9cd89c85467d8f8893ca614.tar.bz2 | |
More progress, backporting bugfix from Tk 9.0
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 6560dc3..8df2375 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -83,17 +83,27 @@ # define TCL_COMBINE 0 #endif +#undef TclNumUtfChars +#undef TclUtfAtIndex #undef Tcl_NumUtfChars #undef Tcl_GetCharLength #undef Tcl_UtfAtIndex #if TCL_MAJOR_VERSION > 8 -#define Tcl_NumUtfChars \ - (tclStubsPtr->tcl_NumUtfChars) /* 669 */ -#define Tcl_GetCharLength \ - (tclStubsPtr->tcl_GetCharLength) /* 670 */ -#define Tcl_UtfAtIndex \ - (tclStubsPtr->tcl_UtfAtIndex) /* 671 */ +# define TclNumUtfChars \ + (tclStubsPtr->tclNumUtfChars) /* 312 */ +# define TclUtfAtIndex \ + (tclStubsPtr->tclUtfAtIndex) /* 325 */ +# define Tcl_NumUtfChars \ + (tclStubsPtr->tcl_NumUtfChars) /* 669 */ +# define Tcl_GetCharLength \ + (tclStubsPtr->tcl_GetCharLength) /* 670 */ +# define Tcl_UtfAtIndex \ + (tclStubsPtr->tcl_UtfAtIndex) /* 671 */ #else +# define TclNumUtfChars \ + (tclStubsPtr->tcl_NumUtfChars) /* 312 */ +# define TclUtfAtIndex \ + (tclStubsPtr->tcl_UtfAtIndex) /* 325 */ # define Tcl_NumUtfChars (((&tclStubsPtr->tcl_PkgProvideEx)[631]) ? \ ((Tcl_Size (*)(const char *, Tcl_Size))(void *)((&tclStubsPtr->tcl_PkgProvideEx)[669])) \ : (tclStubsPtr->tcl_NumUtfChars) /* 312 */) |