* generic/tk3d.c: All uses of 'panic' (the macro) changed

	* generic/tkBind.c:	to 'Tcl_Panic' (the function).  The #define
	* generic/tkBitmap.c:	of panic in tcl.h clearly states it is
	* generic/tkCanvArc.c:	deprecated in the comments.
	* generic/tkCanvBmap.c: [Tcl Patch 865264]
	* generic/tkCanvImg.c:
	* generic/tkCanvLine.c:
	* generic/tkCanvPoly.c:
	* generic/tkCanvText.c:
	* generic/tkCanvWind.c:
	* generic/tkColor.c:
	* generic/tkConfig.c:
	* generic/tkCursor.c:
	* generic/tkError.c:
	* generic/tkEvent.c:
	* generic/tkFocus.c:
	* generic/tkFont.c:
	* generic/tkFrame.c:
	* generic/tkGC.c:
	* generic/tkGrid.c:
	* generic/tkImgBmap.c:
	* generic/tkImgPhoto.c:
	* generic/tkImgUtil.c:
	* generic/tkMenu.c:
	* generic/tkObj.c:
	* generic/tkPack.c:
	* generic/tkPlace.c:
	* generic/tkRectOval.c:
	* generic/tkSelect.c:
	* generic/tkText.c:
	* generic/tkTextBTree.c:
	* generic/tkTextDisp.c:
	* generic/tkTextImage.c:
	* generic/tkTextIndex.c:
	* generic/tkTextMark.c:
	* generic/tkTextWind.c:
	* generic/tkVisual.c:
	* generic/tkWindow.c:
	* mac/tkMacAppInit.c:
	* mac/tkMacAppearanceStubs.c:
	* mac/tkMacButton.c:
	* mac/tkMacDraw.c:
	* mac/tkMacEmbed.c:
	* mac/tkMacFont.c:
	* mac/tkMacInit.c:
	* mac/tkMacMenus.c:
	* mac/tkMacPort.h:
	* mac/tkMacSubwindows.c:
	* mac/tkMacWm.c:
	* mac/tkMacXStubs.c:
	* macosx/tkMacOSXEmbed.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXNotify.c:
	* macosx/tkMacOSXPort.h:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:
	* unix/tkUnix3d.c:
	* unix/tkUnixColor.c:
	* unix/tkUnixEmbed.c:
	* unix/tkUnixEvent.c:
	* unix/tkUnixFocus.c:
	* unix/tkUnixFont.c:
	* unix/tkUnixSelect.c:
	* unix/tkUnixSend.c:
	* unix/tkUnixWm.c:
	* win/tkWin3d.c:
	* win/tkWinButton.c:
	* win/tkWinColor.c:
	* win/tkWinDialog.c:
	* win/tkWinDraw.c:
	* win/tkWinEmbed.c:
	* win/tkWinFont.c:
	* win/tkWinPixmap.c:
	* win/tkWinPointer.c:
	* win/tkWinScrlbr.c:
	* win/tkWinWm.c:
	* win/tkWinX.c:


FossilOrigin-Name: a08e5aacfc9f6c5a344c2d05454773dac90710c2

38 files changed, 201 insertions, 199 deletions

diff --git a/generic/tk3d.c b/generic/tk3d.c
index 3c6492e..dc69662 100644
--- a/generic/tk3d.c
+++ b/generic/tk3d.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: tk3d.c,v 1.13 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tk3d.c,v 1.14 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tk3d.h"
@@ -392,7 +392,7 @@ Tk_3DBorderGC(tkwin, border, which)
     } else if (which == TK_3D_DARK_GC){
 	return borderPtr->darkGC;
     }
-    panic("bogus \"which\" value in Tk_3DBorderGC");
+    Tcl_Panic("bogus \"which\" value in Tk_3DBorderGC");
 
     /*
      * The code below will never be executed, but it's needed to
@@ -1314,7 +1314,7 @@ Tk_Get3DBorderFromObj(tkwin, objPtr)
     }
 
     error:
-    panic("Tk_Get3DBorderFromObj called with non-existent border!");
+    Tcl_Panic("Tk_Get3DBorderFromObj called with non-existent border!");
     /*
      * The following code isn't reached; it's just there to please compilers.
      */
