* generic/tkBind.c (TkBindFree):

        * generic/tkGrid.c (ResolveConstraints,CheckSlotData,DestroyGrid):
        * generic/tkSelect.c (Tk_DeleteSelHandler,TkSelDeadWindow): Replaced
        Tcl_Free calls with ckfree so that memory debugging is fully supported.

4 files changed, 21 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index cc86afb..cce183e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-04  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tkBind.c (TkBindFree):
+	* generic/tkGrid.c (ResolveConstraints,CheckSlotData,DestroyGrid):
+	* generic/tkSelect.c (Tk_DeleteSelHandler,TkSelDeadWindow): Replaced
+	Tcl_Free calls with ckfree so that memory debugging is fully supported.
+
 2001-12-28  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* test/winButton.test:
diff --git a/generic/tkBind.c b/generic/tkBind.c
index ddd7e39..398c59e 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- *  RCS: @(#) $Id: tkBind.c,v 1.18 2001/09/25 16:25:20 dgp Exp $
+ *  RCS: @(#) $Id: tkBind.c,v 1.19 2002/01/04 16:35:04 dgp Exp $
  */
 
 #include "tkPort.h"
@@ -810,7 +810,7 @@ TkBindFree(mainPtr)
     bindInfoPtr = (BindInfo *) mainPtr->bindInfo;
     DeleteVirtualEventTable(&bindInfoPtr->virtualEventTable);
     bindInfoPtr->deleted = 1;
-    Tcl_EventuallyFree((ClientData) bindInfoPtr, Tcl_Free);
+    Tcl_EventuallyFree((ClientData) bindInfoPtr, TCL_DYNAMIC);
     mainPtr->bindInfo = NULL;
 }
 
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index b9f841a..9b387da 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrid.c,v 1.18 2001/11/23 02:04:48 das Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.19 2002/01/04 16:35:04 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -1848,7 +1848,7 @@ ResolveConstraints(masterPtr, slotType, maxOffset)
 		    UniformGroup *old = uniformGroupPtr;
 		    memcpy((VOID *) new, (VOID *) old, oldSize);
 		    if (old != uniformPre) {
-			Tcl_Free((char *) old);
+			ckfree((char *) old);
 		    }
 		    uniformGroupPtr = new;
 		    uniformGroupsAlloced += UNIFORM_PREALLOC;
@@ -1888,7 +1888,7 @@ ResolveConstraints(masterPtr, slotType, maxOffset)
     }
 
     if (uniformGroupPtr != uniformPre) {
-	Tcl_Free((char *) uniformGroupPtr);
+	ckfree((char *) uniformGroupPtr);
     }
 
     /*
@@ -2074,7 +2074,7 @@ ResolveConstraints(masterPtr, slotType, maxOffset)
 
     --layoutPtr;
     if (layoutPtr != layoutData) {
-	Tcl_Free((char *)layoutPtr);
+	ckfree((char *)layoutPtr);
     }
     return requiredSize;
 }
@@ -2254,7 +2254,7 @@ CheckSlotData(masterPtr, slot, slotType, checkOnly)
 		    masterPtr->masterDataPtr->columnPtr;
 	    memcpy((VOID *) new, (VOID *) old, oldSize );
 	    memset((VOID *) (new+numSlot), 0, newSize - oldSize );
-	    Tcl_Free((char *) old);
+	    ckfree((char *) old);
 	    if (slotType == ROW) {
 	 	masterPtr->masterDataPtr->rowPtr = new ;
 	    	masterPtr->masterDataPtr->rowSpace = newNumSlot ;
@@ -2405,14 +2405,14 @@ DestroyGrid(memPtr)
 
     if (gridPtr->masterDataPtr != NULL) {
 	if (gridPtr->masterDataPtr->rowPtr != NULL) {
-	    Tcl_Free((char *) gridPtr->masterDataPtr -> rowPtr);
+	    ckfree((char *) gridPtr->masterDataPtr -> rowPtr);
 	}
 	if (gridPtr->masterDataPtr->columnPtr != NULL) {
-	    Tcl_Free((char *) gridPtr->masterDataPtr -> columnPtr);
+	    ckfree((char *) gridPtr->masterDataPtr -> columnPtr);
 	}
-	Tcl_Free((char *) gridPtr->masterDataPtr);
+	ckfree((char *) gridPtr->masterDataPtr);
     }
-    Tcl_Free((char *) gridPtr);
+    ckfree((char *) gridPtr);
 }
 
 /*
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index 9d6285d..a8335c4 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkSelect.c,v 1.7 2001/07/03 01:03:16 hobbs Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.8 2002/01/04 16:35:04 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -325,7 +325,7 @@ Tk_DeleteSelHandler(tkwin, selection, target)
 	 */
 
 	((CommandInfo*)selPtr->clientData)->interp = NULL;
-	Tcl_EventuallyFree(selPtr->clientData, Tcl_Free);
+	Tcl_EventuallyFree(selPtr->clientData, TCL_DYNAMIC);
     }
     ckfree((char *) selPtr);
 }
@@ -1122,7 +1122,7 @@ TkSelDeadWindow(winPtr)
 	     */
 
 	    ((CommandInfo*)selPtr->clientData)->interp = NULL;
-	    Tcl_EventuallyFree(selPtr->clientData, Tcl_Free);
+	    Tcl_EventuallyFree(selPtr->clientData, TCL_DYNAMIC);
 	}
 	ckfree((char *) selPtr);
     }