diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-09-15 16:57:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-09-15 16:57:02 (GMT) |
| commit | 7b0e937f9ff083f35896d0d13cf90d618812de49 (patch) | |
| tree | de7f5dad34e664debf6ad3b48e2deafd20741a11 /generic/tkCanvas.c | |
| parent | af244231877a2b478b9fb0b0481621e1c12fc561 (diff) | |
| parent | c40f0f6cefb57728ba9162a8509918ae31fd2210 (diff) | |
| download | tk-7b0e937f9ff083f35896d0d13cf90d618812de49.zip tk-7b0e937f9ff083f35896d0d13cf90d618812de49.tar.gz tk-7b0e937f9ff083f35896d0d13cf90d618812de49.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tkCanvas.c')
| -rw-r--r-- | generic/tkCanvas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 50a88b4..c63520b 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -977,7 +977,7 @@ CanvasWidgetCmd( if (objc == 5) { int append = 0; - unsigned long mask; + unsigned int mask; const char *argv4 = Tcl_GetString(objv[4]); if (argv4[0] == 0) { @@ -1027,7 +1027,7 @@ CanvasWidgetCmd( result = TCL_ERROR; goto done; } - if (mask & ~(unsigned long)(ButtonMotionMask|Button1MotionMask + if (mask & ~(ButtonMotionMask|Button1MotionMask |Button2MotionMask|Button3MotionMask|Button4MotionMask |Button5MotionMask|ButtonPressMask|ButtonReleaseMask |EnterWindowMask|LeaveWindowMask|KeyPressMask @@ -4856,7 +4856,7 @@ PickCurrentItem( * ButtonRelease, or MotionNotify. */ { double coords[2]; - unsigned long buttonDown; + unsigned int buttonDown; Tk_Item *prevItemPtr; #ifndef USE_OLD_TAG_SEARCH SearchUids *searchUids = GetStaticUids(); |