summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-07-19 01:01:36 (GMT)
committerhobbs <hobbs>2003-07-19 01:01:36 (GMT)
commit0a6a4524bf5256634003ffa661d7cba6a11d2ebb (patch)
treee966c0fc0557aee66d03d2476d9b0a3cc23ecd7c /generic
parent7fa7bb9ea8af6d9f7a5fd64deea47c57ceed30a6 (diff)
downloadtk-0a6a4524bf5256634003ffa661d7cba6a11d2ebb.zip
tk-0a6a4524bf5256634003ffa661d7cba6a11d2ebb.tar.gz
tk-0a6a4524bf5256634003ffa661d7cba6a11d2ebb.tar.bz2
* generic/tkEvent.c (Tk_HandleEvent): correct XCreateIC call for
TK_XIM_SPOT usage. [Bug 742660] (takahashi)
Diffstat (limited to 'generic')
-rw-r--r--generic/tkEvent.c15
1 files changed, 12 insertions, 3 deletions
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)) {