diff options
| author | hobbs <hobbs> | 2003-07-19 01:01:36 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2003-07-19 01:01:36 (GMT) |
| commit | eb7d3acc4e829b0dd73d3afa82f256852d319443 (patch) | |
| tree | e966c0fc0557aee66d03d2476d9b0a3cc23ecd7c | |
| parent | 6dd48eebfc04b68f88dacf0488e3464923bff350 (diff) | |
| download | tk-eb7d3acc4e829b0dd73d3afa82f256852d319443.zip tk-eb7d3acc4e829b0dd73d3afa82f256852d319443.tar.gz tk-eb7d3acc4e829b0dd73d3afa82f256852d319443.tar.bz2 | |
* generic/tkEvent.c (Tk_HandleEvent): correct XCreateIC call for
TK_XIM_SPOT usage. [Bug 742660] (takahashi)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkEvent.c | 15 |
2 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2003-07-18 Jeff Hobbs <jeffh@ActiveState.com> + + * generic/tkEvent.c (Tk_HandleEvent): correct XCreateIC call for + TK_XIM_SPOT usage. [Bug 742660] (takahashi) + 2003-07-19 Pat Thoyts <patthoyts@users.sourceforge.net> * win/tkWinCursor.c (TkGetCursorByName): Fix bug 420510 to provide diff --git a/generic/tkEvent.c b/generic/tkEvent.c index 954f24c..f95bf9e 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.17 2003/02/18 06:22:44 mdejong Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.18 2003/07/19 01:01:36 hobbs Exp $ */ #include "tkPort.h" @@ -912,8 +912,7 @@ Tk_HandleEvent(eventPtr) XNPreeditAttributes, preedit_attr, NULL); XFree(preedit_attr); - } else -#endif + } else { if (winPtr->inputContext != NULL) panic("inputContext not NULL"); winPtr->inputContext = XCreateIC(dispPtr->inputMethod, @@ -921,6 +920,16 @@ Tk_HandleEvent(eventPtr) XNClientWindow, winPtr->window, XNFocusWindow, winPtr->window, NULL); + } +#else + if (winPtr->inputContext != NULL) + panic("inputContext not NULL"); + winPtr->inputContext = XCreateIC(dispPtr->inputMethod, + XNInputStyle, XIMPreeditNothing|XIMStatusNothing, + XNClientWindow, winPtr->window, + XNFocusWindow, winPtr->window, + NULL); +#endif } } if (XFilterEvent(eventPtr, None)) { |