summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--generic/tkEvent.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a935e7e..491ae0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-11-30 Jeff Hobbs <jeffh@ActiveState.com>
+ * generic/tkEvent.c: fix handling of ClientMessage handlers.
+ [Bug 1289565 983920]
+
* macosx/tkMacOSXEvent.h: define
kEventAppAvailableWindowBoundsChanged for OS X < 10.3.
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index abf7404..145d5d7 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.6 2004/10/26 16:39:01 rmax Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.17.2.7 2005/11/30 21:13:12 hobbs Exp $
*/
#include "tkPort.h"
@@ -983,11 +983,11 @@ Tk_HandleEvent(eventPtr)
Tk_InternAtom((Tk_Window) winPtr, "WM_PROTOCOLS")) {
TkWmProtocolEventProc(winPtr, eventPtr);
} else {
- /*
+ /*
* Finally, invoke any ClientMessage event handlers.
*/
- for (genPrevPtr = NULL, genericPtr = tsdPtr->cmList;
+ for (genPrevPtr = NULL, genericPtr = tsdPtr->cmList;
genericPtr != NULL; ) {
if (genericPtr->deleteFlag) {
if (!tsdPtr->handlersActive) {
@@ -1006,7 +1006,7 @@ Tk_HandleEvent(eventPtr)
genPrevPtr->nextPtr = tmpPtr;
}
if (tmpPtr == NULL) {
- tsdPtr->lastGenericPtr = genPrevPtr;
+ tsdPtr->lastCmPtr = genPrevPtr;
}
(void) ckfree((char *) genericPtr);
genericPtr = tmpPtr;