Import Tk 8.6.10

generic/tkGrab.c

@@ -134,17 +134,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:
  */
@@ -426,12 +415,7 @@ Tk_Grab(
     }
 
     Tk_MakeWindowExist(tkwin);
-#ifndef MAC_OSX_TK
-    if (!grabGlobal)
-#else
-    if (0)
-#endif /* MAC_OSX_TK */
-    {
+    if (!grabGlobal) {
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 	unsigned int state;
@@ -886,8 +870,9 @@ TkPointerEvent(
 		return 1;
 	    }
 	} else {
-	    if ((eventPtr->xbutton.state & ALL_BUTTONS)
-		    == buttonStates[eventPtr->xbutton.button - Button1]) {
+	    if (eventPtr->xbutton.button != AnyButton &&
+		    ((eventPtr->xbutton.state & ALL_BUTTONS)
+		    == (unsigned int)TkGetButtonMask(eventPtr->xbutton.button))) {
 		ReleaseButtonGrab(dispPtr);			/* Note 4. */
 	    }
 	}
@@ -1386,7 +1371,7 @@ QueueGrabWindowChange(
 static int
 GrabWinEventProc(
     Tcl_Event *evPtr,		/* Event of type NewGrabWinEvent. */
-    int flags)			/* Flags argument to Tk_DoOneEvent: indicates
+    int flags)			/* Flags argument to Tcl_DoOneEvent: indicates
 				 * what kinds of events are being processed
 				 * right now. */
 {