1 files changed, 13 insertions, 13 deletions

diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index f6f5150..2bd9ea7 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGeometry.c,v 1.12 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkGeometry.c,v 1.13 2008/04/27 22:38:56 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -86,7 +86,7 @@ void
 Tk_ManageGeometry(
     Tk_Window tkwin,		/* Window whose geometry is to be managed by
 				 * proc. */
-    CONST Tk_GeomMgr *mgrPtr,	/* Static structure describing the geometry
+    const Tk_GeomMgr *mgrPtr,	/* Static structure describing the geometry
 				 * manager. This structure must never go
 				 * away. */
     ClientData clientData)	/* Arbitrary one-word argument to pass to
@@ -381,7 +381,7 @@ Tk_MaintainGeometry(
     hPtr = Tcl_CreateHashEntry(&dispPtr->maintainHashTable,
 	    (char *) master, &isNew);
     if (!isNew) {
-	masterPtr = (MaintainMaster *) Tcl_GetHashValue(hPtr);
+	masterPtr = Tcl_GetHashValue(hPtr);
     } else {
 	masterPtr = (MaintainMaster *) ckalloc(sizeof(MaintainMaster));
 	masterPtr->ancestor = master;
@@ -407,7 +407,7 @@ Tk_MaintainGeometry(
     slavePtr->nextPtr = masterPtr->slavePtr;
     masterPtr->slavePtr = slavePtr;
     Tk_CreateEventHandler(slave, StructureNotifyMask, MaintainSlaveProc,
-	    (ClientData) slavePtr);
+	    slavePtr);
 
     /*
      * Make sure that there are event handlers registered for all the windows
@@ -420,7 +420,7 @@ Tk_MaintainGeometry(
 	    ancestor = Tk_Parent(ancestor)) {
 	if (ancestor == masterPtr->ancestor) {
 	    Tk_CreateEventHandler(ancestor, StructureNotifyMask,
-		    MaintainMasterProc, (ClientData) masterPtr);
+		    MaintainMasterProc, masterPtr);
 	    masterPtr->ancestor = Tk_Parent(ancestor);
 	}
     }
@@ -511,7 +511,7 @@ Tk_UnmaintainGeometry(
     if (hPtr == NULL) {
 	return;
     }
-    masterPtr = (MaintainMaster *) Tcl_GetHashValue(hPtr);
+    masterPtr = Tcl_GetHashValue(hPtr);
     slavePtr = masterPtr->slavePtr;
     if (slavePtr->slave == slave) {
 	masterPtr->slavePtr = slavePtr->nextPtr;
@@ -528,20 +528,20 @@ Tk_UnmaintainGeometry(
 	}
     }
     Tk_DeleteEventHandler(slavePtr->slave, StructureNotifyMask,
-	    MaintainSlaveProc, (ClientData) slavePtr);
+	    MaintainSlaveProc, slavePtr);
     ckfree((char *) slavePtr);
     if (masterPtr->slavePtr == NULL) {
 	if (masterPtr->ancestor != NULL) {
 	    for (ancestor = master; ; ancestor = Tk_Parent(ancestor)) {
 		Tk_DeleteEventHandler(ancestor, StructureNotifyMask,
-			MaintainMasterProc, (ClientData) masterPtr);
+			MaintainMasterProc, masterPtr);
 		if (ancestor == masterPtr->ancestor) {
 		    break;
 		}
 	    }
 	}
 	if (masterPtr->checkScheduled) {
-	    Tcl_CancelIdleCall(MaintainCheckProc, (ClientData) masterPtr);
+	    Tcl_CancelIdleCall(MaintainCheckProc, masterPtr);
 	}
 	Tcl_DeleteHashEntry(hPtr);
 	ckfree((char *) masterPtr);
@@ -575,7 +575,7 @@ MaintainMasterProc(
 				 * master window. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainMaster *masterPtr = (MaintainMaster *) clientData;
+    MaintainMaster *masterPtr = clientData;
     MaintainSlave *slavePtr;
     int done;
 
@@ -584,7 +584,7 @@ MaintainMasterProc(
 	    || (eventPtr->type == UnmapNotify)) {
 	if (!masterPtr->checkScheduled) {
 	    masterPtr->checkScheduled = 1;
-	    Tcl_DoWhenIdle(MaintainCheckProc, (ClientData) masterPtr);
+	    Tcl_DoWhenIdle(MaintainCheckProc, masterPtr);
 	}
     } else if (eventPtr->type == DestroyNotify) {
 	/*
@@ -629,7 +629,7 @@ MaintainSlaveProc(
 				 * master-slave pair. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainSlave *slavePtr = (MaintainSlave *) clientData;
+    MaintainSlave *slavePtr = clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
@@ -661,7 +661,7 @@ MaintainCheckProc(
     ClientData clientData)	/* Pointer to MaintainMaster structure for the
 				 * master window. */
 {
-    MaintainMaster *masterPtr = (MaintainMaster *) clientData;
+    MaintainMaster *masterPtr = clientData;
     MaintainSlave *slavePtr;
     Tk_Window ancestor, parent;
     int x, y, map;