| tk.h | tk.h | |||
|---|---|---|---|---|
| skipping to change at line 15 | skipping to change at line 15 | |||
| * 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.2 2008/06/30 03:37:37 dgp Exp $ | * RCS: @(#) $Id: tk.h,v 1.109.2.5 2008/08/08 18:12:30 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 56 | |||
| * 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 3 | #define TK_RELEASE_SERIAL 4 | |||
| #define TK_VERSION "8.5" | #define TK_VERSION "8.5" | |||
| #define TK_PATCH_LEVEL "8.5.3" | #define TK_PATCH_LEVEL "8.5.4" | |||
| /* | /* | |||
| * 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. | |||
| */ | */ | |||
| skipping to change at line 629 | skipping to change at line 629 | |||
| #define TK_SCROLL_ERROR 4 | #define TK_SCROLL_ERROR 4 | |||
| /* | /* | |||
| *------------------------------------------------------------------------- -- | *------------------------------------------------------------------------- -- | |||
| * | * | |||
| * Extensions to the X event set | * Extensions to the X event set | |||
| * | * | |||
| *------------------------------------------------------------------------- -- | *------------------------------------------------------------------------- -- | |||
| */ | */ | |||
| #define VirtualEvent (LASTEvent) | #define VirtualEvent (MappingNotify + 1) | |||
| #define ActivateNotify (LASTEvent + 1) | #define ActivateNotify (MappingNotify + 2) | |||
| #define DeactivateNotify (LASTEvent + 2) | #define DeactivateNotify (MappingNotify + 3) | |||
| #define MouseWheelEvent (LASTEvent + 3) | #define MouseWheelEvent (MappingNotify + 4) | |||
| #define TK_LASTEVENT (LASTEvent + 4) | #define TK_LASTEVENT (MappingNotify + 5) | |||
| #define MouseWheelMask (1L << 28) | #define MouseWheelMask (1L << 28) | |||
| #define ActivateMask (1L << 29) | #define ActivateMask (1L << 29) | |||
| #define VirtualEventMask (1L << 30) | #define VirtualEventMask (1L << 30) | |||
| #define TK_LASTEVENT (LASTEvent + 4) | ||||
| /* | /* | |||
| * A virtual event shares most of its fields with the XKeyEvent and | * A virtual event shares most of its fields with the XKeyEvent and | |||
| * XButtonEvent structures. 99% of the time a virtual event will be an | * XButtonEvent structures. 99% of the time a virtual event will be an | |||
| * abstraction of a key or button event, so this structure provides the mos t | * abstraction of a key or button event, so this structure provides the mos t | |||
| * information to the user. The only difference is the changing of the deta il | * information to the user. The only difference is the changing of the deta il | |||
| * field for a virtual event so that it holds the name of the virtual event | * field for a virtual event so that it holds the name of the virtual event | |||
| * being triggered. | * being triggered. | |||
| * | * | |||
| * When using this structure, you should ensure that you zero out all the | * When using this structure, you should ensure that you zero out all the | |||
| skipping to change at line 1481 | skipping to change at line 1479 | |||
| #define Tk_FreeProc Tcl_FreeProc | #define Tk_FreeProc Tcl_FreeProc | |||
| #define Tk_Preserve Tcl_Preserve | #define Tk_Preserve Tcl_Preserve | |||
| #define Tk_Release Tcl_Release | #define Tk_Release Tcl_Release | |||
| /* Removed Tk_Main, use macro instead */ | /* Removed Tk_Main, use macro instead */ | |||
| #define Tk_Main(argc, argv, proc) \ | #define Tk_Main(argc, argv, proc) \ | |||
| Tk_MainEx(argc, argv, proc, Tcl_CreateInterp()) | Tk_MainEx(argc, argv, proc, Tcl_CreateInterp()) | |||
| const char * Tk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, | const char * Tk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, | |||
| const char *version, int exact)); | const char *version, int exact)); | |||
| const char * Tk_PkgInitStubsCheck _ANSI_ARGS_((Tcl_Interp *interp , | EXTERN const char * Tk_PkgInitStubsCheck _ANSI_ARGS_((Tcl_Interp *interp , | |||
| const char *version, int exact)); | const char *version, int exact)); | |||
| #ifndef USE_TK_STUBS | #ifndef USE_TK_STUBS | |||
| #define Tk_InitStubs(interp, version, exact) \ | #define Tk_InitStubs(interp, version, exact) \ | |||
| Tk_PkgInitStubsCheck(interp, version, exact) | Tk_PkgInitStubsCheck(interp, version, exact) | |||
| #endif | #endif | |||
| #define Tk_InitImageArgs(interp, argc, argv) /**/ | #define Tk_InitImageArgs(interp, argc, argv) /**/ | |||
| End of changes. 7 change blocks. | ||||
| 11 lines changed or deleted | 9 lines changed or added | |||