diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | changes | 5 | ||||
| -rw-r--r-- | generic/tkEvent.c | 12 |
3 files changed, 9 insertions, 15 deletions
@@ -1,3 +1,10 @@ +2004-03-01 Don Porter <dgp@users.sourceforge.net> + + * changes: + * generic/tkEvent.c (Tk_HandleEvent): revert the 2004-07-20 commit. + That commit created a new Bug 1000051 - a broken Compose Key. + This revert restores Bug 905830 until a cleaner fix can be provided. + 2004-07-27 Daniel Steffen <das@users.sourceforge.net> *** 8.4.7 TAGGED FOR RELEASE *** @@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was released on March 13, 1991. Changes that aren't backward compatible are marked specially. -RCS: @(#) $Id: changes,v 1.64.2.12 2004/07/26 21:24:07 hobbs Exp $ +RCS: @(#) $Id: changes,v 1.64.2.13 2004/07/29 21:47:57 dgp Exp $ 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from the interpreter when the main window is deleted (otherwise there will @@ -5672,9 +5672,6 @@ cursor on OS X when Tk asks for the "NULL" (empty) cursor. 2004-07-19 (bug fix)[874058] improved build configuration on 64-bit systems. Corrects Tcl_StatBuf definition issues. (hobbs) -2004-07-20 (bug fix)[905830] Ensure IC focus is set after creation. This -corrects XIM support on Solaris. (hobbs) - 2003-07-23 (platform support) Mac OS X: Fix several problems with Icelandic (and Faroese) keyboards (riefenstahl) diff --git a/generic/tkEvent.c b/generic/tkEvent.c index ec5a23b..20fbb74 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.2.4 2004/07/21 04:27:55 wolfsuit Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.17.2.5 2004/07/29 21:47:57 dgp Exp $ */ #include "tkPort.h" @@ -883,7 +883,6 @@ Tk_HandleEvent(eventPtr) dispPtr = winPtr->dispPtr; if ((dispPtr->flags & TK_DISPLAY_USE_IM)) { if (!(winPtr->flags & (TK_CHECKED_IC|TK_ALREADY_DEAD))) { - long im_event_mask = 0L; winPtr->flags |= TK_CHECKED_IC; if (dispPtr->inputMethod != NULL) { #if TK_XIM_SPOT @@ -937,15 +936,6 @@ Tk_HandleEvent(eventPtr) NULL); #endif } - if (winPtr->inputContext != NULL) { - XGetICValues(winPtr->inputContext, - XNFilterEvents, &im_event_mask, NULL); - if (im_event_mask != 0L) { - XSelectInput(winPtr->display, winPtr->window, - winPtr->atts.event_mask | im_event_mask); - XSetICFocus(winPtr->inputContext); - } - } } if (XFilterEvent(eventPtr, None)) { goto done; |