1 files changed, 9 insertions, 9 deletions

diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index c67b27b..00d4511 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -478,8 +478,8 @@ Tk_Grab(
 	for (numTries = 0; numTries < 10; numTries++) {
 	    grabResult = XGrabPointer(dispPtr->display, winPtr->window,
 		    True, ButtonPressMask|ButtonReleaseMask|ButtonMotionMask
-		    |PointerMotionMask, GrabModeAsync, GrabModeAsync, 0,
-		    0, CurrentTime);
+		    |PointerMotionMask, GrabModeAsync, GrabModeAsync, None,
+		    None, CurrentTime);
 	    if (grabResult != AlreadyGrabbed) {
 		break;
 	    }
@@ -870,7 +870,7 @@ TkPointerEvent(
 		    if (XGrabPointer(dispPtr->display,
 			    dispPtr->grabWinPtr->window, True,
 			    ButtonPressMask|ButtonReleaseMask|ButtonMotionMask,
-			    GrabModeAsync, GrabModeAsync, 0, 0,
+			    GrabModeAsync, GrabModeAsync, None, None,
 			    CurrentTime) == 0) {
 			EatGrabEvents(dispPtr, serial);
 			if (XGrabKeyboard(dispPtr->display, winPtr->window,
@@ -937,7 +937,7 @@ TkChangeEventWindow(
 	Tk_GetRootCoords((Tk_Window) winPtr, &x, &y);
 	eventPtr->xmotion.x = eventPtr->xmotion.x_root - x;
 	eventPtr->xmotion.y = eventPtr->xmotion.y_root - y;
-	eventPtr->xmotion.subwindow = 0;
+	eventPtr->xmotion.subwindow = None;
 	for (childPtr = winPtr->childList; childPtr != NULL;
 		childPtr = childPtr->nextPtr) {
 	    if (childPtr->flags & TK_TOP_HIERARCHY) {
@@ -956,7 +956,7 @@ TkChangeEventWindow(
     } else {
 	eventPtr->xmotion.x = 0;
 	eventPtr->xmotion.y = 0;
-	eventPtr->xmotion.subwindow = 0;
+	eventPtr->xmotion.subwindow = None;
 	sameScreen = 0;
     }
     if (eventPtr->type == MotionNotify) {
@@ -1045,7 +1045,7 @@ TkInOutEvents(
      */
 
 #define QUEUE(w, t, d)					\
-    if (w->window) {				\
+    if (w->window != None) {				\
 	eventPtr->type = t;				\
 	if (focus) {					\
 	    eventPtr->xfocus.window = w->window;	\
@@ -1161,9 +1161,9 @@ MovePointer2(
     TkWindow *winPtr;
 
     winPtr = sourcePtr;
-    if (!winPtr || !winPtr->window) {
+    if ((winPtr == NULL) || (winPtr->window == None)) {
 	winPtr = destPtr;
-	if (!winPtr || !winPtr->window) {
+	if ((winPtr == NULL) || (winPtr->window == None)) {
 	    return;
 	}
     }
@@ -1355,7 +1355,7 @@ QueueGrabWindowChange(
     grabEvPtr->header.proc = GrabWinEventProc;
     grabEvPtr->dispPtr = dispPtr;
     if (grabWinPtr == NULL) {
-	grabEvPtr->grabWindow = 0;
+	grabEvPtr->grabWindow = None;
     } else {
 	grabEvPtr->grabWindow = grabWinPtr->window;
     }