diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 15:22:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 15:22:48 (GMT) |
commit | d4daf4d9bef6d819c9cc65b9e5140dda427882ef (patch) | |
tree | 606231b1d855dbdf32aba1ac9ce46b5d90a85e93 /generic/tkDecls.h | |
parent | 95aa66aaac53bd1a8b29fd542ec754556343c7a9 (diff) | |
parent | 1a994da88e43dfeb7fd04825dd7552fe775efb80 (diff) | |
download | tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.zip tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.tar.gz tk-d4daf4d9bef6d819c9cc65b9e5140dda427882ef.tar.bz2 |
Merge 8.5
Diffstat (limited to 'generic/tkDecls.h')
-rw-r--r-- | generic/tkDecls.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h index f9c9772..87bb218 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -865,7 +865,12 @@ EXTERN void Tk_CreateOldImageType(const Tk_ImageType *typePtr); EXTERN void Tk_CreateOldPhotoImageFormat( const Tk_PhotoImageFormat *formatPtr); /* Slot 274 is reserved */ -/* 275 */ +/* Slot 275 is reserved */ +/* Slot 276 is reserved */ +/* Slot 277 is reserved */ +/* Slot 278 is reserved */ +/* Slot 279 is reserved */ +/* 280 */ EXTERN void TkUnusedStubEntry(void); typedef struct { @@ -1154,7 +1159,12 @@ typedef struct TkStubs { void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */ void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */ void (*reserved274)(void); - void (*tkUnusedStubEntry) (void); /* 275 */ + void (*reserved275)(void); + void (*reserved276)(void); + void (*reserved277)(void); + void (*reserved278)(void); + void (*reserved279)(void); + void (*tkUnusedStubEntry) (void); /* 280 */ } TkStubs; extern const TkStubs *tkStubsPtr; @@ -1716,8 +1726,13 @@ extern const TkStubs *tkStubsPtr; #define Tk_CreateOldPhotoImageFormat \ (tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */ /* Slot 274 is reserved */ +/* Slot 275 is reserved */ +/* Slot 276 is reserved */ +/* Slot 277 is reserved */ +/* Slot 278 is reserved */ +/* Slot 279 is reserved */ #define TkUnusedStubEntry \ - (tkStubsPtr->tkUnusedStubEntry) /* 275 */ + (tkStubsPtr->tkUnusedStubEntry) /* 280 */ #endif /* defined(USE_TK_STUBS) */ |