diff options
author | stanton <stanton> | 1998-11-25 21:16:28 (GMT) |
---|---|---|
committer | stanton <stanton> | 1998-11-25 21:16:28 (GMT) |
commit | 0fe03c2e56a2ab06690ea189ab1136b35f5f80b6 (patch) | |
tree | 4ad0c5e136a5786750291df60b74a1358a56c774 /generic/tk.h | |
parent | cfaf90b6bd984f4e72ed307384968bcad79500d5 (diff) | |
download | tk-0fe03c2e56a2ab06690ea189ab1136b35f5f80b6.zip tk-0fe03c2e56a2ab06690ea189ab1136b35f5f80b6.tar.gz tk-0fe03c2e56a2ab06690ea189ab1136b35f5f80b6.tar.bz2 |
* integrated tk8.0.4 changes.
* generic/tkBind.c: fixed deletion order bug where a crash would
result if a binding deleted "."
Diffstat (limited to 'generic/tk.h')
-rw-r--r-- | generic/tk.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/generic/tk.h b/generic/tk.h index bee1073..3fb719d 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.1.4.2 1998/09/30 02:16:35 stanton Exp $ + * RCS: @(#) $Id: tk.h,v 1.1.4.3 1998/11/25 21:16:29 stanton Exp $ */ #ifndef _TK @@ -25,6 +25,7 @@ * unix/configure.in * win/makefile.bc (Not for patch release updates) * win/makefile.vc (Not for patch release updates) + * win/README * library/tk.tcl * README, win/README, unix/README, and mac/README * @@ -546,11 +547,14 @@ typedef struct Tk_GeomMgr { #define VirtualEvent (LASTEvent) #define ActivateNotify (LASTEvent + 1) #define DeactivateNotify (LASTEvent + 2) -#define TK_LASTEVENT (LASTEvent + 3) +#define MouseWheelEvent (LASTEvent + 3) +#define TK_LASTEVENT (LASTEvent + 4) + +#define MouseWheelMask (1L << 28) -#define VirtualEventMask (1L << 30) #define ActivateMask (1L << 29) -#define TK_LASTEVENT (LASTEvent + 3) +#define VirtualEventMask (1L << 30) +#define TK_LASTEVENT (LASTEvent + 4) /* @@ -797,10 +801,13 @@ typedef struct Tk_Item { * pixel drawn in item. Item area * includes x1 and y1 but not x2 * and y2. */ + struct Tk_Item *prevPtr; /* Previous in display list of all + * items in this canvas. Later items + * in list are drawn just below earlier + * ones. */ int reserved1; /* This padding is for compatibility */ char *reserved2; /* with Jan Nijtmans dash patch */ int reserved3; - char *reserved4; /* *------------------------------------------------------------------ |