diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-23 21:18:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-23 21:18:58 (GMT) |
| commit | e89ac98ff3acc055005af842978e6a38fc9b207a (patch) | |
| tree | 15394e567a8d06a42f40d05f3f2bd000c933a68e /generic/tkGrab.c | |
| parent | 259182ceab7c7dda4a411f2fa1ea2475ad7e27d9 (diff) | |
| parent | 64efa1daf6914fde585eed65c2ec0f5bf45f097b (diff) | |
| download | tk-e89ac98ff3acc055005af842978e6a38fc9b207a.zip tk-e89ac98ff3acc055005af842978e6a38fc9b207a.tar.gz tk-e89ac98ff3acc055005af842978e6a38fc9b207a.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkGrab.c')
| -rw-r--r-- | generic/tkGrab.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/generic/tkGrab.c b/generic/tkGrab.c index 917ec69..50d2517 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -135,17 +135,6 @@ typedef struct NewGrabWinEvent { #define GENERATED_GRAB_EVENT_MAGIC ((Bool) 0x147321ac) /* - * Mask that selects any of the state bits corresponding to buttons, plus - * masks that select individual buttons' bits: - */ - -#define ALL_BUTTONS \ - (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask) -static const unsigned int buttonStates[] = { - Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask -}; - -/* * Forward declarations for functions declared later in this file: */ @@ -883,7 +872,7 @@ TkPointerEvent( } else { if (eventPtr->xbutton.button != AnyButton && ((eventPtr->xbutton.state & ALL_BUTTONS) - == buttonStates[eventPtr->xbutton.button - Button1])) { + == (unsigned int)TkGetButtonMask(eventPtr->xbutton.button))) { ReleaseButtonGrab(dispPtr); /* Note 4. */ } } |