diff options
| author | jenglish <jenglish@flightlab.com> | 2003-01-28 20:39:11 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2003-01-28 20:39:11 (GMT) |
| commit | 68229120ac33cd987e6aa92a2415c9553a7e4c8c (patch) | |
| tree | 99e3eac7f3cd5a09489b7bade74de5492f9a9208 /generic/tkInt.h | |
| parent | 4d6f4ace4449f166c0bbdbbd10b5dc9efce36eeb (diff) | |
| download | tk-68229120ac33cd987e6aa92a2415c9553a7e4c8c.zip tk-68229120ac33cd987e6aa92a2415c9553a7e4c8c.tar.gz tk-68229120ac33cd987e6aa92a2415c9553a7e4c8c.tar.bz2 | |
Moved 'deletionEpoch' field from TkDisplay to TkMainInfo.
Reworked windowObj type.
Fixes Tk Bug #671330 "segfault when e.g. deiconifying destroyed window"
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index f94c3ec..cd40d80 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.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: tkInt.h,v 1.54 2002/08/31 06:12:20 das Exp $ + * RCS: $Id: tkInt.h,v 1.55 2003/01/28 20:39:15 jenglish Exp $ */ #ifndef _TKINT @@ -500,7 +500,6 @@ typedef struct TkDisplay { /* * The following field(s) were all added for Tk8.4 */ - long deletionEpoch; /* Incremented by window deletions */ unsigned int flags; /* Various flag values: these are all * defined in below. */ TkCaret caret; /* information about the caret for this @@ -601,6 +600,7 @@ typedef struct TkMainInfo { Tcl_HashTable nameTable; /* Hash table mapping path names to TkWindow * structs for all windows related to this * main window. Managed by tkWindow.c. */ + long deletionEpoch; /* Incremented by window deletions */ Tk_BindingTable bindingTable; /* Used in conjunction with "bind" command * to bind events to Tcl commands. */ |