tk.h   tk.h 
skipping to change at line 23 skipping to change at line 23
* this file, and for a DISCLAIMER OF ALL WARRANTIES. * this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/ */
#ifndef _TK #ifndef _TK
#define _TK #define _TK
#include <tcl.h> #include <tcl.h>
#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6) #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
# error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better # error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
#endif #endif
#ifndef CONST84
# define CONST84 const
# define CONST84_RETURN const
#endif
#ifndef CONST86
# define CONST86 CONST84
#endif
#ifndef EXTERN
# define EXTERN extern TCL_STORAGE_CLASS
#endif
/*
* Utility macros: STRINGIFY takes an argument and wraps it in "" (double
* quotation marks), JOIN joins two arguments.
*/
#ifndef STRINGIFY
# define STRINGIFY(x) STRINGIFY1(x)
# define STRINGIFY1(x) #x
#endif
#ifndef JOIN
# define JOIN(a,b) JOIN1(a,b)
# define JOIN1(a,b) a##b
#endif
/* /*
* For C++ compilers, use extern "C" * For C++ compilers, use extern "C"
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* /*
* When version numbers change here, you must also go into the following fi les * When version numbers change here, you must also go into the following fi les
skipping to change at line 55 skipping to change at line 81
* You may also need to update some of these files when the numbers change for * You may also need to update some of these files when the numbers change for
* the version of Tcl that this release of Tk is compiled against. * the version of Tcl that this release of Tk is compiled against.
*/ */
#define TK_MAJOR_VERSION 8 #define TK_MAJOR_VERSION 8
#define TK_MINOR_VERSION 6 #define TK_MINOR_VERSION 6
#define TK_RELEASE_LEVEL TCL_FINAL_RELEASE #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE
#define TK_RELEASE_SERIAL 0 #define TK_RELEASE_SERIAL 0
#define TK_VERSION "8.6" #define TK_VERSION "8.6"
#define TK_PATCH_LEVEL "8.6.0" #define TK_PATCH_LEVEL "8.6.1"
/* /*
* A special definition used to allow this header file to be included from * A special definition used to allow this header file to be included from
* windows or mac resource files so that they can obtain version informatio n. * windows or mac resource files so that they can obtain version informatio n.
* RC_INVOKED is defined by default by the windows RC tool and manually set * RC_INVOKED is defined by default by the windows RC tool and manually set
* for macintosh. * for macintosh.
* *
* Resource compilers don't like all the C stuff, like typedefs and procedu re * Resource compilers don't like all the C stuff, like typedefs and procedu re
* declarations, that occur below, so block them out. * declarations, that occur below, so block them out.
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 27 lines changed or added


 tkDecls.h   tkDecls.h 
skipping to change at line 863 skipping to change at line 863
EXTERN long Tk_GetUserInactiveTime(Display *dpy); EXTERN long Tk_GetUserInactiveTime(Display *dpy);
/* 270 */ /* 270 */
EXTERN void Tk_ResetUserInactiveTime(Display *dpy); EXTERN void Tk_ResetUserInactiveTime(Display *dpy);
/* 271 */ /* 271 */
EXTERN Tcl_Interp * Tk_Interp(Tk_Window tkwin); EXTERN Tcl_Interp * Tk_Interp(Tk_Window tkwin);
/* 272 */ /* 272 */
EXTERN void Tk_CreateOldImageType(const Tk_ImageType *typePtr); EXTERN void Tk_CreateOldImageType(const Tk_ImageType *typePtr);
/* 273 */ /* 273 */
EXTERN void Tk_CreateOldPhotoImageFormat( EXTERN void Tk_CreateOldPhotoImageFormat(
const Tk_PhotoImageFormat *formatPtr); const Tk_PhotoImageFormat *formatPtr);
/* 274 */
EXTERN void reserved274(void);
/* 275 */
EXTERN void reserved275(void);
typedef struct { typedef struct {
const struct TkPlatStubs *tkPlatStubs; const struct TkPlatStubs *tkPlatStubs;
const struct TkIntStubs *tkIntStubs; const struct TkIntStubs *tkIntStubs;
const struct TkIntPlatStubs *tkIntPlatStubs; const struct TkIntPlatStubs *tkIntPlatStubs;
const struct TkIntXlibStubs *tkIntXlibStubs; const struct TkIntXlibStubs *tkIntXlibStubs;
} TkStubHooks; } TkStubHooks;
typedef struct TkStubs { typedef struct TkStubs {
int magic; int magic;
skipping to change at line 1153 skipping to change at line 1149
void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int heigh t, int state); /* 264 */ void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int heigh t, int state); /* 264 */
int (*tk_PhotoExpand) (Tcl_Interp *interp, Tk_PhotoHandle handle, int w idth, int height); /* 265 */ int (*tk_PhotoExpand) (Tcl_Interp *interp, Tk_PhotoHandle handle, int w idth, int height); /* 265 */
int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_ PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRul e); /* 266 */ int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_ PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRul e); /* 266 */
int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handl e, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int z oomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */ int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handl e, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int z oomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */ int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */ long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */ void (*tk_ResetUserInactiveTime) (Display *dpy); /* 270 */
Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */ Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */ void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *format Ptr); /* 273 */ void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *format Ptr); /* 273 */
void (*reserved274) (void); /* 274 */
void (*reserved275) (void); /* 275 */
} TkStubs; } TkStubs;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern const TkStubs *tkStubsPtr; extern const TkStubs *tkStubsPtr;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
skipping to change at line 1717 skipping to change at line 1711
#define Tk_GetUserInactiveTime \ #define Tk_GetUserInactiveTime \
(tkStubsPtr->tk_GetUserInactiveTime) /* 269 */ (tkStubsPtr->tk_GetUserInactiveTime) /* 269 */
#define Tk_ResetUserInactiveTime \ #define Tk_ResetUserInactiveTime \
(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */ (tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
#define Tk_Interp \ #define Tk_Interp \
(tkStubsPtr->tk_Interp) /* 271 */ (tkStubsPtr->tk_Interp) /* 271 */
#define Tk_CreateOldImageType \ #define Tk_CreateOldImageType \
(tkStubsPtr->tk_CreateOldImageType) /* 272 */ (tkStubsPtr->tk_CreateOldImageType) /* 272 */
#define Tk_CreateOldPhotoImageFormat \ #define Tk_CreateOldPhotoImageFormat \
(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */ (tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
#define reserved274 \
(tkStubsPtr->reserved274) /* 274 */
#define reserved275 \
(tkStubsPtr->reserved275) /* 275 */
#endif /* defined(USE_TK_STUBS) */ #endif /* defined(USE_TK_STUBS) */
/* !END!: Do not edit above this line. */ /* !END!: Do not edit above this line. */
/* Functions that don't belong in the stub table */ /* Functions that don't belong in the stub table */
#undef Tk_MainEx #undef Tk_MainEx
#undef Tk_Init #undef Tk_Init
#undef Tk_SafeInit #undef Tk_SafeInit
#undef Tk_CreateConsoleWindow #undef Tk_CreateConsoleWindow
 End of changes. 3 change blocks. 
10 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/