@@ -1395,7 +1395,7 @@ TkDebugBorder(tkwin, name)
     if (hashPtr != NULL) {
 	borderPtr = (TkBorder *) Tcl_GetHashValue(hashPtr);
 	if (borderPtr == NULL) {
-	    panic("TkDebugBorder found empty hash table entry");
+	    Tcl_Panic("TkDebugBorder found empty hash table entry");
 	}
 	for ( ; (borderPtr != NULL); borderPtr = borderPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 7f6fc04..5fef710 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.29 2003/04/14 23:34:41 mdejong Exp $
+ *  RCS: @(#) $Id: tkBind.c,v 1.30 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -746,7 +746,7 @@ TkBindInit(mainPtr)
     BindInfo *bindInfoPtr;
 
     if (sizeof(XEvent) < sizeof(XVirtualEvent)) {
-	panic("TkBindInit: virtual events can't be supported");
+	Tcl_Panic("TkBindInit: virtual events can't be supported");
     }
 
     /*
@@ -1177,7 +1177,7 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
 
     hPtr = Tcl_FindHashEntry(&bindPtr->objectTable, (char *) object);
     if (hPtr == NULL) {
-	panic("Tk_DeleteBinding couldn't find object table entry");
+	Tcl_Panic("Tk_DeleteBinding couldn't find object table entry");
     }
     prevPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
     if (prevPtr == psPtr) {
@@ -1185,7 +1185,7 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
     } else {
 	for ( ; ; prevPtr = prevPtr->nextObjPtr) {
 	    if (prevPtr == NULL) {
-		panic("Tk_DeleteBinding couldn't find on object list");
+		Tcl_Panic("Tk_DeleteBinding couldn't find on object list");
 	    }
 	    if (prevPtr->nextObjPtr == psPtr) {
 		prevPtr->nextObjPtr = psPtr->nextObjPtr;
@@ -1203,7 +1203,7 @@ Tk_DeleteBinding(interp, bindingTable, object, eventString)
     } else {
 	for ( ; ; prevPtr = prevPtr->nextSeqPtr) {
 	    if (prevPtr == NULL) {
-		panic("Tk_DeleteBinding couldn't find on hash chain");
+		Tcl_Panic("Tk_DeleteBinding couldn't find on hash chain");
 	    }
 	    if (prevPtr->nextSeqPtr == psPtr) {
 		prevPtr->nextSeqPtr = psPtr->nextSeqPtr;
@@ -1375,7 +1375,7 @@ Tk_DeleteAllBindings(bindingTable, object)
 	} else {
 	    for ( ; ; prevPtr = prevPtr->nextSeqPtr) {
 		if (prevPtr == NULL) {
-		    panic("Tk_DeleteAllBindings couldn't find on hash chain");
+		    Tcl_Panic("Tk_DeleteAllBindings couldn't find on hash chain");
 		}
 		if (prevPtr->nextSeqPtr == psPtr) {
 		    prevPtr->nextSeqPtr = psPtr->nextSeqPtr;
@@ -1664,7 +1664,7 @@ Tk_BindEvent(bindingTable, eventPtr, tkwin, numObjects, objectPtr)
     
 	if (matchPtr != NULL) {
 	    if (sourcePtr->eventProc == NULL) {
-		panic("Tk_BindEvent: missing command");
+		Tcl_Panic("Tk_BindEvent: missing command");
 	    }
 	    if (sourcePtr->eventProc == EvalTclBinding) {
 		ExpandPercents(winPtr, (char *) sourcePtr->clientData,
@@ -2200,7 +2200,7 @@ MatchPatterns(dispPtr, bindPtr, psPtr, bestPtr, objectPtr, sourcePtrPtr)
 		    virtMatchPtr = (PatSeq *) Tcl_GetHashValue(hPtr);
 		    if ((virtMatchPtr->numPats != 1)
 			    || (virtMatchPtr->nextSeqPtr != NULL)) {
-			panic("MatchPattern: badly constructed virtual event");
+			Tcl_Panic("MatchPattern: badly constructed virtual event");
 		    }
 		    sourcePtr = virtMatchPtr;
 		    goto match;
@@ -3101,7 +3101,7 @@ DeleteVirtualEvent(interp, vetPtr, virtString, eventString)
 		}
 	    }
 	    if (iVirt == voPtr->numOwners) {
-		panic("DeleteVirtualEvent: couldn't find owner");
+		Tcl_Panic("DeleteVirtualEvent: couldn't find owner");
 	    }
 	    voPtr->numOwners--;
 	    if (voPtr->numOwners == 0) {
@@ -3120,7 +3120,7 @@ DeleteVirtualEvent(interp, vetPtr, virtString, eventString)
 		} else {
 		    for ( ; ; prevPtr = prevPtr->nextSeqPtr) {
 			if (prevPtr == NULL) {
-			    panic("DeleteVirtualEvent couldn't find on hash chain");
+			    Tcl_Panic("DeleteVirtualEvent couldn't find on hash chain");
 			}
 			if (prevPtr->nextSeqPtr == psPtr) {
 			    prevPtr->nextSeqPtr = psPtr->nextSeqPtr;
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index 3f9e2e6..dd971f6 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.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: tkBitmap.c,v 1.10 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkBitmap.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -402,7 +402,7 @@ GetBitmap(interp, tkwin, string)
 		bitmap = TkpCreateNativeBitmap(Tk_Display(tkwin),
 		    predefPtr->source);
 		if (bitmap == None) {
-		    panic("native bitmap creation failed");
+		    Tcl_Panic("native bitmap creation failed");
 		}
 	    } else {
 		bitmap = XCreateBitmapFromData(Tk_Display(tkwin),
@@ -429,7 +429,7 @@ GetBitmap(interp, tkwin, string)
     bitmapPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->bitmapIdTable, 
             (char *) bitmap, &new);
     if (!new) {
-	panic("bitmap already registered in Tk_GetBitmap");
+	Tcl_Panic("bitmap already registered in Tk_GetBitmap");
     }
     bitmapPtr->nextPtr = existingBitmapPtr;
     Tcl_SetHashValue(nameHashPtr, bitmapPtr);
@@ -535,7 +535,7 @@ Tk_NameOfBitmap(display, bitmap)
 
     if (dispPtr == NULL || !dispPtr->bitmapInit) {
 	unknown:
-	panic("Tk_NameOfBitmap received unknown bitmap argument");
+	Tcl_Panic("Tk_NameOfBitmap received unknown bitmap argument");
     }
 
     idHashPtr = Tcl_FindHashEntry(&dispPtr->bitmapIdTable, (char *) bitmap);
@@ -579,7 +579,7 @@ Tk_SizeOfBitmap(display, bitmap, widthPtr, heightPtr)
 
     if (!dispPtr->bitmapInit) {
 	unknownBitmap:
-	panic("Tk_SizeOfBitmap received unknown bitmap argument");
+	Tcl_Panic("Tk_SizeOfBitmap received unknown bitmap argument");
     }
 
     idHashPtr = Tcl_FindHashEntry(&dispPtr->bitmapIdTable, (char *) bitmap);
@@ -669,12 +669,12 @@ Tk_FreeBitmap(display, bitmap)
     TkDisplay *dispPtr = TkGetDisplay(display);
 
     if (!dispPtr->bitmapInit) {
-	panic("Tk_FreeBitmap called before Tk_GetBitmap");
+	Tcl_Panic("Tk_FreeBitmap called before Tk_GetBitmap");
     }
 
     idHashPtr = Tcl_FindHashEntry(&dispPtr->bitmapIdTable, (char *) bitmap);
     if (idHashPtr == NULL) {
-	panic("Tk_FreeBitmap received unknown bitmap argument");
+	Tcl_Panic("Tk_FreeBitmap received unknown bitmap argument");
     }
     FreeBitmap((TkBitmap *) Tcl_GetHashValue(idHashPtr));
 }
@@ -935,7 +935,7 @@ GetBitmapFromObj(tkwin, objPtr)
     }
 
     error:
-    panic("GetBitmapFromObj called with non-existent bitmap!");
+    Tcl_Panic("GetBitmapFromObj called with non-existent bitmap!");
     /*
      * The following code isn't reached; it's just there to please compilers.
      */
@@ -1146,7 +1146,7 @@ TkDebugBitmap(tkwin, name)
     if (hashPtr != NULL) {
 	bitmapPtr = (TkBitmap *) Tcl_GetHashValue(hashPtr);
 	if (bitmapPtr == NULL) {
-	    panic("TkDebugBitmap found empty hash table entry");
+	    Tcl_Panic("TkDebugBitmap found empty hash table entry");
 	}
 	for ( ; (bitmapPtr != NULL); bitmapPtr = bitmapPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c
index 096e23b..276a49a 100644
--- a/generic/tkCanvArc.c
+++ b/generic/tkCanvArc.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvArc.c,v 1.11 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvArc.c,v 1.12 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -298,7 +298,7 @@ CreateArc(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c
index f47f380..887c554 100644
--- a/generic/tkCanvBmap.c
+++ b/generic/tkCanvBmap.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvBmap.c,v 1.8 2003/04/18 21:54:27 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvBmap.c,v 1.9 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -180,7 +180,7 @@ TkcCreateBitmap(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c
index 5aa036b..d0f6122 100644
--- a/generic/tkCanvImg.c
+++ b/generic/tkCanvImg.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvImg.c,v 1.6 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvImg.c,v 1.7 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -172,7 +172,7 @@ CreateImage(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index d8be008..a10ff55 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.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: tkCanvLine.c,v 1.13 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvLine.c,v 1.14 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -303,7 +303,7 @@ CreateLine(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
@@ -1876,7 +1876,7 @@ ParseArrowShape(clientData, interp, tkwin, value, recordPtr, offset)
     CONST char **argv = NULL;
 
     if (offset != Tk_Offset(LineItem, arrowShapeA)) {
-	panic("ParseArrowShape received bogus offset");
+	Tcl_Panic("ParseArrowShape received bogus offset");
     }
 
     if (Tcl_SplitList(interp, (char *) value, &argc, &argv) != TCL_OK) {
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index 124c8d1..3291300 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.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: tkCanvPoly.c,v 1.11 2003/05/11 00:52:41 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvPoly.c,v 1.12 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -267,7 +267,7 @@ CreatePolygon(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index 7adb737..ee3ad22 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvText.c,v 1.15 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvText.c,v 1.16 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -238,7 +238,7 @@ CreateText(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c
index a820163..bc4d1fe 100644
--- a/generic/tkCanvWind.c
+++ b/generic/tkCanvWind.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvWind.c,v 1.9 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvWind.c,v 1.10 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -187,7 +187,7 @@ CreateWinItem(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkColor.c b/generic/tkColor.c
index b3cc9bb..4aa82bb 100644
--- a/generic/tkColor.c
+++ b/generic/tkColor.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: tkColor.c,v 1.9 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkColor.c,v 1.10 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkColor.h"
@@ -420,7 +420,7 @@ Tk_GCForColor(colorPtr, drawable)
      */
 
     if (tkColPtr->magic != COLOR_MAGIC) {
-	panic("Tk_GCForColor called with bogus color");
+	Tcl_Panic("Tk_GCForColor called with bogus color");
     }
 
     if (tkColPtr->gc == None) {
@@ -466,7 +466,7 @@ Tk_FreeColor(colorPtr)
      */
 
     if (tkColPtr->magic != COLOR_MAGIC) {
-	panic("Tk_FreeColor called with bogus color");
+	Tcl_Panic("Tk_FreeColor called with bogus color");
     }
 
     tkColPtr->resourceRefCount--;
@@ -690,7 +690,7 @@ Tk_GetColorFromObj(tkwin, objPtr)
     }
 
     error:
-    panic(" Tk_GetColorFromObj called with non-existent color!");
+    Tcl_Panic(" Tk_GetColorFromObj called with non-existent color!");
     /*
      * The following code isn't reached; it's just there to please compilers.
      */
@@ -798,7 +798,7 @@ TkDebugColor(tkwin, name)
     if (hashPtr != NULL) {
 	tkColPtr = (TkColor *) Tcl_GetHashValue(hashPtr);
 	if (tkColPtr == NULL) {
-	    panic("TkDebugColor found empty hash table entry");
+	    Tcl_Panic("TkDebugColor found empty hash table entry");
 	}
 	for ( ; (tkColPtr != NULL); tkColPtr = tkColPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 643ef81..3cef314 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConfig.c,v 1.18 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.19 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 /*
@@ -254,7 +254,7 @@ Tk_CreateOptionTable(interp, templatePtr)
 
 	    for (specPtr2 = templatePtr, i = 0; ; specPtr2++, i++) {
 		if (specPtr2->type == TK_OPTION_END) {
-		    panic("Tk_CreateOptionTable couldn't find synonym");
+		    Tcl_Panic("Tk_CreateOptionTable couldn't find synonym");
 		}
 		if (strcmp(specPtr2->optionName,
 			(char *) specPtr->clientData) == 0) {
@@ -1554,7 +1554,7 @@ Tk_RestoreSavedOptions(savePtr)
 		    break;
 		}
 		default: {
-		    panic("bad option type in Tk_RestoreSavedOptions");
+		    Tcl_Panic("bad option type in Tk_RestoreSavedOptions");
 		}
 	    }
 	}
@@ -2076,7 +2076,7 @@ GetObjectForOption(recordPtr, optionPtr, tkwin)
 	    break;
 	}
 	default: {
-	    panic("bad option type in GetObjectForOption");
+	    Tcl_Panic("bad option type in GetObjectForOption");
 	}
     }
     if (objPtr == NULL) {
diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index fc0cd96..13a707a 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.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: tkCursor.c,v 1.10 2003/04/18 21:54:14 hobbs Exp $
+ * RCS: @(#) $Id: tkCursor.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -280,7 +280,7 @@ TkcGetCursor(interp, tkwin, string)
     cursorPtr->idHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorIdTable, 
             (char *) cursorPtr->cursor, &new);
     if (!new) {
-	panic("cursor already registered in Tk_GetCursor");
+	Tcl_Panic("cursor already registered in Tk_GetCursor");
     }
     Tcl_SetHashValue(nameHashPtr, cursorPtr);
     Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr);
@@ -386,7 +386,7 @@ Tk_GetCursorFromData(interp, tkwin, source, mask, width, height,
     cursorPtr->nextPtr = NULL;
 
     if (!new) {
-	panic("cursor already registered in Tk_GetCursorFromData");
+	Tcl_Panic("cursor already registered in Tk_GetCursorFromData");
     }
     Tcl_SetHashValue(dataHashPtr, cursorPtr);
     Tcl_SetHashValue(cursorPtr->idHashPtr, cursorPtr);
@@ -524,12 +524,12 @@ Tk_FreeCursor(display, cursor)
     TkDisplay *dispPtr = TkGetDisplay(display);
 
     if (!dispPtr->cursorInit) {
-	panic("Tk_FreeCursor called before Tk_GetCursor");
+	Tcl_Panic("Tk_FreeCursor called before Tk_GetCursor");
     }
 
     idHashPtr = Tcl_FindHashEntry(&dispPtr->cursorIdTable, (char *) cursor);
     if (idHashPtr == NULL) {
-	panic("Tk_FreeCursor received unknown cursor argument");
+	Tcl_Panic("Tk_FreeCursor received unknown cursor argument");
     }
     FreeCursor((TkCursor *) Tcl_GetHashValue(idHashPtr));
 }
@@ -730,7 +730,7 @@ GetCursorFromObj(tkwin, objPtr)
     }
 
     error:
-    panic("GetCursorFromObj called with non-existent cursor!");
+    Tcl_Panic("GetCursorFromObj called with non-existent cursor!");
     /*
      * The following code isn't reached; it's just there to please compilers.
      */
@@ -853,7 +853,7 @@ TkDebugCursor(tkwin, name)
     if (hashPtr != NULL) {
 	cursorPtr = (TkCursor *) Tcl_GetHashValue(hashPtr);
 	if (cursorPtr == NULL) {
-	    panic("TkDebugCursor found empty hash table entry");
+	    Tcl_Panic("TkDebugCursor found empty hash table entry");
 	}
 	for ( ; (cursorPtr != NULL); cursorPtr = cursorPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
diff --git a/generic/tkError.c b/generic/tkError.c
index a601720..648d440 100644
--- a/generic/tkError.c
+++ b/generic/tkError.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkError.c,v 1.2 1998/09/14 18:23:09 stanton Exp $
+ * RCS: @(#) $Id: tkError.c,v 1.3 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -105,7 +105,7 @@ Tk_CreateErrorHandler(display, error, request, minorCode, errorProc, clientData)
 
     dispPtr = TkGetDisplay(display);
     if (dispPtr == NULL) {
-	panic("Unknown display passed to Tk_CreateErrorHandler");
+	Tcl_Panic("Unknown display passed to Tk_CreateErrorHandler");
     }
 
     /*
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index f6bf9d4..3045eb4 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.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: tkEvent.c,v 1.19 2003/12/21 23:50:13 davygrvy Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.20 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -927,7 +927,7 @@ Tk_HandleEvent(eventPtr)
 		    preedit_attr = XVaCreateNestedList(0, XNSpotLocation,
 			    &spot, XNFontSet, dispPtr->inputXfs, NULL);
 		    if (winPtr->inputContext != NULL)
-		        panic("inputContext not NULL");
+		        Tcl_Panic("inputContext not NULL");
 		    winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
 			    XNInputStyle, XIMPreeditPosition|XIMStatusNothing,
 			    XNClientWindow, winPtr->window,
@@ -937,7 +937,7 @@ Tk_HandleEvent(eventPtr)
 		    XFree(preedit_attr);
 		} else {
 		    if (winPtr->inputContext != NULL)
-		        panic("inputContext not NULL");
+		        Tcl_Panic("inputContext not NULL");
 		    winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
 			    XNInputStyle, XIMPreeditNothing|XIMStatusNothing,
 			    XNClientWindow, winPtr->window,
@@ -946,7 +946,7 @@ Tk_HandleEvent(eventPtr)
 		}
 #else
 		if (winPtr->inputContext != NULL)
-		    panic("inputContext not NULL");
+		    Tcl_Panic("inputContext not NULL");
 		winPtr->inputContext = XCreateIC(dispPtr->inputMethod,
 			XNInputStyle, XIMPreeditNothing|XIMStatusNothing,
 			XNClientWindow, winPtr->window,
@@ -1348,7 +1348,7 @@ Tk_QueueWindowEvent(eventPtr, position)
 	 */
 
 	if (dispPtr->delayedMotionPtr != NULL) {
-	    panic("Tk_QueueWindowEvent found unexpected delayed motion event");
+	    Tcl_Panic("Tk_QueueWindowEvent found unexpected delayed motion event");
 	}
 	dispPtr->delayedMotionPtr = wevPtr;
 	Tcl_DoWhenIdle(DelayedMotionProc, (ClientData) dispPtr);
@@ -1474,7 +1474,7 @@ DelayedMotionProc(clientData)
     TkDisplay *dispPtr = (TkDisplay *) clientData;
 
     if (dispPtr->delayedMotionPtr == NULL) {
-	panic("DelayedMotionProc found no delayed mouse motion event");
+	Tcl_Panic("DelayedMotionProc found no delayed mouse motion event");
     }
     Tcl_QueueEvent(&dispPtr->delayedMotionPtr->header, TCL_QUEUE_TAIL);
     dispPtr->delayedMotionPtr = NULL;
diff --git a/generic/tkFocus.c b/generic/tkFocus.c
index 93af5f5..967cd1c 100644
--- a/generic/tkFocus.c
+++ b/generic/tkFocus.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: tkFocus.c,v 1.10 2002/10/08 19:57:59 hobbs Exp $
+ * RCS: @(#) $Id: tkFocus.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -234,7 +234,7 @@ Tk_FocusObjCmd(clientData, interp, objc, objv)
 	    break;
 	}
 	default: {
-	    panic("bad const entries to focusOptions in focus command");
+	    Tcl_Panic("bad const entries to focusOptions in focus command");
 	}
     }
     return TCL_OK;
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 23f28dc..8274cfe 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.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: tkFont.c,v 1.21 2002/09/02 19:13:47 hobbs Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.22 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -437,7 +437,7 @@ TkFontPkgFree(mainPtr)
     }
 #ifdef PURIFY
     if (fontsLeft) {
-	panic("TkFontPkgFree: all fonts should have been freed already");
+	Tcl_Panic("TkFontPkgFree: all fonts should have been freed already");
     }
 #endif
     Tcl_DeleteHashTable(&fiPtr->fontCache);
@@ -1216,7 +1216,7 @@ Tk_GetFontFromObj(tkwin, objPtr)
 	}
     }
 
-    panic("Tk_GetFontFromObj called with non-existent font!");
+    Tcl_Panic("Tk_GetFontFromObj called with non-existent font!");
     return NULL;
 }
 
@@ -3700,7 +3700,7 @@ TkDebugFont(tkwin, name)
     if (hashPtr != NULL) {
 	fontPtr = (TkFont *) Tcl_GetHashValue(hashPtr);
 	if (fontPtr == NULL) {
-	    panic("TkDebugFont found empty hash table entry");
+	    Tcl_Panic("TkDebugFont found empty hash table entry");
 	}
 	for ( ; (fontPtr != NULL); fontPtr = fontPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 928bea1..8a50675 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFrame.c,v 1.16 2003/07/16 23:16:52 pspjuth Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.17 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "default.h"
@@ -1818,7 +1818,7 @@ TkInstallFrameMenu(tkwin)
 	Frame *framePtr;
 	framePtr = (Frame*) winPtr->instanceData;
 	if (framePtr == NULL) {
-	    panic("TkInstallFrameMenu couldn't get frame pointer");
+	    Tcl_Panic("TkInstallFrameMenu couldn't get frame pointer");
 	}
 	TkpMenuNotifyToplevelCreate(winPtr->mainPtr->interp, 
 		framePtr->menuName);
diff --git a/generic/tkGC.c b/generic/tkGC.c
index e8b4c2d..5bb16f5 100644
--- a/generic/tkGC.c
+++ b/generic/tkGC.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: tkGC.c,v 1.4 2002/04/12 10:02:40 hobbs Exp $
+ * RCS: @(#) $Id: tkGC.c,v 1.5 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -259,7 +259,7 @@ Tk_GetGC(tkwin, valueMask, valuePtr)
     idHashPtr = Tcl_CreateHashEntry(&dispPtr->gcIdTable, 
             (char *) gcPtr->gc, &new);
     if (!new) {
-	panic("GC already registered in Tk_GetGC");
+	Tcl_Panic("GC already registered in Tk_GetGC");
     }
     Tcl_SetHashValue(valueHashPtr, gcPtr);
     Tcl_SetHashValue(idHashPtr, gcPtr);
@@ -298,7 +298,7 @@ Tk_FreeGC(display, gc)
     TkDisplay *dispPtr = TkGetDisplay(display);
 
     if (!dispPtr->gcInit) {
-	panic("Tk_FreeGC called before Tk_GetGC");
+	Tcl_Panic("Tk_FreeGC called before Tk_GetGC");
     }
     if (dispPtr->gcInit < 0) {
 	/*
@@ -311,7 +311,7 @@ Tk_FreeGC(display, gc)
 
     idHashPtr = Tcl_FindHashEntry(&dispPtr->gcIdTable, (char *) gc);
     if (idHashPtr == NULL) {
-	panic("Tk_FreeGC received unknown gc argument");
+	Tcl_Panic("Tk_FreeGC received unknown gc argument");
     }
     gcPtr = (TkGC *) Tcl_GetHashValue(idHashPtr);
     gcPtr->refCount--;
@@ -390,7 +390,7 @@ GCInit(dispPtr)
     TkDisplay *dispPtr;
 {
     if (dispPtr->gcInit < 0) {
-	panic("called GCInit after GCCleanup");
+	Tcl_Panic("called GCInit after GCCleanup");
     }
     dispPtr->gcInit = 1;
     Tcl_InitHashTable(&dispPtr->gcValueTable, sizeof(ValueKey)/sizeof(int));
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index fe8e47d..62b064f 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.30 2004/01/09 22:23:26 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.31 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -2560,7 +2560,7 @@ Unlink(slavePtr)
     } else {
 	for (slavePtr2 = masterPtr->slavePtr; ; slavePtr2 = slavePtr2->nextPtr) {
 	    if (slavePtr2 == NULL) {
-		panic("Unlink couldn't find previous window");
+		Tcl_Panic("Unlink couldn't find previous window");
 	    }
 	    if (slavePtr2->nextPtr == slavePtr) {
 		slavePtr2->nextPtr = slavePtr->nextPtr;
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index d89663e..b5e77c0 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.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: tkImgBmap.c,v 1.15 2002/08/05 04:30:39 dgp Exp $
+ * RCS: @(#) $Id: tkImgBmap.c,v 1.16 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -798,7 +798,7 @@ ImgBmapCmd(clientData, interp, objc, objv)
 	return code;
       }
       default: {
-	panic("bad const entries to bmapOptions in ImgBmapCmd");
+	Tcl_Panic("bad const entries to bmapOptions in ImgBmapCmd");
       }
     }
     return TCL_OK;
@@ -1025,7 +1025,7 @@ ImgBmapDelete(masterData)
     BitmapMaster *masterPtr = (BitmapMaster *) masterData;
 
     if (masterPtr->instancePtr != NULL) {
-	panic("tried to delete bitmap image when instances still exist");
+	Tcl_Panic("tried to delete bitmap image when instances still exist");
     }
     masterPtr->tkMaster = NULL;
     if (masterPtr->imageCmd != NULL) {
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index a2afd81..3b3574e 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.42 2003/10/31 18:56:30 hobbs Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.43 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -1436,7 +1436,7 @@ ImgPhotoCmd(clientData, interp, objc, objv)
 	}
 
 	}
-	panic("unexpected fallthrough");
+	Tcl_Panic("unexpected fallthrough");
     }
 
     case PHOTO_WRITE: {
@@ -1558,7 +1558,7 @@ ImgPhotoCmd(clientData, interp, objc, objv)
     }
 
     }
-    panic("unexpected fallthrough");
+    Tcl_Panic("unexpected fallthrough");
     return TCL_ERROR; /* NOT REACHED */
 }
 
@@ -2434,7 +2434,7 @@ ImgPhotoGet(tkwin, masterData)
 	XFree((char *) visInfoPtr);
 
     } else {
-	panic("ImgPhotoGet couldn't find visual for window");
+	Tcl_Panic("ImgPhotoGet couldn't find visual for window");
     }
 
     sprintf(buf, ((mono) ? "%d": "%d/%d/%d"), nRed, nGreen, nBlue);
@@ -2827,7 +2827,7 @@ ImgPhotoDelete(masterData)
 
     while ((instancePtr = masterPtr->instancePtr) != NULL) {
 	if (instancePtr->refCount > 0) {
-	    panic("tried to delete photo image when instances still exist");
+	    Tcl_Panic("tried to delete photo image when instances still exist");
 	}
 	Tcl_CancelIdleCall(DisposeInstance, (ClientData) instancePtr);
 	DisposeInstance((ClientData) instancePtr);
@@ -3111,7 +3111,7 @@ ImgPhotoInstanceSetSize(instancePtr)
 		(masterPtr->height > 0) ? masterPtr->height: 1,
 		instancePtr->visualInfo.depth);
         if (!newPixmap) {
-            panic("Fail to create pixmap with Tk_GetPixmap in ImgPhotoInstanceSetSize.\n");
+            Tcl_Panic("Fail to create pixmap with Tk_GetPixmap in ImgPhotoInstanceSetSize.\n");
             return;
         }
 
@@ -3789,7 +3789,7 @@ DisposeColorTable(clientData)
 
     entry = Tcl_FindHashEntry(&imgPhotoColorHash, (char *) &colorPtr->id);
     if (entry == NULL) {
-	panic("DisposeColorTable couldn't find hash entry");
+	Tcl_Panic("DisposeColorTable couldn't find hash entry");
     }
     Tcl_DeleteHashEntry(entry);
 
@@ -4417,7 +4417,7 @@ Tk_PhotoPutBlock(interp, handle, blockPtr, x, y, width, height, compRule)
 				break;
 
 			    default:
-				panic("unknown compositing rule: %d", compRule);
+				Tcl_Panic("unknown compositing rule: %d", compRule);
 			    }
 			    srcPtr += blockPtr->pixelSize;
 			}
@@ -4724,7 +4724,7 @@ Tk_PhotoPutZoomedBlock(interp, handle, blockPtr, x, y, width, height,
 			    destPtr += 4;
 			    break;
 			default:
-			    panic("unknown compositing rule: %d", compRule);
+			    Tcl_Panic("unknown compositing rule: %d", compRule);
 			}
 		    }
 		    srcPtr += blockXSkip;
@@ -5938,7 +5938,7 @@ Tk_PhotoPutBlock_NoComposite(handle, blockPtr, x, y, width, height)
 {
     if (Tk_PhotoPutBlock(NULL, handle, blockPtr, x, y, width, height,
 	    TK_PHOTO_COMPOSITE_OVERLAY) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
 
@@ -5952,7 +5952,7 @@ Tk_PhotoPutZoomedBlock_NoComposite(handle, blockPtr, x, y, width, height,
     if (Tk_PhotoPutZoomedBlock(NULL, handle, blockPtr, x, y, width, height,
 	    zoomX, zoomY, subsampleX, subsampleY,
 	    TK_PHOTO_COMPOSITE_OVERLAY) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
 
@@ -5977,7 +5977,7 @@ Tk_PhotoExpand_Panic(handle, width, height)
     int width, height;
 {
     if (Tk_PhotoExpand(NULL, handle, width, height) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
 
@@ -5989,7 +5989,7 @@ Tk_PhotoPutBlock_Panic(handle, blockPtr, x, y, width, height, compRule)
 {
     if (Tk_PhotoPutBlock(NULL, handle, blockPtr, x, y, width, height,
 	    compRule) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
 
@@ -6002,7 +6002,7 @@ Tk_PhotoPutZoomedBlock_Panic(handle, blockPtr, x, y, width, height,
 {
     if (Tk_PhotoPutZoomedBlock(NULL, handle, blockPtr, x, y, width, height,
 	    zoomX, zoomY, subsampleX, subsampleY, compRule) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
 
@@ -6012,6 +6012,6 @@ Tk_PhotoSetSize_Panic(handle, width, height)
     int width, height;
 {
     if (Tk_PhotoSetSize(NULL, handle, width, height) != TCL_OK) {
-	panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
+	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
diff --git a/generic/tkImgUtil.c b/generic/tkImgUtil.c
index 00c8b7d..d5635aa 100644
--- a/generic/tkImgUtil.c
+++ b/generic/tkImgUtil.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: tkImgUtil.c,v 1.2 1998/09/14 18:23:13 stanton Exp $
+ * RCS: @(#) $Id: tkImgUtil.c,v 1.3 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -46,7 +46,7 @@ TkAlignImageData(image, alignment, bitOrder)
     int i, j;
 
     if (image->bits_per_pixel != 1) {
-	panic("TkAlignImageData: Can't handle image depths greater than 1.");
+	Tcl_Panic("TkAlignImageData: Can't handle image depths greater than 1.");
     }
 
     /*
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 868268a..a87eaf3 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMenu.c,v 1.24 2003/12/21 23:50:13 davygrvy Exp $
+ * RCS: @(#) $Id: tkMenu.c,v 1.25 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 /*
@@ -1230,7 +1230,7 @@ DestroyMenuInstance(menuPtr)
             }
         }
    } else if (menuPtr->nextInstancePtr != NULL) {
-       panic("Attempting to delete master menu when there are still clones.");
+       Tcl_Panic("Attempting to delete master menu when there are still clones.");
    }
 
     /*
@@ -2497,7 +2497,7 @@ MenuAddOrInsert(interp, menuPtr, indexPtr, objc, objv)
 		menuRefPtr = TkFindMenuReferencesObj(menuListPtr->interp,
 			newCascadePtr);
 		if (menuRefPtr == NULL) {
-		    panic("CloneMenu failed inside of MenuAddOrInsert.");
+		    Tcl_Panic("CloneMenu failed inside of MenuAddOrInsert.");
 		}
 		newObjv[0] = menuNamePtr;
 		newObjv[1] = newCascadePtr;
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 5338cb5..1b4414b 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkObj.c,v 1.9 2003/10/10 15:56:22 dkf Exp $
+ * RCS: @(#) $Id: tkObj.c,v 1.10 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -519,7 +519,7 @@ UpdateStringOfMM(objPtr)
     mmPtr = (MMRep *) objPtr->internalRep.otherValuePtr;
     /* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
     if ((mmPtr->units != -1) || (objPtr->bytes != NULL)) {
-        panic("UpdateStringOfMM: false precondition");
+        Tcl_Panic("UpdateStringOfMM: false precondition");
     }
 
     Tcl_PrintDouble((Tcl_Interp *) NULL, mmPtr->value, buffer);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 5378575..b7747cb 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.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: tkPack.c,v 1.18 2003/07/17 03:19:43 dgp Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.19 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -290,7 +290,7 @@ Tk_PackObjCmd(clientData, interp, objc, objv)
 	} else {
 	    for ( ; ; prevPtr = prevPtr->nextPtr) {
 		if (prevPtr == NULL) {
-		    panic("\"pack before\" couldn't find predecessor");
+		    Tcl_Panic("\"pack before\" couldn't find predecessor");
 		}
 		if (prevPtr->nextPtr == packPtr) {
 		    break;
@@ -797,7 +797,7 @@ ArrangePacking(clientData)
 		y = frameY + (borderTop + frameHeight - height - borderBtm)/2;
 		break;
 	    default:
-		panic("bad frame factor in ArrangePacking");
+		Tcl_Panic("bad frame factor in ArrangePacking");
 	}
 	width -= slavePtr->doubleBw;
 	height -= slavePtr->doubleBw;
@@ -1379,7 +1379,7 @@ Unlink(packPtr)
     } else {
 	for (packPtr2 = masterPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
 	    if (packPtr2 == NULL) {
-		panic("Unlink couldn't find previous window");
+		Tcl_Panic("Unlink couldn't find previous window");
 	    }
 	    if (packPtr2->nextPtr == packPtr) {
 		packPtr2->nextPtr = packPtr->nextPtr;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 09452b3..dacdcea 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.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: tkPlace.c,v 1.14 2003/03/12 00:09:37 mdejong Exp $
+ * RCS: @(#) $Id: tkPlace.c,v 1.15 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -472,7 +472,7 @@ UnlinkSlave(slavePtr)
 	for (prevPtr = masterPtr->slavePtr; ;
 		prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
-		panic("UnlinkSlave couldn't find slave to unlink");
+		Tcl_Panic("UnlinkSlave couldn't find slave to unlink");
 	    }
 	    if (prevPtr->nextPtr == slavePtr) {
 		prevPtr->nextPtr = slavePtr->nextPtr;
diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c
index 59d233f..454b9a5 100644
--- a/generic/tkRectOval.c
+++ b/generic/tkRectOval.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: tkRectOval.c,v 1.10 2003/02/09 07:48:22 hobbs Exp $
+ * RCS: @(#) $Id: tkRectOval.c,v 1.11 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include <stdio.h>
@@ -255,7 +255,7 @@ CreateRectOval(interp, canvas, itemPtr, objc, objv)
     int i;
 
     if (objc == 0) {
-	panic("canvas did not pass any coords\n");
+	Tcl_Panic("canvas did not pass any coords\n");
     }
 
     /*
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index d62aa43..c10c606 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.13 2003/01/14 19:24:56 jenglish Exp $
+ * RCS: @(#) $Id: tkSelect.c,v 1.14 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -609,7 +609,7 @@ Tk_GetSelection(interp, tkwin, selection, target, proc, clientData)
 	    count = TkSelDefaultSelection(infoPtr, target, buffer,
 		    TK_SEL_BYTES_AT_ONCE, &type);
 	    if (count > TK_SEL_BYTES_AT_ONCE) {
-		panic("selection handler returned too many bytes");
+		Tcl_Panic("selection handler returned too many bytes");
 	    }
 	    if (count < 0) {
 		goto cantget;
@@ -630,7 +630,7 @@ Tk_GetSelection(interp, tkwin, selection, target, proc, clientData)
 		    goto cantget;
 		}
 		if (count > TK_SEL_BYTES_AT_ONCE) {
-		    panic("selection handler returned too many bytes");
+		    Tcl_Panic("selection handler returned too many bytes");
 		}
 		buffer[count] = '\0';
 		result = (*proc)(clientData, interp, buffer);
diff --git a/generic/tkText.c b/generic/tkText.c
index 987bafa..9981e1d 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkText.c,v 1.47 2003/12/05 17:19:06 vincentdarley Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.48 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "default.h"
@@ -2465,7 +2465,7 @@ TextFetchSelection(clientData, offset, buffer, maxBytes)
 	 */
 
 	if (!TkBTreeNextTag(&search)) {
-	    panic("TextFetchSelection couldn't find end of range");
+	    Tcl_Panic("TextFetchSelection couldn't find end of range");
 	}
 
 	/*
@@ -2848,7 +2848,7 @@ TextSearchCmd(textPtr, interp, objc, objv)
 	    searchSpec.exact = 0;
 	    break;
 	default:
-	    panic("unexpected switch fallthrough");
+	    Tcl_Panic("unexpected switch fallthrough");
 	}
     }
   endOfSwitchProcessing:
@@ -3539,7 +3539,7 @@ TextDumpCmd(textPtr, interp, objc, objv)
 	    command = Tcl_GetString(objv[arg]);
 	    break;
 	default:
-	    panic("unexpected switch fallthrough");
+	    Tcl_Panic("unexpected switch fallthrough");
 	}
     }
     if (arg >= objc || arg+2 < objc) {
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index 8ac05ea..c19e288 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.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: tkTextBTree.c,v 1.12 2004/01/07 16:28:23 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextBTree.c,v 1.13 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -633,7 +633,7 @@ SplitSeg(indexPtr)
 	    return prevPtr;
 	}
     }
-    panic("SplitSeg reached end of line!");
+    Tcl_Panic("SplitSeg reached end of line!");
     return NULL;
 }
 
@@ -940,7 +940,7 @@ TkBTreeFindLine(tree, line)
 		nodePtr->numLines <= linesLeft;
 		nodePtr = nodePtr->nextPtr) {
 	    if (nodePtr == NULL) {
-		panic("TkBTreeFindLine ran out of nodes");
+		Tcl_Panic("TkBTreeFindLine ran out of nodes");
 	    }
 	    linesLeft -= nodePtr->numLines;
 	}
@@ -953,7 +953,7 @@ TkBTreeFindLine(tree, line)
     for (linePtr = nodePtr->children.linePtr; linesLeft > 0;
 	    linePtr = linePtr->nextPtr) {
 	if (linePtr == NULL) {
-	    panic("TkBTreeFindLine ran out of lines");
+	    Tcl_Panic("TkBTreeFindLine ran out of lines");
 	}
 	linesLeft -= 1;
     }
@@ -1003,7 +1003,7 @@ TkBTreeFindPixelLine(tree, pixels, pixelOffset)
     }
 
     if (nodePtr->numPixels == 0) {
-	panic("TkBTreeFindPixelLine called with empty window");
+	Tcl_Panic("TkBTreeFindPixelLine called with empty window");
     }
     
     /*
@@ -1016,7 +1016,7 @@ TkBTreeFindPixelLine(tree, pixels, pixelOffset)
 		nodePtr->numPixels <= pixelsLeft;
 		nodePtr = nodePtr->nextPtr) {
 	    if (nodePtr == NULL) {
-		panic("TkBTreeFindPixelLine ran out of nodes");
+		Tcl_Panic("TkBTreeFindPixelLine ran out of nodes");
 	    }
 	    pixelsLeft -= nodePtr->numPixels;
 	}
@@ -1030,7 +1030,7 @@ TkBTreeFindPixelLine(tree, pixels, pixelOffset)
 	    linePtr->pixelHeight < pixelsLeft;
 	    linePtr = linePtr->nextPtr) {
 	if (linePtr == NULL) {
-	    panic("TkBTreeFindPixelLine ran out of lines");
+	    Tcl_Panic("TkBTreeFindPixelLine ran out of lines");
 	}
 	pixelsLeft -= linePtr->pixelHeight;
     }
@@ -1129,7 +1129,7 @@ TkBTreePreviousLine(linePtr)
 	}
 	prevPtr = prevPtr->nextPtr;
 	if (prevPtr == (TkTextLine *) NULL) {
-	    panic("TkBTreePreviousLine ran out of lines");
+	    Tcl_Panic("TkBTreePreviousLine ran out of lines");
 	}
     }
 
@@ -1205,7 +1205,7 @@ TkBTreePixels(linePtr)
     for (linePtr2 = nodePtr->children.linePtr; linePtr2 != linePtr;
 	    linePtr2 = linePtr2->nextPtr) {
 	if (linePtr2 == NULL) {
-	    panic("TkBTreePixels couldn't find line");
+	    Tcl_Panic("TkBTreePixels couldn't find line");
 	}
 	index += linePtr2->pixelHeight;
     }
@@ -1221,7 +1221,7 @@ TkBTreePixels(linePtr)
 	for (nodePtr2 = parentPtr->children.nodePtr; nodePtr2 != nodePtr;
 		nodePtr2 = nodePtr2->nextPtr) {
 	    if (nodePtr2 == NULL) {
-		panic("TkBTreePixels couldn't find node");
+		Tcl_Panic("TkBTreePixels couldn't find node");
 	    }
 	    index += nodePtr2->numPixels;
 	}
@@ -1266,7 +1266,7 @@ TkBTreeLineIndex(linePtr)
     for (linePtr2 = nodePtr->children.linePtr; linePtr2 != linePtr;
 	    linePtr2 = linePtr2->nextPtr) {
 	if (linePtr2 == NULL) {
-	    panic("TkBTreeLineIndex couldn't find line");
+	    Tcl_Panic("TkBTreeLineIndex couldn't find line");
 	}
 	index += 1;
     }
@@ -1282,7 +1282,7 @@ TkBTreeLineIndex(linePtr)
 	for (nodePtr2 = parentPtr->children.nodePtr; nodePtr2 != nodePtr;
 		nodePtr2 = nodePtr2->nextPtr) {
 	    if (nodePtr2 == NULL) {
-		panic("TkBTreeLineIndex couldn't find node");
+		Tcl_Panic("TkBTreeLineIndex couldn't find node");
 	    }
 	    index += nodePtr2->numLines;
 	}
@@ -1604,7 +1604,7 @@ ChangeNodeToggleCount(nodePtr, tagPtr, delta)
 		 * first place).
 		 */
 
-		panic("ChangeNodeToggleCount: bad toggle count (%d) max (%d)",
+		Tcl_Panic("ChangeNodeToggleCount: bad toggle count (%d) max (%d)",
 		    summaryPtr->toggleCount, tagPtr->toggleCount);
 	    }
     
@@ -2212,7 +2212,7 @@ TkBTreeNextTag(searchPtr)
 		}
 		searchPtr->linesLeft -= nodePtr->numLines;
 		if (nodePtr->nextPtr == NULL) {
-		    panic("TkBTreeNextTag found incorrect tag summary info.");
+		    Tcl_Panic("TkBTreeNextTag found incorrect tag summary info.");
 		}
 	    }
 	    nextChild:
@@ -2426,7 +2426,7 @@ TkBTreePrevTag(searchPtr)
 		continue;
 	    }
 	    if (prevNodePtr == NULL) {
-		panic("TkBTreePrevTag found incorrect tag summary info.");
+		Tcl_Panic("TkBTreePrevTag found incorrect tag summary info.");
 	    }
 	    searchPtr->linesLeft -= linesSkipped;
 	    nodePtr = prevNodePtr;
@@ -2993,21 +2993,21 @@ TkBTreeCheck(tree)
 	nodePtr = tagPtr->tagRootPtr;
 	if (nodePtr == (Node *) NULL) {
 	    if (tagPtr->toggleCount != 0) {
-		panic("TkBTreeCheck found \"%s\" with toggles (%d) but no root",
+		Tcl_Panic("TkBTreeCheck found \"%s\" with toggles (%d) but no root",
 		    tagPtr->name, tagPtr->toggleCount);
 	    }
 	    continue;		/* no ranges for the tag */
 	} else if (tagPtr->toggleCount == 0) {
-	    panic("TkBTreeCheck found root for \"%s\" with no toggles",
+	    Tcl_Panic("TkBTreeCheck found root for \"%s\" with no toggles",
 		    tagPtr->name);
 	} else if (tagPtr->toggleCount & 1) {
-	    panic("TkBTreeCheck found odd toggle count for \"%s\" (%d)",
+	    Tcl_Panic("TkBTreeCheck found odd toggle count for \"%s\" (%d)",
 		    tagPtr->name, tagPtr->toggleCount);
 	}
 	for (summaryPtr = nodePtr->summaryPtr; summaryPtr != NULL;
 		summaryPtr = summaryPtr->nextPtr) {
 	    if (summaryPtr->tagPtr == tagPtr) {
-		panic("TkBTreeCheck found root node with summary info");
+		Tcl_Panic("TkBTreeCheck found root node with summary info");
 	    }
 	}
 	count = 0;
@@ -3035,7 +3035,7 @@ TkBTreeCheck(tree)
 	    }
 	}
 	if (count != tagPtr->toggleCount) {
-	    panic("TkBTreeCheck toggleCount (%d) wrong for \"%s\" should be (%d)",
+	    Tcl_Panic("TkBTreeCheck toggleCount (%d) wrong for \"%s\" should be (%d)",
 		tagPtr->toggleCount, tagPtr->name, count);
 	}
     }
@@ -3053,7 +3053,7 @@ TkBTreeCheck(tree)
      */
 
     if (nodePtr->numLines < 2) {
-	panic("TkBTreeCheck: less than 2 lines in tree");
+	Tcl_Panic("TkBTreeCheck: less than 2 lines in tree");
     }
     while (nodePtr->level > 0) {
 	nodePtr = nodePtr->children.nodePtr;
@@ -3078,17 +3078,17 @@ TkBTreeCheck(tree)
 	segPtr = segPtr->nextPtr;
     }
     if (segPtr->typePtr != &tkTextCharType) {
-	panic("TkBTreeCheck: last line has bogus segment type");
+	Tcl_Panic("TkBTreeCheck: last line has bogus segment type");
     }
     if (segPtr->nextPtr != NULL) {
-	panic("TkBTreeCheck: last line has too many segments");
+	Tcl_Panic("TkBTreeCheck: last line has too many segments");
     }
     if (segPtr->size != 1) {
-	panic("TkBTreeCheck: last line has wrong # characters: %d",
+	Tcl_Panic("TkBTreeCheck: last line has wrong # characters: %d",
 		segPtr->size);
     }
     if ((segPtr->body.chars[0] != '\n') || (segPtr->body.chars[1] != 0)) {
-	panic("TkBTreeCheck: last line had bad value: %s",
+	Tcl_Panic("TkBTreeCheck: last line had bad value: %s",
 		segPtr->body.chars);
     }
 }
@@ -3132,7 +3132,7 @@ CheckNodeConsistency(nodePtr)
     }
     if ((nodePtr->numChildren < minChildren)
 	    || (nodePtr->numChildren > MAX_CHILDREN)) {
-	panic("CheckNodeConsistency: bad child count (%d)",
+	Tcl_Panic("CheckNodeConsistency: bad child count (%d)",
 		nodePtr->numChildren);
     }
 
@@ -3143,10 +3143,10 @@ CheckNodeConsistency(nodePtr)
 	for (linePtr = nodePtr->children.linePtr; linePtr != NULL;
 		linePtr = linePtr->nextPtr) {
 	    if (linePtr->parentPtr != nodePtr) {
-		panic("CheckNodeConsistency: line doesn't point to parent");
+		Tcl_Panic("CheckNodeConsistency: line doesn't point to parent");
 	    }
 	    if (linePtr->segPtr == NULL) {
-		panic("CheckNodeConsistency: line has no segments");
+		Tcl_Panic("CheckNodeConsistency: line has no segments");
 	    }
 	    for (segPtr = linePtr->segPtr; segPtr != NULL;
 		    segPtr = segPtr->nextPtr) {
@@ -3157,11 +3157,11 @@ CheckNodeConsistency(nodePtr)
 			&& (segPtr->nextPtr != NULL)
 			&& (segPtr->nextPtr->size == 0)
 			&& (segPtr->nextPtr->typePtr->leftGravity)) {
-		    panic("CheckNodeConsistency: wrong segment order for gravity");
+		    Tcl_Panic("CheckNodeConsistency: wrong segment order for gravity");
 		}
 		if ((segPtr->nextPtr == NULL)
 			&& (segPtr->typePtr != &tkTextCharType)) {
-		    panic("CheckNodeConsistency: line ended with wrong type");
+		    Tcl_Panic("CheckNodeConsistency: line ended with wrong type");
 		}
 	    }
 	    numChildren++;
@@ -3172,10 +3172,10 @@ CheckNodeConsistency(nodePtr)
 	for (childNodePtr = nodePtr->children.nodePtr; childNodePtr != NULL;
 		childNodePtr = childNodePtr->nextPtr) {
 	    if (childNodePtr->parentPtr != nodePtr) {
-		panic("CheckNodeConsistency: node doesn't point to parent");
+		Tcl_Panic("CheckNodeConsistency: node doesn't point to parent");
 	    }
 	    if (childNodePtr->level != (nodePtr->level-1)) {
-		panic("CheckNodeConsistency: level mismatch (%d %d)",
+		Tcl_Panic("CheckNodeConsistency: level mismatch (%d %d)",
 			nodePtr->level, childNodePtr->level);
 	    }
 	    CheckNodeConsistency(childNodePtr);
@@ -3187,7 +3187,7 @@ CheckNodeConsistency(nodePtr)
 			if (summaryPtr->tagPtr->tagRootPtr == nodePtr) {
 			    break;
 			}
-			panic("CheckNodeConsistency: node tag \"%s\" not %s",
+			Tcl_Panic("CheckNodeConsistency: node tag \"%s\" not %s",
 				summaryPtr->tagPtr->name,
 				"present in parent summaries");
 		    }
@@ -3202,22 +3202,22 @@ CheckNodeConsistency(nodePtr)
 	}
     }
     if (numChildren != nodePtr->numChildren) {
-	panic("CheckNodeConsistency: mismatch in numChildren (%d %d)",
+	Tcl_Panic("CheckNodeConsistency: mismatch in numChildren (%d %d)",
 		numChildren, nodePtr->numChildren);
     }
     if (numLines != nodePtr->numLines) {
-	panic("CheckNodeConsistency: mismatch in numLines (%d %d)",
+	Tcl_Panic("CheckNodeConsistency: mismatch in numLines (%d %d)",
 		numLines, nodePtr->numLines);
     }
     if (numPixels != nodePtr->numPixels) {
-	panic("CheckNodeConsistency: mismatch in numPixels (%d %d)",
+	Tcl_Panic("CheckNodeConsistency: mismatch in numPixels (%d %d)",
 	      numPixels, nodePtr->numPixels);
     }
 
     for (summaryPtr = nodePtr->summaryPtr; summaryPtr != NULL;
 	    summaryPtr = summaryPtr->nextPtr) {
 	if (summaryPtr->tagPtr->toggleCount == summaryPtr->toggleCount) {
-	    panic("CheckNodeConsistency: found unpruned root for \"%s\"",
+	    Tcl_Panic("CheckNodeConsistency: found unpruned root for \"%s\"",
 		summaryPtr->tagPtr->name);
 	}
 	toggleCount = 0;
@@ -3249,13 +3249,13 @@ CheckNodeConsistency(nodePtr)
 	    }
 	}
 	if (toggleCount != summaryPtr->toggleCount) {
-	    panic("CheckNodeConsistency: mismatch in toggleCount (%d %d)",
+	    Tcl_Panic("CheckNodeConsistency: mismatch in toggleCount (%d %d)",
 		    toggleCount, summaryPtr->toggleCount);
 	}
 	for (summaryPtr2 = summaryPtr->nextPtr; summaryPtr2 != NULL;
 		summaryPtr2 = summaryPtr2->nextPtr) {
 	    if (summaryPtr2->tagPtr == summaryPtr->tagPtr) {
-		panic("CheckNodeConsistency: duplicated node tag: %s",
+		Tcl_Panic("CheckNodeConsistency: duplicated node tag: %s",
 			summaryPtr->tagPtr->name);
 	    }
 	}
@@ -3844,18 +3844,18 @@ CharCheckProc(segPtr, linePtr)
      */
 
     if (segPtr->size <= 0) {
-	panic("CharCheckProc: segment has size <= 0");
+	Tcl_Panic("CharCheckProc: segment has size <= 0");
     }
     if (strlen(segPtr->body.chars) != (size_t) segPtr->size) {
-	panic("CharCheckProc: segment has wrong size");
+	Tcl_Panic("CharCheckProc: segment has wrong size");
     }
     if (segPtr->nextPtr == NULL) {
 	if (segPtr->body.chars[segPtr->size-1] != '\n') {
-	    panic("CharCheckProc: line doesn't end with newline");
+	    Tcl_Panic("CharCheckProc: line doesn't end with newline");
 	}
     } else {
 	if (segPtr->nextPtr->typePtr == &tkTextCharType) {
-	    panic("CharCheckProc: adjacent character segments weren't merged");
+	    Tcl_Panic("CharCheckProc: adjacent character segments weren't merged");
 	}
     }
 }
@@ -4033,24 +4033,24 @@ ToggleCheckProc(segPtr, linePtr)
     int needSummary;
 
     if (segPtr->size != 0) {
-	panic("ToggleCheckProc: segment had non-zero size");
+	Tcl_Panic("ToggleCheckProc: segment had non-zero size");
     }
     if (!segPtr->body.toggle.inNodeCounts) {
-	panic("ToggleCheckProc: toggle counts not updated in nodes");
+	Tcl_Panic("ToggleCheckProc: toggle counts not updated in nodes");
     }
     needSummary = (segPtr->body.toggle.tagPtr->tagRootPtr != linePtr->parentPtr);
     for (summaryPtr = linePtr->parentPtr->summaryPtr; ;
 	    summaryPtr = summaryPtr->nextPtr) {
 	if (summaryPtr == NULL) {
 	    if (needSummary) {
-		panic("ToggleCheckProc: tag not present in node");
+		Tcl_Panic("ToggleCheckProc: tag not present in node");
 	    } else {
 		break;
 	    }
 	}
 	if (summaryPtr->tagPtr == segPtr->body.toggle.tagPtr) {
 	    if (!needSummary) {
-		panic("ToggleCheckProc: tag present in root node summary");
+		Tcl_Panic("ToggleCheckProc: tag present in root node summary");
 	    }
 	    break;
 	}
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 9cab7f8..027bba9 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTextDisp.c,v 1.39 2004/01/07 16:28:23 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.40 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -1050,7 +1050,7 @@ LayoutDLine(textPtr, indexPtr)
 			     * check is redundant:
 			     */
 			    if (tagPtr->priority != info.elidePriority) {
-				panic("Bad tag priority being toggled off");
+				Tcl_Panic("Bad tag priority being toggled off");
 			    }
 			    
 			    /* 
@@ -1335,7 +1335,7 @@ LayoutDLine(textPtr, indexPtr)
 	chunkPtr = NULL;
     }
     if (noCharsYet) {
-	panic("LayoutDLine couldn't place any characters on a line");
+	Tcl_Panic("LayoutDLine couldn't place any characters on a line");
     }
     wholeLine = (segPtr == NULL);
 
@@ -1831,7 +1831,7 @@ UpdateDisplayInfo(textPtr)
 		if (spaceLeft > 0 ||
 			dInfoPtr->newTopPixelOffset >= dInfoPtr->dLinePtr->height) {
 		    /* Bad situation */
-		    panic("Pixel height problem while laying out text widget");
+		    Tcl_Panic("Pixel height problem while laying out text widget");
 		}
 	    }
 	}
@@ -1847,7 +1847,7 @@ UpdateDisplayInfo(textPtr)
 	for (dlPtr = dInfoPtr->dLinePtr; dlPtr != NULL;
 		dlPtr = dlPtr->nextPtr) {
 	    if (y > dInfoPtr->maxY) {
-		panic("Added too many new lines in UpdateDisplayInfo");
+		Tcl_Panic("Added too many new lines in UpdateDisplayInfo");
 	    }
 	    dlPtr->y = y;
 	    y += dlPtr->height; 
@@ -3307,7 +3307,7 @@ TkTextUpdateOneLine(textPtr, linePtr, pixelHeight, indexPtr)
 	char buffer[TCL_INTEGER_SPACE + 1];
 
 	if (TkBTreeNextLine(linePtr) == NULL) {
-	    panic("Mustn't ever update line height of last artificial line");
+	    Tcl_Panic("Mustn't ever update line height of last artificial line");
 	}
 
 	sprintf(buffer, "%d", pixelHeight);
@@ -5682,7 +5682,9 @@ GetYView(interp, textPtr, report)
 	     * pixelHeight is for a logical line.
 	     */
     #if 0
-	    panic("Counted more pixels (%d) than expected (%d) total pixels in text widget scroll bar calculation.", count, totalPixels);
+	    Tcl_Panic("Counted more pixels (%d) than expected (%d) total "
+		    "pixels in text widget scroll bar calculation.", count,
+		    totalPixels);
     #endif
 	    count = totalPixels;
 	}
@@ -5808,7 +5810,7 @@ FindDLine(dlPtr, indexPtr)
 	}
 	linePtr = TkBTreeNextLine(linePtr);
 	if (linePtr == NULL) {
-	    panic("FindDLine reached end of text");
+	    Tcl_Panic("FindDLine reached end of text");
 	}
     }
     if (indexPtr->linePtr != dlPtr->index.linePtr) {
diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 4f6535f..50e86be 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.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: tkTextImage.c,v 1.11 2003/12/04 12:28:37 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextImage.c,v 1.12 2004/01/13 02:06:00 davygrvy Exp $
  */
 
 #include "tk.h"
@@ -289,7 +289,7 @@ TkTextImageCmd(textPtr, interp, objc, objv)
 	return TCL_OK;
     }
     default:
-	panic("unexpected switch fallthrough");
+	Tcl_Panic("unexpected switch fallthrough");
     }
     return TCL_ERROR;
 }
@@ -535,7 +535,7 @@ EmbImageLayoutProc(textPtr, indexPtr, eiPtr, offset, maxX, maxChars,
     int width, height;
 
     if (offset != 0) {
-	panic("Non-zero offset in EmbImageLayoutProc");
+	Tcl_Panic("Non-zero offset in EmbImageLayoutProc");
     }
 
     /*
@@ -605,10 +605,10 @@ EmbImageCheckProc(eiPtr, linePtr)
     TkTextLine *linePtr;		/* Line containing segment. */
 {
     if (eiPtr->nextPtr == NULL) {
-	panic("EmbImageCheckProc: embedded image is last segment in line");
+	Tcl_Panic("EmbImageCheckProc: embedded image is last segment in line");
     }
     if (eiPtr->size != 1) {
-	panic("EmbImageCheckProc: embedded image has size %d", eiPtr->size);
+	Tcl_Panic("EmbImageCheckProc: embedded image has size %d", eiPtr->size);
     }
 }
 
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 60138eb..85349c2 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.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: tkTextIndex.c,v 1.14 2004/01/07 15:21:02 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextIndex.c,v 1.15 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "default.h"
@@ -1405,7 +1405,7 @@ TkTextIndexForwChars(textPtr, srcPtr, charCount, dstPtr, type)
 				 * check is redundant:
 				 */
 				if (tagPtr->priority != infoPtr->elidePriority) {
-				    panic("Bad tag priority being toggled off");
+				    Tcl_Panic("Bad tag priority being toggled off");
 				}
 			    
 				/* 
@@ -1573,7 +1573,7 @@ TkTextIndexCount(textPtr, indexPtr1, indexPtr2, type)
 				 * check is redundant:
 				 */
 				if (tagPtr->priority != infoPtr->elidePriority) {
-				    panic("Bad tag priority being toggled off");
+				    Tcl_Panic("Bad tag priority being toggled off");
 				}
 				
 				/* 
@@ -1657,7 +1657,7 @@ TkTextIndexCount(textPtr, indexPtr1, indexPtr2, type)
 	 
 	linePtr1 = TkBTreeNextLine(linePtr1);
 	if (linePtr1 == NULL) {
-	    panic("Reached end of text widget when counting characters");
+	    Tcl_Panic("Reached end of text widget when counting characters");
 	}
 	segPtr = linePtr1->segPtr;
     }
@@ -1830,7 +1830,7 @@ TkTextIndexBackChars(textPtr, srcPtr, charCount, dstPtr, type)
 			     * check is redundant:
 			     */
 			    if (tagPtr->priority != infoPtr->elidePriority) {
-				panic("Bad tag priority being toggled on");
+				Tcl_Panic("Bad tag priority being toggled on");
 			    }
 						    
 			    /* 
diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c
index 3ee1738..5933af6 100644
--- a/generic/tkTextMark.c
+++ b/generic/tkTextMark.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: tkTextMark.c,v 1.10 2003/11/07 15:36:26 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextMark.c,v 1.11 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -647,7 +647,7 @@ MarkCheckProc(markPtr, linePtr)
     Tcl_HashEntry *hPtr;
 
     if (markPtr->body.mark.linePtr != linePtr) {
-	panic("MarkCheckProc: markPtr->body.mark.linePtr bogus");
+	Tcl_Panic("MarkCheckProc: markPtr->body.mark.linePtr bogus");
     }
 
     /*
@@ -659,7 +659,7 @@ MarkCheckProc(markPtr, linePtr)
 	    &search); hPtr != markPtr->body.mark.hPtr;
 	    hPtr = Tcl_NextHashEntry(&search)) {
 	if (hPtr == NULL) {
-	    panic("MarkCheckProc couldn't find hash table entry for mark");
+	    Tcl_Panic("MarkCheckProc couldn't find hash table entry for mark");
 	}
     }
 }
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index b5da014..5c59603 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.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: tkTextWind.c,v 1.11 2003/12/04 12:28:37 vincentdarley Exp $
+ * RCS: @(#) $Id: tkTextWind.c,v 1.12 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tk.h"
@@ -685,7 +685,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
     int width, height;
 
     if (offset != 0) {
-	panic("Non-zero offset in EmbWinLayoutProc");
+	Tcl_Panic("Non-zero offset in EmbWinLayoutProc");
     }
 
     if ((ewPtr->body.ew.tkwin == NULL) && (ewPtr->body.ew.create != NULL)) {
@@ -820,10 +820,10 @@ EmbWinCheckProc(ewPtr, linePtr)
     TkTextLine *linePtr;		/* Line containing segment. */
 {
     if (ewPtr->nextPtr == NULL) {
-	panic("EmbWinCheckProc: embedded window is last segment in line");
+	Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");
     }
     if (ewPtr->size != 1) {
-	panic("EmbWinCheckProc: embedded window has size %d", ewPtr->size);
+	Tcl_Panic("EmbWinCheckProc: embedded window has size %d", ewPtr->size);
     }
 }
 
diff --git a/generic/tkVisual.c b/generic/tkVisual.c
index 766862e..d7e85b4 100644
--- a/generic/tkVisual.c
+++ b/generic/tkVisual.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: tkVisual.c,v 1.4 2002/08/05 04:30:40 dgp Exp $
+ * RCS: @(#) $Id: tkVisual.c,v 1.5 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -470,7 +470,7 @@ Tk_FreeColormap(display, colormap)
 
     dispPtr = TkGetDisplay(display);
     if (dispPtr == NULL) {
-	panic("unknown display passed to Tk_FreeColormap");
+	Tcl_Panic("unknown display passed to Tk_FreeColormap");
     }
     for (prevPtr = NULL, cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 	    prevPtr = cmapPtr, cmapPtr = cmapPtr->nextPtr) {
@@ -529,7 +529,7 @@ Tk_PreserveColormap(display, colormap)
 
     dispPtr = TkGetDisplay(display);
     if (dispPtr == NULL) {
-	panic("unknown display passed to Tk_PreserveColormap");
+	Tcl_Panic("unknown display passed to Tk_PreserveColormap");
     }
     for (cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 	    cmapPtr = cmapPtr->nextPtr) {
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index d14f125..05b591d 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWindow.c,v 1.61 2003/12/21 23:50:13 davygrvy Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.62 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -864,7 +864,7 @@ TkCreateMainWindow(interp, screenName, baseName)
      */
 
     if (sizeof(TkWindow) != sizeof(Tk_FakeWin)) {
-	panic("TkWindow and Tk_FakeWin are not the same size");
+	Tcl_Panic("TkWindow and Tk_FakeWin are not the same size");
     }
 
     /*
@@ -929,7 +929,7 @@ TkCreateMainWindow(interp, screenName, baseName)
     isSafe = Tcl_IsSafe(interp);
     for (cmdPtr = commands; cmdPtr->name != NULL; cmdPtr++) {
 	if ((cmdPtr->cmdProc == NULL) && (cmdPtr->objProc == NULL)) {
-	    panic("TkCreateMainWindow: builtin command with NULL string and object procs");
+	    Tcl_Panic("TkCreateMainWindow: builtin command with NULL string and object procs");
 	}
 	if (cmdPtr->passMainWindow) {
 	    clientData = (ClientData) tkwin;
@@ -1430,7 +1430,7 @@ Tk_DestroyWindow(tkwin)
 	halfdeadPtr = halfdeadPtr->nextPtr;
     }
     if (halfdeadPtr == NULL)
-        panic("window not found on half dead list");
+        Tcl_Panic("window not found on half dead list");
 
     /*
      * Cleanup the data structures associated with this window.
@@ -1580,7 +1580,7 @@ Tk_DestroyWindow(tkwin)
                     backDispPtr = theDispPtr;
                 }
                 if (theDispPtr == NULL) {
-                    panic("could not find display to close!");
+                    Tcl_Panic("could not find display to close!");
                 }
                 if (backDispPtr == NULL) {
                     tsdPtr->displayList = theDispPtr->nextPtr;
@@ -1847,7 +1847,7 @@ Tk_ConfigureWindow(tkwin, valueMask, valuePtr)
 	winPtr->changes.border_width = valuePtr->border_width;
     }
     if (valueMask & (CWSibling|CWStackMode)) {
-	panic("Can't set sibling or stack mode from Tk_ConfigureWindow.");
+	Tcl_Panic("Can't set sibling or stack mode from Tk_ConfigureWindow.");
     }
 
     if (winPtr->window != None) {
@@ -2434,7 +2434,7 @@ UnlinkWindow(winPtr)
 	while (prevPtr->nextPtr != winPtr) {
 	    prevPtr = prevPtr->nextPtr;
 	    if (prevPtr == NULL) {
-		panic("UnlinkWindow couldn't find child in parent");
+		Tcl_Panic("UnlinkWindow couldn't find child in parent");
 	    }
 	}
 	prevPtr->nextPtr = winPtr->nextPtr;