summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-04-17 14:52:22 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-04-17 14:52:22 (GMT)
commitaa6e71dc160e078f608188a5e30756dfd6e9aa67 (patch)
tree33cc8bccf473e94814e504a0050d0aacc52ba41e /generic
parent32d4907a921f38667b5bae6b410b76df4723b143 (diff)
downloadtk-aa6e71dc160e078f608188a5e30756dfd6e9aa67.zip
tk-aa6e71dc160e078f608188a5e30756dfd6e9aa67.tar.gz
tk-aa6e71dc160e078f608188a5e30756dfd6e9aa67.tar.bz2
* generic/tkCanvas.c: Fix logic that determines when canvas item
<Enter> event should fire. Thanks to Sebastian Wangnick. [Bug 1327482]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkCanvas.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 85c37c9..5872d55 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.46.2.1 2008/04/17 14:52:24 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