summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-04-17 14:53:43 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-04-17 14:53:43 (GMT)
commit455c2fea891b8241693775517339ef116487f3a6 (patch)
tree4dcd3c2e09c3fe36c52a4cdbbbd067946810fc6d
parent54bfce14793fed20c259085043af7e9ab0579aef (diff)
downloadtk-455c2fea891b8241693775517339ef116487f3a6.zip
tk-455c2fea891b8241693775517339ef116487f3a6.tar.gz
tk-455c2fea891b8241693775517339ef116487f3a6.tar.bz2
* generic/tkCanvas.c: Fix logic that determines when canvas item
<Enter> event should fire. Thanks to Sebastian Wangnick. [Bug 1327482]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCanvas.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8955434..b7cb845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-17 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tkCanvas.c: Fix logic that determines when canvas item
+ <Enter> event should fire. Thanks to Sebastian Wangnick. [Bug 1327482]
+
2008-04-16 Daniel Steffen <das@users.sourceforge.net>
* generic/tkStubInit.c: make stubs tables static const
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 85c37c9..e6cc864 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvas.c,v 1.46 2007/12/13 15:24:13 dgp Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.47 2008/04/17 14:53:44 dgp Exp $
*/
/* #define USE_OLD_TAG_SEARCH 1 */
@@ -4483,9 +4483,6 @@ PickCurrentItem(
buttonDown = canvasPtr->state
& (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask);
- if (!buttonDown) {
- canvasPtr->flags &= ~LEFT_GRABBED_ITEM;
- }
/*
* Save information about this event in the canvas. The event in the
@@ -4560,6 +4557,10 @@ PickCurrentItem(
return;
}
+ if (!buttonDown) {
+ canvasPtr->flags &= ~LEFT_GRABBED_ITEM;
+ }
+
/*
* Simulate a LeaveNotify event on the previous current item and an
* EnterNotify event on the new current item. Remove the "current" tag