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

12 files changed, 73 insertions, 76 deletions

diff --git a/mac/tkMacAppInit.c b/mac/tkMacAppInit.c
index abbe279..15dfd1a 100644
--- a/mac/tkMacAppInit.c
+++ b/mac/tkMacAppInit.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: tkMacAppInit.c,v 1.15 2002/10/18 03:01:33 das Exp $
+ * RCS: @(#) $Id: tkMacAppInit.c,v 1.16 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include <Gestalt.h>
@@ -246,7 +246,7 @@ MacintoshInit()
     	    NGetTrapAddress(_Unimplemented, ToolTrap))
     	    || (((Gestalt(gestaltSystemVersion, &result) != noErr)
 	    || (result < mask)))) {
-	panic("Tcl/Tk requires System 7 or higher.");
+	Tcl_Panic("Tcl/Tk requires System 7 or higher.");
     }
 
     /*
@@ -256,7 +256,7 @@ MacintoshInit()
      
     if (((Gestalt(gestaltQuickdrawVersion, &result) != noErr)
 	    || (result < gestalt32BitQD13))) {
-	panic("Tk requires Color QuickDraw.");
+	Tcl_Panic("Tk requires Color QuickDraw.");
     }
 
     
@@ -317,7 +317,7 @@ SetupMainInterp(
     return TCL_OK;
 
 error:
-    panic(Tcl_GetStringResult(interp));
+    Tcl_Panic(Tcl_GetStringResult(interp));
     return TCL_ERROR;
 }
 
diff --git a/mac/tkMacAppearanceStubs.c b/mac/tkMacAppearanceStubs.c
index 0fd0fee..898b21e 100755
--- a/mac/tkMacAppearanceStubs.c
+++ b/mac/tkMacAppearanceStubs.c
@@ -29,7 +29,7 @@ MoveWindowStructure(
     short hGlobal, 
     short vGlobal)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 
 }
@@ -41,7 +41,7 @@ CreateNewWindow(
     const Rect *bounds, 
     WindowPtr *outWindow)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 
 }
@@ -49,7 +49,7 @@ CreateNewWindow(
 pascal WindowPtr
 FrontNonFloatingWindow()
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return NULL;
 }
 
@@ -58,7 +58,7 @@ GetWindowClass(
     WindowPtr window,
     WindowClass *outClass)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 }
 
@@ -70,35 +70,35 @@ ApplyThemeBackground(
     SInt16 inDepth,
     Boolean inColorDev)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 }
 
 pascal OSStatus
 InitFloatingWindows(void)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 }
 
 pascal OSStatus
 ShowFloatingWindows(void)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 }
 
 pascal OSStatus
 HideFloatingWindows(void)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return noErr;
 }
 
 pascal Boolean
 IsValidWindowPtr(GrafPtr grafPort)
 {
-    panic("Error: Running stub for PPC-Only routine");
+    Tcl_Panic("Error: Running stub for PPC-Only routine");
     return true;
 }
 
diff --git a/mac/tkMacButton.c b/mac/tkMacButton.c
index a055609..ef2b9eb 100644
--- a/mac/tkMacButton.c
+++ b/mac/tkMacButton.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: tkMacButton.c,v 1.20 2003/12/21 23:50:13 davygrvy Exp $
+ * RCS: @(#) $Id: tkMacButton.c,v 1.21 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkButton.h"
@@ -1129,7 +1129,7 @@ InitSampleControls()
     windowRef = NewCWindow(NULL, &geometry, "\pempty", false, 
 	    zoomDocProc, (WindowRef) frontWin, true, 0);
     if (windowRef == NULL) {
-	panic("Can't allocate buffer window.");
+	Tcl_Panic("Can't allocate buffer window.");
     }
 	
     /*
@@ -1156,7 +1156,7 @@ InitSampleControls()
 	     
 	err = CreateRootControl(windowRef, &dontCare);
 	if (err != noErr) {
-	    panic("Can't create root control in DrawBufferedControl");
+	    Tcl_Panic("Can't create root control in DrawBufferedControl");
 	}
 	    
 	userPaneHandle = NewControl(windowRef, &geometry, "\p",
diff --git a/mac/tkMacDraw.c b/mac/tkMacDraw.c
index f3af2fc..5ef7937 100644
--- a/mac/tkMacDraw.c
+++ b/mac/tkMacDraw.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: tkMacDraw.c,v 1.9 2002/04/08 09:04:43 das Exp $
+ * RCS: @(#) $Id: tkMacDraw.c,v 1.10 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -371,7 +371,7 @@ TkPutImage(
 	pixmap.pmReserved = 0;
 	pixmap.baseAddr = image->data;
     if (image->bytes_per_line >= 0x4000) {
-    	panic("TkImage too wide!");
+    	Tcl_Panic("TkImage too wide!");
     }
 	pixmap.rowBytes = image->bytes_per_line | 0x8000;
 	
diff --git a/mac/tkMacEmbed.c b/mac/tkMacEmbed.c
index 06ceaa4..99595cf 100644
--- a/mac/tkMacEmbed.c
+++ b/mac/tkMacEmbed.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: tkMacEmbed.c,v 1.6 2002/10/09 11:56:39 das Exp $
+ *  RCS: @(#) $Id: tkMacEmbed.c,v 1.7 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -243,7 +243,7 @@ TkpUseWindow(
     int result;
 
     if (winPtr->window != None) {
-	panic("TkpUseWindow: X window already assigned");
+	Tcl_Panic("TkpUseWindow: X window already assigned");
     }
     
     /*
@@ -516,7 +516,7 @@ TkMacContainerId(winPtr)
 	    return (MacDrawable *) containerPtr->parent;
 	}
     }
-    panic("TkMacContainerId couldn't find window");
+    Tcl_Panic("TkMacContainerId couldn't find window");
     return None;
 }
 
@@ -845,7 +845,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");
 	}
     }
 
diff --git a/mac/tkMacFont.c b/mac/tkMacFont.c
index 61159a8..e72718a 100644
--- a/mac/tkMacFont.c
+++ b/mac/tkMacFont.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: tkMacFont.c,v 1.8 2002/10/09 11:56:43 das Exp $
+ * RCS: @(#) $Id: tkMacFont.c,v 1.9 2004/01/13 02:06:01 davygrvy Exp $
  */
  
 #include <Windows.h>
