From d56143a3561200db2cae71bada60a87629d52612 Mon Sep 17 00:00:00 2001 From: hobbs Date: Sat, 15 Jun 2002 01:54:08 +0000 Subject: changed TK_USE_XIM_SPOT to TK_DISPLAY_XIM_SPOT for clarity FossilOrigin-Name: fb49550f9a9154838aa2e800cf6aa4a94264d9c5 --- generic/tkEvent.c | 4 ++-- unix/tkUnixEvent.c | 4 ++-- unix/tkUnixKey.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generic/tkEvent.c b/generic/tkEvent.c index 16d2215..f096111 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -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: tkEvent.c,v 1.13 2002/06/15 01:09:36 hobbs Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.14 2002/06/15 01:54:09 hobbs Exp $ */ #include "tkPort.h" @@ -866,7 +866,7 @@ Tk_HandleEvent(eventPtr) winPtr->flags |= TK_CHECKED_IC; if (dispPtr->inputMethod != NULL) { #if TK_XIM_SPOT - if (dispPtr->flags & TK_USE_XIM_SPOT) { + if (dispPtr->flags & TK_DISPLAY_XIM_SPOT) { XVaNestedList preedit_attr; XPoint spot = {0, 0}; diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index bbf3455..98132a1 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixEvent.c,v 1.7 2002/06/15 01:09:36 hobbs Exp $ + * RCS: @(#) $Id: tkUnixEvent.c,v 1.8 2002/06/15 01:54:09 hobbs Exp $ */ #include "tkInt.h" @@ -591,7 +591,7 @@ OpenIM(dispPtr) for (i = 0; i < stylePtr->count_styles; i++) { if (stylePtr->supported_styles[i] == (XIMPreeditPosition | XIMStatusNothing)) { - dispPtr->flags |= TK_USE_XIM_SPOT; + dispPtr->flags |= TK_DISPLAY_XIM_SPOT; XFree(stylePtr); return; } diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index 5c01d46..9bb4633 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixKey.c,v 1.7 2002/06/15 01:09:36 hobbs Exp $ + * RCS: @(#) $Id: tkUnixKey.c,v 1.8 2002/06/15 01:54:09 hobbs Exp $ */ #include "tkInt.h" @@ -123,7 +123,7 @@ TkpGetString(winPtr, eventPtr, dsPtr) /* * Adjust the XIM caret position. */ - if (winPtr->dispPtr->flags & TK_USE_XIM_SPOT) { + if (winPtr->dispPtr->flags & TK_DISPLAY_XIM_SPOT) { spot.x = caretX; spot.y = caretY; preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); XSetICValues(winPtr->inputContext, -- cgit v0.12