diff options
| author | hobbs <hobbs> | 2000-01-21 03:54:41 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2000-01-21 03:54:41 (GMT) |
| commit | 77936f61de844b8c795063558eda7de3508cdd7b (patch) | |
| tree | ae734edf048def5a9ec5f3c9eca846a6753fbd01 /generic/tkInt.h | |
| parent | 45572469ec5bc7b41c213ee56f0a7db17bfc8cb8 (diff) | |
| download | tk-77936f61de844b8c795063558eda7de3508cdd7b.zip tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.gz tk-77936f61de844b8c795063558eda7de3508cdd7b.tar.bz2 | |
* generic/tkInt.h: moved new TkDisplay useInputMethods structure
element to end to not disturb position of previous elements in
the structure (as compared to Tk <=8.2).
* generic/tkCanvLine.c (LineCoords): fixed segfault when too few
coords were passed to a line with certain options set (it should
always have thrown an error anyway). [Bug: 4042]
* tests/text.test:
* generic/tkText.c: fixed missing " in error case and missing
'dump' in subcommand listing [Bug: 4036]
* generic/tkListbox.c: adjusted use of basic string concatenation
in (non-K&R behavior) [Bug: 4027]
Swapped bg/fg class for -select(bg|fg) for listbox and their
items [Bug: 4039]
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index bf747f5..3532475 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.20 1999/12/16 21:57:36 hobbs Exp $ + * RCS: $Id: tkInt.h,v 1.21 2000/01/21 03:54:41 hobbs Exp $ */ #ifndef _TKINT @@ -482,7 +482,6 @@ typedef struct TkDisplay { #ifdef TK_USE_INPUT_METHODS XIM inputMethod; /* Input method for this display */ #endif /* TK_USE_INPUT_METHODS */ - int useInputMethods; /* Whether to use input methods */ Tcl_HashTable winTable; /* Maps from X window ids to TkWindow ptrs. */ int refCount; /* Reference count of how many Tk applications @@ -490,12 +489,16 @@ typedef struct TkDisplay { * the display when we no longer have any * Tk applications using it. */ + /* + * The following field were all added for Tk8.3 + */ int mouseButtonState; /* current mouse button state for this * display */ int warpInProgress; Window warpWindow; int warpX; int warpY; + int useInputMethods; /* Whether to use input methods */ } TkDisplay; /* |