@@ -311,7 +311,7 @@ TkpFontPkgInit(mainPtr)
 	 */
 	 
 	if (NewGWorld(&gWorld, 0, &rect, NULL, NULL, 0) != noErr) {
-	    panic("TkpFontPkgInit: NewGWorld failed");
+	    Tcl_Panic("TkpFontPkgInit: NewGWorld failed");
 	}
 	
 	/*
@@ -379,7 +379,7 @@ TkpFontPkgInit(mainPtr)
        	    }
        	}
        	if (fontMapOffset != numFonts) {
-       	    panic("TkpFontPkgInit: unexpected number of fonts");
+       	    Tcl_Panic("TkpFontPkgInit: unexpected number of fonts");
        	}
 
        	mapPtr = &newFontNameMap[numFonts];
@@ -2078,7 +2078,7 @@ GetUtfFaceName(
             return mapPtr->utfName;
         }
     }
-    panic("GetUtfFaceName: unexpected nativeName");
+    Tcl_Panic("GetUtfFaceName: unexpected nativeName");
     return NULL;
 }
 
diff --git a/mac/tkMacInit.c b/mac/tkMacInit.c
index e40a55a..4aa684c 100644
--- a/mac/tkMacInit.c
+++ b/mac/tkMacInit.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: tkMacInit.c,v 1.10 2002/05/20 12:30:16 das Exp $
+ * RCS: @(#) $Id: tkMacInit.c,v 1.11 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include <Resources.h>
@@ -223,6 +223,6 @@ TkpDisplayWarning(
     Tcl_DStringAppend(&ds, title, -1);
     Tcl_DStringAppend(&ds, ": ", -1);
     Tcl_DStringAppend(&ds, msg, -1);
-    panic(Tcl_DStringValue(&ds));
+    Tcl_Panic(Tcl_DStringValue(&ds));
     Tcl_DStringFree(&ds);
 }
diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c
index 8114daf..69185fc 100644
--- a/mac/tkMacMenus.c
+++ b/mac/tkMacMenus.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: tkMacMenus.c,v 1.8 2002/01/27 11:11:02 das Exp $
+ * RCS: @(#) $Id: tkMacMenus.c,v 1.9 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tcl.h"
@@ -186,11 +186,11 @@ TkMacInitMenus(
      */
 
     if (TkMacUseMenuID(256) != TCL_OK) {
-    	panic("Menu ID 256 is already in use!");
+    	Tcl_Panic("Menu ID 256 is already in use!");
     }
     tkAppleMenu = NewMenu(256, "\p\024");
     if (tkAppleMenu == NULL) {
-	panic("memory - menus");
+	Tcl_Panic("memory - menus");
     }
     InsertMenu(tkAppleMenu, 0);
     AppendMenu(tkAppleMenu, "\pAbout Tcl & TkŠ");
