From 11d740995f0af971a2b7a42c3a30cb29fd3e1255 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Sat, 19 Jul 2003 01:03:25 +0000
Subject: 	* generic/tkEvent.c (Tk_HandleEvent): correct XCreateIC call
 for 	TK_XIM_SPOT usage. [Bug 742660] (takahashi)

---
 ChangeLog         |  6 ++++++
 generic/tkEvent.c | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68aa954..b999e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-07-18  Jeff Hobbs  <jeffh@ActiveState.com>
 
+	* generic/tkEvent.c (Tk_HandleEvent): correct XCreateIC call for
+	TK_XIM_SPOT usage. [Bug 742660] (takahashi)
+
+	* win/tkWinCursor.c (TkGetCursorByName): Fix bug 420510 to provide
+	consistency between unix and windows -cursor option. (thoyts)
+
 	* win/tkWinDialog.c: doubled the TK_MULTI_MAX_PATH value to ~10K.
 	This is a short-term solution until the -multiple option is
 	extended.  [Bug 641261]
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 954f24c..f3b61d6 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.17.2.1 2003/07/19 01:03:25 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)) {
-- 
cgit v0.12