* 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:

9 files changed, 34 insertions, 34 deletions

diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index 5349a3f..9d7bab5 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.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: tkUnix3d.c,v 1.7 2002/08/31 06:12:31 das Exp $
+ * RCS: @(#) $Id: tkUnix3d.c,v 1.8 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include <tk3d.h>
@@ -455,7 +455,7 @@ TkpGetShadows(borderPtr, tkwin)
 	borderPtr->shadow = Tk_GetBitmap((Tcl_Interp *) NULL, tkwin,
 		Tk_GetUid("gray50"));
 	if (borderPtr->shadow == None) {
-	    panic("TkpGetShadows couldn't allocate bitmap for border");
+	    Tcl_Panic("TkpGetShadows couldn't allocate bitmap for border");
 	}
     }
     if (borderPtr->visual->map_entries > 2) {
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index e2def60..0337ee6 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.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: tkUnixColor.c,v 1.2 1998/09/14 18:23:55 stanton Exp $
+ * RCS: @(#) $Id: tkUnixColor.c,v 1.3 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include <tkColor.h>
@@ -269,7 +269,7 @@ FindClosestColor(tkwin, desiredColorPtr, actualColorPtr)
 	    visInfoPtr = XGetVisualInfo(Tk_Display(tkwin),
 		    VisualIDMask, &template, &numFound);
 	    if (numFound < 1) {
-		panic("FindClosestColor couldn't lookup visual");
+		Tcl_Panic("FindClosestColor couldn't lookup visual");
 	    }
 	    stressPtr->numColors = visInfoPtr->colormap_size;
 	    XFree((char *) visInfoPtr);
@@ -299,7 +299,7 @@ FindClosestColor(tkwin, desiredColorPtr, actualColorPtr)
 
     while (1)  {
 	if (stressPtr->numColors == 0) {
-	    panic("FindClosestColor ran out of colors");
+	    Tcl_Panic("FindClosestColor ran out of colors");
 	}
 	closestDistance = 1e30;
 	closest = 0;
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 6cf9159..5d46e84 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.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: tkUnixEmbed.c,v 1.6 2002/08/05 04:30:41 dgp Exp $
+ * RCS: @(#) $Id: tkUnixEmbed.c,v 1.7 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -115,7 +115,7 @@ TkpUseWindow(interp, tkwin, string)
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (winPtr->window != None) {
-	panic("TkUseWindow: X window already assigned");
+	Tcl_Panic("TkUseWindow: X window already assigned");
     }
     if (Tcl_GetInt(interp, string, &id) != TCL_OK) {
 	return TCL_ERROR;
@@ -232,7 +232,7 @@ TkpMakeWindow(winPtr, parent)
 	for (containerPtr = tsdPtr->firstContainerPtr; ;
 		containerPtr = containerPtr->nextPtr) {
 	    if (containerPtr == NULL) {
-		panic("TkMakeWindow couldn't find container for window");
+		Tcl_Panic("TkMakeWindow couldn't find container for window");
 	    }
 	    if (containerPtr->embeddedPtr == winPtr) {
 		break;
@@ -421,7 +421,7 @@ ContainerEventProc(clientData, eventPtr)
 	    containerPtr->parent != eventPtr->xmaprequest.parent;
 	    containerPtr = containerPtr->nextPtr) {
 	if (containerPtr == NULL) {
-	    panic("ContainerEventProc couldn't find Container record");
+	    Tcl_Panic("ContainerEventProc couldn't find Container record");
 	}
     }
 
@@ -729,7 +729,7 @@ TkpGetOtherWindow(winPtr)
 	    return containerPtr->embeddedPtr;
 	}
     }
-    panic("TkpGetOtherWindow couldn't find window");
+    Tcl_Panic("TkpGetOtherWindow couldn't find window");
     return NULL;
 }
 
@@ -1029,6 +1029,6 @@ TkUnixContainerId(winPtr)
 	    return containerPtr->parent;
 	}
     }
-    panic("TkUnixContainerId couldn't find window");
+    Tcl_Panic("TkUnixContainerId couldn't find window");
     return None;
 }
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index b4c1654..b76130e 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.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: tkUnixEvent.c,v 1.13 2003/12/21 23:50:13 davygrvy Exp $
+ * RCS: @(#) $Id: tkUnixEvent.c,v 1.14 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -224,7 +224,7 @@ TkpCloseDisplay(dispPtr)
 	if (do_peek) {
 	    peek = (struct XIMPeek *) dispPtr->inputMethod;
 	    if (peek->ic_chain != NULL)
-	        panic("input contexts not freed before XCloseIM");
+	        Tcl_Panic("input contexts not freed before XCloseIM");
 	}
 #endif
 	XCloseIM(dispPtr->inputMethod);
diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c
index 17dbb04..7093544 100644
--- a/unix/tkUnixFocus.c
+++ b/unix/tkUnixFocus.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: tkUnixFocus.c,v 1.3 1999/04/16 01:51:46 stanton Exp $
+ * RCS: @(#) $Id: tkUnixFocus.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -115,7 +115,7 @@ TkpChangeFocus(winPtr, force)
     errHandler = Tk_CreateErrorHandler(dispPtr->display, -1, -1, -1,
 	    (Tk_ErrorProc *) NULL, (ClientData) NULL);
     if (winPtr->window == None) {
-	panic("ChangeXFocus got null X window");
+	Tcl_Panic("ChangeXFocus got null X window");
     }
     XSetInputFocus(dispPtr->display, winPtr->window, RevertToParent,
 	    CurrentTime);
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index bf1c8b0..e004acb 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.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: tkUnixFont.c,v 1.21 2003/10/28 22:51:41 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixFont.c,v 1.22 2004/01/13 02:06:01 davygrvy Exp $
  */
  
 #include "tkUnixInt.h"
@@ -2672,7 +2672,7 @@ GetSystemFont(display)
     if (fontStructPtr == NULL) {
 	fontStructPtr = XLoadQueryFont(display, "*");
 	if (fontStructPtr == NULL) {
-	    panic("TkpGetFontFromAttributes: cannot get any font");
+	    Tcl_Panic("TkpGetFontFromAttributes: cannot get any font");
 	}
     }
     return fontStructPtr;
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index 92add7f..3920dcb 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.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: tkUnixSelect.c,v 1.11 2002/10/01 08:48:08 dkf Exp $
+ * RCS: @(#) $Id: tkUnixSelect.c,v 1.12 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -351,7 +351,7 @@ TkSelPropProc(eventPtr)
 		}
 		numItems += length;
 		if (numItems > TK_SEL_BYTES_AT_ONCE) {
-		    panic("selection handler returned too many bytes");
+		    Tcl_Panic("selection handler returned too many bytes");
 		}
 	    }
 	    ((char *) buffer)[numItems] = 0;
@@ -448,7 +448,7 @@ TkSelPropProc(eventPtr)
 		 */
 
 		if (srcLen > TCL_UTF_MAX) {
-		    panic("selection conversion left too many bytes unconverted");
+		    Tcl_Panic("selection conversion left too many bytes unconverted");
 		}
 		memcpy(incrPtr->converts[i].buffer, src, (size_t) srcLen+1);
 		Tcl_DStringFree(&ds);
@@ -934,7 +934,7 @@ ConvertSelection(winPtr, eventPtr)
 		continue;
 	    }
 	    if (numItems > TK_SEL_BYTES_AT_ONCE) {
-		panic("selection handler returned too many bytes");
+		Tcl_Panic("selection handler returned too many bytes");
 	    }
 	    ((char *) buffer)[numItems] = '\0';
 	}
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 4e115c8..024005c 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.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: tkUnixSend.c,v 1.11 2002/08/13 16:20:49 rmax Exp $
+ * RCS: @(#) $Id: tkUnixSend.c,v 1.12 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -534,7 +534,7 @@ RegClose(regPtr)
 {
     if (regPtr->modified) {
 	if (!regPtr->locked && !sendDebug) {
-	    panic("The name registry was modified without being locked!");
+	    Tcl_Panic("The name registry was modified without being locked!");
 	}
 	XChangeProperty(regPtr->dispPtr->display,
 		RootWindow(regPtr->dispPtr->display, 0),
@@ -1141,7 +1141,7 @@ Tk_SendCmd(clientData, interp, argc, argv)
      */
 
     if (tsdPtr->pendingCommands != &pending) {
-	panic("Tk_SendCmd: corrupted send stack");
+	Tcl_Panic("Tk_SendCmd: corrupted send stack");
     }
     tsdPtr->pendingCommands = pending.nextPtr;
     if (pending.errorInfo != NULL) {
@@ -1319,7 +1319,7 @@ SendInit(interp, dispPtr)
     dispPtr->commTkwin = Tk_CreateWindow(interp, (Tk_Window) NULL,
 	    "_comm", DisplayString(dispPtr->display));
     if (dispPtr->commTkwin == NULL) {
-	panic("Tk_CreateWindow failed in SendInit!");
+	Tcl_Panic("Tk_CreateWindow failed in SendInit!");
     }
     Tcl_Preserve((ClientData) dispPtr->commTkwin);
     atts.override_redirect = True;
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 0d535ea..ea414c6 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.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: tkUnixWm.c,v 1.38 2003/10/15 20:04:03 jenglish Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.39 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkPort.h"
@@ -787,7 +787,7 @@ TkWmDeadWindow(winPtr)
 	for (prevPtr = (WmInfo *) winPtr->dispPtr->firstWmPtr; ;
                 prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
-		panic("couldn't unlink window in TkWmDeadWindow");
+		Tcl_Panic("couldn't unlink window in TkWmDeadWindow");
 	    }
 	    if (prevPtr->nextPtr == wmPtr) {
 		prevPtr->nextPtr = wmPtr->nextPtr;
@@ -875,7 +875,7 @@ TkWmDeadWindow(winPtr)
 	}
     }
     if (wmPtr->numTransients != 0)
-        panic("numTransients should be 0");
+        Tcl_Panic("numTransients should be 0");
 
     if (wmPtr->masterPtr != NULL) {
 	wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
@@ -2716,7 +2716,7 @@ WmStackorderCmd(tkwin, winPtr, interp, objc, objv)
     if (objc == 3) {
 	windows = TkWmStackorderToplevel(winPtr);
 	if (windows == NULL) {
-	    panic("TkWmStackorderToplevel failed");
+	    Tcl_Panic("TkWmStackorderToplevel failed");
 	} else {
 	    for (window_ptr = windows; *window_ptr ; window_ptr++) {
 		Tcl_AppendElement(interp, (*window_ptr)->pathName);
@@ -2771,9 +2771,9 @@ WmStackorderCmd(tkwin, winPtr, interp, objc, objv)
 		    index2 = (window_ptr - windows);
 	    }
 	    if (index1 == -1)
-		panic("winPtr window not found");
+		Tcl_Panic("winPtr window not found");
 	    if (index2 == -1)
-		panic("winPtr2 window not found");
+		Tcl_Panic("winPtr2 window not found");
 
 	    ckfree((char *) windows);
 	}
@@ -5189,7 +5189,7 @@ Tk_MoveToplevelWindow(tkwin, x, y)
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!(winPtr->flags & TK_TOP_LEVEL)) {
-	panic("Tk_MoveToplevelWindow called with non-toplevel window");
+	Tcl_Panic("Tk_MoveToplevelWindow called with non-toplevel window");
     }
     wmPtr->x = x;
     wmPtr->y = y;
@@ -5469,7 +5469,7 @@ TkWmStackorderToplevel(parentPtr)
             }
         }
         if ((window_ptr - windows) != table.numEntries)
-            panic("num matched toplevel windows does not equal num children");
+            Tcl_Panic("num matched toplevel windows does not equal num children");
         *window_ptr = NULL;
 	if (numChildren) {
 	    XFree((char *) children);
@@ -6114,7 +6114,7 @@ TkUnixSetMenubar(tkwin, menubar)
     } else {
 	if ((menubarPtr->flags & TK_TOP_LEVEL)
 	     || (Tk_Screen(menubar) != Tk_Screen(tkwin))) {
-	    panic("TkUnixSetMenubar got bad menubar");
+	    Tcl_Panic("TkUnixSetMenubar got bad menubar");
 	}
 	wmPtr->menuHeight = Tk_ReqHeight(menubar);
 	if (wmPtr->menuHeight == 0) {