@@ -198,11 +198,11 @@ TkMacInitMenus(
     AppendResMenu(tkAppleMenu, 'DRVR');
 
     if (TkMacUseMenuID(kFileMenu) != TCL_OK) {
-    	panic("Menu ID %d is already in use!", kFileMenu);
+    	Tcl_Panic("Menu ID %d is already in use!", kFileMenu);
     }
     tkFileMenu = NewMenu(kFileMenu, "\pFile");
     if (tkFileMenu == NULL) {
-	panic("memory - menus");
+	Tcl_Panic("memory - menus");
     }
     InsertMenu(tkFileMenu, 0);
     AppendMenu(tkFileMenu, "\pSourceŠ");
@@ -211,11 +211,11 @@ TkMacInitMenus(
     AppendMenu(tkFileMenu, "\pQuit/Q");
 
     if (TkMacUseMenuID(kEditMenu) != TCL_OK) {
-    	panic("Menu ID %d is already in use!", kEditMenu);
+    	Tcl_Panic("Menu ID %d is already in use!", kEditMenu);
     }
     tkEditMenu = NewMenu(kEditMenu, "\pEdit");
     if (tkEditMenu == NULL) {
-	panic("memory - menus");
+	Tcl_Panic("memory - menus");
     }
     InsertMenu(tkEditMenu, 0);
     AppendMenu(tkEditMenu, "\pCut/X");
@@ -223,7 +223,7 @@ TkMacInitMenus(
     AppendMenu(tkEditMenu, "\pPaste/V");
     AppendMenu(tkEditMenu, "\pClear");
     if (TkMacUseMenuID(kHMHelpMenuID) != TCL_OK) {
-    	panic("Help menu ID %s is already in use!", kHMHelpMenuID);
+    	Tcl_Panic("Help menu ID %s is already in use!", kHMHelpMenuID);
     }
     
     DrawMenuBar();
diff --git a/mac/tkMacPort.h b/mac/tkMacPort.h
index 91b1b35..c005fa8 100644
--- a/mac/tkMacPort.h
+++ b/mac/tkMacPort.h
@@ -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: tkMacPort.h,v 1.11 2001/11/23 02:06:14 das Exp $
+ * RCS: @(#) $Id: tkMacPort.h,v 1.12 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #ifndef _TKMACPORT
@@ -70,9 +70,6 @@ extern int errno;
  * in any other header file.
  */
 
-#ifndef panic	/* In a stubs-aware setting, this could confuse the #define */
-EXTERN void 		panic  _ANSI_ARGS_(TCL_VARARGS(char *, string));
-#endif
 #ifndef strcasecmp
 EXTERN int		strcasecmp _ANSI_ARGS_((CONST char *s1,
 			    CONST char *s2));
diff --git a/mac/tkMacSubwindows.c b/mac/tkMacSubwindows.c
index a60e901..ceea705 100644
--- a/mac/tkMacSubwindows.c
+++ b/mac/tkMacSubwindows.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: tkMacSubwindows.c,v 1.7 2002/06/14 22:25:12 jenglish Exp $
+ * RCS: @(#) $Id: tkMacSubwindows.c,v 1.8 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -425,7 +425,7 @@ XMoveResizeWindow(
 	    
 	    contWinPtr = TkpGetOtherWindow(macWin->winPtr);
 	    if (contWinPtr == NULL) {
-	            panic("XMoveResizeWindow could not find container");
+	            Tcl_Panic("XMoveResizeWindow could not find container");
 	    }
 	    macParent = contWinPtr->privatePtr;
 	    
@@ -516,29 +516,29 @@ XMoveWindow(
 	int deltaX, deltaY, parentBorderwidth;
 	Rect bounds;
 	MacDrawable *macParent;
-	
-        /*
-         * Find the Parent window -
-         * For an embedded window this will be its container.
-         */
-         
+
+	/*
+	 * Find the Parent window -
+	 * For an embedded window this will be its container.
+	 */
+
 	if (Tk_IsEmbedded(macWin->winPtr)) {
 	    TkWindow *contWinPtr;
-	    
+
 	    contWinPtr = TkpGetOtherWindow(macWin->winPtr);
 	    if (contWinPtr == NULL) {
-	            panic("XMoveWindow could not find container");
+		Tcl_Panic("XMoveWindow could not find container");
 	    }
 	    macParent = contWinPtr->privatePtr;
-	    
+
 	    /*
 	     * NOTE: Here we should handle out of process embedding.
 	     */
-		    
+
 	} else {
 	    macParent = macWin->winPtr->parentPtr->privatePtr;   
 	    if (macParent == NULL) {
-	        return; /* TODO: Probably should be a panic */
+		return; /* TODO: Probably should be a panic */
 	    }
 	}
 
@@ -547,12 +547,12 @@ XMoveWindow(
 
 	deltaX = - macWin->xOff;
 	deltaY = - macWin->yOff;
-	
-        /*
+
+	/*
 	 * If macWin->winPtr is an embedded window, don't offset by its
 	 *  parent's borderwidth...
 	 */
-	 
+
 	if (!Tk_IsEmbedded(macWin->winPtr)) {
 	    parentBorderwidth = macWin->winPtr->parentPtr->changes.border_width;
 	} else {
@@ -562,7 +562,7 @@ XMoveWindow(
 	    macWin->winPtr->changes.x;
 	deltaY += macParent->yOff + parentBorderwidth +
 	    macWin->winPtr->changes.y;
-		
+	
 	UpdateOffsets(macWin->winPtr, deltaX, deltaY);
 	TkMacWinBounds(macWin->winPtr, &bounds);
 	InvalRect(&bounds);
@@ -1212,7 +1212,7 @@ Tk_GetPixmap(
 	err = NewGWorld(&gWorld, depth, &bounds, NULL, NULL, useTempMem);
     }
     if (err != noErr) {
-        panic("Out of memory: NewGWorld failed in Tk_GetPixmap");
+        Tcl_Panic("Out of memory: NewGWorld failed in Tk_GetPixmap");
     }
 
     /*
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index d313633..0856b60 100644
--- a/mac/tkMacWm.c
+++ b/mac/tkMacWm.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: tkMacWm.c,v 1.24 2003/02/09 07:51:04 hobbs Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.25 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include <Gestalt.h>
@@ -2429,7 +2429,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);
@@ -2484,9 +2484,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);
 	}
@@ -3009,7 +3009,7 @@ TopLevelEventProc(
 	    printf("TopLevelEventProc: %s deleted\n", winPtr->pathName);
 	}
     } else if (eventPtr->type == ReparentNotify) {
-	panic("recieved unwanted reparent event");
+	Tcl_Panic("recieved unwanted reparent event");
     }
 }
 
@@ -3932,7 +3932,7 @@ Tk_MoveToplevelWindow(
     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;
@@ -4143,7 +4143,7 @@ TkWmStackorderToplevel(parentPtr)
 			frontWindow = frontWindow->nextWindow;
 	    }
         if (window_ptr != (windows-1))
-            panic("num matched toplevel windows does not equal num children");
+            Tcl_Panic("num matched toplevel windows does not equal num children");
     }
 
     done:
@@ -5094,7 +5094,7 @@ TkUnsupported1Cmd(
 		    Tcl_SetResult(interp, "floatSideZoomProc", TCL_STATIC);
 		    break;
 		default:
-		    panic("invalid style");
+		    Tcl_Panic("invalid style");
 	    }
 	    if (appearanceSpec) {
 	        Tcl_Obj *attributeList, *newResult;
@@ -5119,7 +5119,7 @@ TkUnsupported1Cmd(
 	                newResult = Tcl_NewStringObj("document", -1);
 	                break;
                     default:
-                        panic("invalid class");
+                        Tcl_Panic("invalid class");
                 }
 
  	        attributeList = Tcl_NewListObj(0, NULL);
@@ -5404,12 +5404,12 @@ TkMacMakeRealWindowExist(
 	} else if (gMacEmbedHandler != NULL) {
 	    if (gMacEmbedHandler->containerExistProc != NULL) {
 	        if (gMacEmbedHandler->containerExistProc((Tk_Window) winPtr) != TCL_OK) {
-	           panic("ContainerExistProc could not make container");
+	           Tcl_Panic("ContainerExistProc could not make container");
 	       }
 	    }
 	    return;
 	} else {
-	    panic("TkMacMakeRealWindowExist could not find container");
+	    Tcl_Panic("TkMacMakeRealWindowExist could not find container");
 	}
 
 	/*
@@ -5444,7 +5444,7 @@ TkMacMakeRealWindowExist(
     }
 
     if (newWindow == NULL) {
-	panic("couldn't allocate new Mac window");
+	Tcl_Panic("couldn't allocate new Mac window");
     }
 
     /*
@@ -5467,7 +5467,7 @@ TkMacMakeRealWindowExist(
     valueHashPtr = Tcl_CreateHashEntry(&windowTable,
 	    (char *) newWindow, &new);
     if (!new) {
-	panic("same macintosh window allocated twice!");
+	Tcl_Panic("same macintosh window allocated twice!");
     }
     Tcl_SetHashValue(valueHashPtr, macWin);
 
@@ -5509,7 +5509,7 @@ TkMacRegisterOffScreenWindow(
     valueHashPtr = Tcl_CreateHashEntry(&windowTable,
 	    (char *) portPtr, &new);
     if (!new) {
-	panic("same macintosh window allocated twice!");
+	Tcl_Panic("same macintosh window allocated twice!");
     }
     Tcl_SetHashValue(valueHashPtr, macWin);
 }
@@ -5537,7 +5537,7 @@ TkMacUnregisterMacWindow(
     GWorldPtr portPtr)	/* Pointer to a Mac GWorld. */
 {
     if (!windowHashInit) {
-	panic("TkMacUnregisterMacWindow: unmapping before inited");;
+	Tcl_Panic("TkMacUnregisterMacWindow: unmapping before inited");;
     }
     Tcl_DeleteHashEntry(Tcl_FindHashEntry(&windowTable,
 	(char *) portPtr));
diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c
index 2de6028..2671aca 100644
--- a/mac/tkMacXStubs.c
+++ b/mac/tkMacXStubs.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: tkMacXStubs.c,v 1.16 2002/10/09 11:57:05 das Exp $
+ * RCS: @(#) $Id: tkMacXStubs.c,v 1.17 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -166,7 +166,7 @@ TkpCloseDisplay(
 {
     Display *display = displayPtr->display;
     if (gMacDisplay != displayPtr) {
-        panic("TkpCloseDisplay: tried to call TkpCloseDisplay on bad display");
+        Tcl_Panic("TkpCloseDisplay: tried to call TkpCloseDisplay on bad display");
     }
 
     /*
@@ -271,7 +271,7 @@ DefaultErrorHandler(
      * This call should never be called.  Tk replaces
      * it with its own error handler.
      */
-    panic("Warning hit bogus error handler!");
+    Tcl_Panic("Warning hit bogus error handler!");
     return 0;
 }