| tk.h | | tk.h | |
| | | | |
| skipping to change at line 14 | | skipping to change at line 14 | |
| * Declarations for Tk-related things that are visible outside of the T
k | | * Declarations for Tk-related things that are visible outside of the T
k | |
| * module itself. | | * module itself. | |
| * | | * | |
| * Copyright (c) 1989-1994 The Regents of the University of California. | | * Copyright (c) 1989-1994 The Regents of the University of California. | |
| * Copyright (c) 1994 The Australian National University. | | * Copyright (c) 1994 The Australian National University. | |
| * Copyright (c) 1994-1998 Sun Microsystems, Inc. | | * Copyright (c) 1994-1998 Sun Microsystems, Inc. | |
| * Copyright (c) 1998-2000 Ajuba Solutions. | | * Copyright (c) 1998-2000 Ajuba Solutions. | |
| * | | * | |
| * See the file "license.terms" for information on usage and redistribution
of | | * See the file "license.terms" for information on usage and redistribution
of | |
| * this file, and for a DISCLAIMER OF ALL WARRANTIES. | | * this file, and for a DISCLAIMER OF ALL WARRANTIES. | |
|
| * | | | |
| * RCS: @(#) $Id: tk.h,v 1.109.2.13 2010/08/04 17:06:52 dgp Exp $ | | | |
| */ | | */ | |
| | | | |
| #ifndef _TK | | #ifndef _TK | |
| #define _TK | | #define _TK | |
| | | | |
| #include <tcl.h> | | #include <tcl.h> | |
| #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) | | #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 5) | |
| # error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 | | # error Tk 8.5 must be compiled with tcl.h from Tcl 8.5 | |
| #endif | | #endif | |
| | | | |
| | | | |
| skipping to change at line 56 | | skipping to change at line 54 | |
| * unix/tk.spec (1 LOC patch) | | * unix/tk.spec (1 LOC patch) | |
| * win/tcl.m4 (not patchlevel) | | * win/tcl.m4 (not patchlevel) | |
| * | | * | |
| * 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 5 | | #define TK_MINOR_VERSION 5 | |
| #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE | | #define TK_RELEASE_LEVEL TCL_FINAL_RELEASE | |
|
| #define TK_RELEASE_SERIAL 9 | | #define TK_RELEASE_SERIAL 10 | |
| | | | |
| #define TK_VERSION "8.5" | | #define TK_VERSION "8.5" | |
|
| #define TK_PATCH_LEVEL "8.5.9" | | #define TK_PATCH_LEVEL "8.5.10" | |
| | | | |
| /* | | /* | |
| * 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. 3 change blocks. |
| 4 lines changed or deleted | | 2 lines changed or added | |
|
| tkDecls.h | | tkDecls.h | |
| /* | | /* | |
| * tkDecls.h -- | | * tkDecls.h -- | |
| * | | * | |
| * Declarations of functions in the platform independent public Tcl API
. | | * Declarations of functions in the platform independent public Tcl API
. | |
| * | | * | |
| * Copyright (c) 1998-1999 by Scriptics Corporation. | | * Copyright (c) 1998-1999 by Scriptics Corporation. | |
| * | | * | |
| * See the file "license.terms" for information on usage and redistribution | | * See the file "license.terms" for information on usage and redistribution | |
| * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | | * of this file, and for a DISCLAIMER OF ALL WARRANTIES. | |
|
| * | | | |
| * RCS: @(#) $Id: tkDecls.h,v 1.30.4.1 2010/02/07 23:24:13 nijtmans Exp $ | | | |
| */ | | */ | |
| | | | |
| #ifndef _TKDECLS | | #ifndef _TKDECLS | |
| #define _TKDECLS | | #define _TKDECLS | |
| | | | |
| #ifdef BUILD_tk | | #ifdef BUILD_tk | |
| #undef TCL_STORAGE_CLASS | | #undef TCL_STORAGE_CLASS | |
| #define TCL_STORAGE_CLASS DLLEXPORT | | #define TCL_STORAGE_CLASS DLLEXPORT | |
| #endif | | #endif | |
| | | | |
| | | | |
| skipping to change at line 1909 | | skipping to change at line 1907 | |
| int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Ob
j *objPtr, int *intPtr); /* 208 */ | | int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Ob
j *objPtr, int *intPtr); /* 208 */ | |
| int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *r
esultPtr); /* 209 */ | | int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *r
esultPtr); /* 209 */ | |
| int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *CONS
T objv[], double *dblPtr, int *intPtr); /* 210 */ | | int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *CONS
T objv[], double *dblPtr, int *intPtr); /* 210 */ | |
| int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTa
ble optionToken, Tk_Window tkwin); /* 211 */ | | int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTa
ble optionToken, Tk_Window tkwin); /* 211 */ | |
| void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc,
Tcl_Interp *interp); /* 212 */ | | void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc,
Tcl_Interp *interp); /* 212 */ | |
| void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */ | | void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */ | |
| int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTab
le optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedO
ptions *savePtr, int *maskPtr); /* 214 */ | | int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTab
le optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedO
ptions *savePtr, int *maskPtr); /* 214 */ | |
| void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */ | | void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */ | |
| int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */ | | int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */ | |
| void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *met
hod); /* 217 */ | | void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *met
hod); /* 217 */ | |
|
| void *reserved218; | | VOID *reserved218; | |
| void *reserved219; | | VOID *reserved219; | |
| int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash
); /* 220 */ | | int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash
); /* 220 */ | |
| void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */ | | void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */ | |
| void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 22
2 */ | | void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 22
2 */ | |
| int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_It
em *item, Tk_Outline *outline); /* 223 */ | | int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_It
em *item, Tk_Outline *outline); /* 223 */ | |
| int (*tk_ChangeOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline
*outline); /* 224 */ | | int (*tk_ChangeOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline
*outline); /* 224 */ | |
| int (*tk_ResetOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *
outline); /* 225 */ | | int (*tk_ResetOutlineGC) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline *
outline); /* 225 */ | |
| int (*tk_CanvasPsOutline) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline
*outline); /* 226 */ | | int (*tk_CanvasPsOutline) (Tk_Canvas canvas, Tk_Item *item, Tk_Outline
*outline); /* 226 */ | |
| void (*tk_SetTSOrigin) (Tk_Window tkwin, GC gc, int x, int y); /* 227 *
/ | | void (*tk_SetTSOrigin) (Tk_Window tkwin, GC gc, int x, int y); /* 227 *
/ | |
| int (*tk_CanvasGetCoordFromObj) (Tcl_Interp *interp, Tk_Canvas canvas,
Tcl_Obj *obj, double *doublePtr); /* 228 */ | | int (*tk_CanvasGetCoordFromObj) (Tcl_Interp *interp, Tk_Canvas canvas,
Tcl_Obj *obj, double *doublePtr); /* 228 */ | |
| void (*tk_CanvasSetOffset) (Tk_Canvas canvas, GC gc, Tk_TSOffset *offse
t); /* 229 */ | | void (*tk_CanvasSetOffset) (Tk_Canvas canvas, GC gc, Tk_TSOffset *offse
t); /* 229 */ | |
| | | | |
End of changes. 2 change blocks. |
| 4 lines changed or deleted | | 2 lines changed or added | |
|