Change variable name from gridPtr2 to slavePtr since it really is a slave.

1 files changed, 12 insertions, 12 deletions

diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 9c4ad82..20e66b6 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -2868,18 +2868,18 @@ GridStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	register Gridder *gridPtr2, *nextPtr;
+	register Gridder *slavePtr, *nextPtr;
 
 	if (gridPtr->masterPtr != NULL) {
 	    Unlink(gridPtr);
 	}
-	for (gridPtr2 = gridPtr->slavePtr; gridPtr2 != NULL;
-		gridPtr2 = nextPtr) {
-	    Tk_ManageGeometry(gridPtr2->tkwin, NULL, NULL);
-	    Tk_UnmapWindow(gridPtr2->tkwin);
-	    gridPtr2->masterPtr = NULL;
-	    nextPtr = gridPtr2->nextPtr;
-	    gridPtr2->nextPtr = NULL;
+	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
+		slavePtr = nextPtr) {
+	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(slavePtr->tkwin);
+	    slavePtr->masterPtr = NULL;
+	    nextPtr = slavePtr->nextPtr;
+	    slavePtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->gridHashTable,
 		(char *) gridPtr->tkwin));
@@ -2895,11 +2895,11 @@ GridStructureProc(
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	register Gridder *gridPtr2;
+	register Gridder *slavePtr;
 
-	for (gridPtr2 = gridPtr->slavePtr; gridPtr2 != NULL;
-		gridPtr2 = gridPtr2->nextPtr) {
-	    Tk_UnmapWindow(gridPtr2->tkwin);
+	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
+		slavePtr = slavePtr->nextPtr) {
+	    Tk_UnmapWindow(slavePtr->tkwin);
 	}
     }
 }