diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-13 11:06:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-13 11:06:42 (GMT) |
| commit | 1a75d5e6d3672fc72127a4df0127c3532b8b31b8 (patch) | |
| tree | 84000d61b88a5aa813de9290f14da619991750a8 /generic/tkBind.c | |
| parent | ffa301ef3e908eeecc3893f7cf3213ffe9f2c400 (diff) | |
| download | tk-1a75d5e6d3672fc72127a4df0127c3532b8b31b8.zip tk-1a75d5e6d3672fc72127a4df0127c3532b8b31b8.tar.gz tk-1a75d5e6d3672fc72127a4df0127c3532b8b31b8.tar.bz2 | |
Quick-fix for build problem on X11 (unfortunately, this means mis-using the xbutton.button field again, don't have other quick solution for that)
Diffstat (limited to 'generic/tkBind.c')
| -rw-r--r-- | generic/tkBind.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 5f2af9f..48f51e3 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2931,13 +2931,13 @@ ExpandPercents( evPtr = &eventPtr->xev; flags = (evPtr->type < TK_LASTEVENT) ? flagArray[evPtr->type] : 0; -#define SET_NUMBER(value) { number = value; \ - snprintf(numStorage, sizeof(numStorage), "%ld", number); \ +#define SET_NUMBER(value) { number = (value); \ + snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "d", number); \ string = numStorage; \ } -#define SET_UNUMBER(value) { unumber = value; \ - snprintf(numStorage, sizeof(numStorage), "%lu", unumber); \ +#define SET_UNUMBER(value) { unumber = (value); \ + snprintf(numStorage, sizeof(numStorage), "%" TCL_LL_MODIFIER "u", unumber); \ string = numStorage; \ } @@ -3139,7 +3139,7 @@ ExpandPercents( break; case 'D': if (flags & WHEEL) { - SET_NUMBER(evPtr->xwheel.delta); + SET_NUMBER((int)evPtr->xbutton.button); /* mis-use button field for this */ } break; case 'E': @@ -4022,7 +4022,7 @@ HandleEventGenerate( return TCL_ERROR; } if (flags & WHEEL) { - event.general.xwheel.delta = number; + event.general.xbutton.button = (unsigned)number; /* mis-use button field for this */ } else { badOpt = 1; } |