diff options
| author | hobbs <hobbs> | 2002-06-15 02:08:12 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-06-15 02:08:12 (GMT) |
| commit | c79fd6dcf3ca7f681ad3a9080eaebb25e97c2010 (patch) | |
| tree | 1a7e9938d5736d6fde9910a8fb5a013e0cff6b32 /generic/tkInt.h | |
| parent | b9551536f704910727aa738f8a6e3aac1219c67f (diff) | |
| download | tk-c79fd6dcf3ca7f681ad3a9080eaebb25e97c2010.zip tk-c79fd6dcf3ca7f681ad3a9080eaebb25e97c2010.tar.gz tk-c79fd6dcf3ca7f681ad3a9080eaebb25e97c2010.tar.bz2 | |
* generic/tkCmds.c (Tk_TkObjCmd):
* unix/tkUnixKey.c (TkpGetString):
* generic/tkEvent.c (Tk_HandleEvent):
* generic/tkInt.h: changed useInputMethods boolean from int to a
bit in the flags variable (TK_DISPLAY_USE_IM)
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index f7b260a..4a7e74c 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.47 2002/06/15 01:54:47 hobbs Exp $ + * RCS: $Id: tkInt.h,v 1.48 2002/06/15 02:08:12 hobbs Exp $ */ #ifndef _TKINT @@ -482,7 +482,6 @@ typedef struct TkDisplay { Window warpWindow; int warpX; int warpY; - int useInputMethods; /* Whether to use input methods */ /* * The following field(s) were all added for Tk8.4 @@ -496,13 +495,18 @@ typedef struct TkDisplay { * Flag values for TkDisplay flags. * TK_DISPLAY_COLLAPSE_MOTION_EVENTS: (default on) * Indicates that we should collapse motion events on this display + * TK_DISPLAY_USE_IM: (default on) + * Whether to use input methods for this display * TK_DISPLAY_XIM_SPOT: (default off) * Indicates that we should use over-the-spot XIM on this display + * TK_DISPLAY_WM_TRACING: (default off) + * Whether we should do wm tracing on this display. */ #define TK_DISPLAY_COLLAPSE_MOTION_EVENTS (1 << 0) -#define TK_DISPLAY_XIM_SPOT (1 << 1) -#define TK_DISPLAY_WM_TRACING (1 << 2) +#define TK_DISPLAY_USE_IM (1 << 1) +#define TK_DISPLAY_XIM_SPOT (1 << 2) +#define TK_DISPLAY_WM_TRACING (1 << 3) /* * One of the following structures exists for each error handler |