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

8 files changed, 50 insertions, 53 deletions

diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 3405014..15be5b4 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.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: tkMacOSXEmbed.c,v 1.2 2002/08/31 06:12:29 das Exp $
+ *  RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.3 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -242,7 +242,7 @@ TkpUseWindow(
     int result;
 
     if (winPtr->window != None) {
-        panic("TkpUseWindow: X window already assigned");
+        Tcl_Panic("TkpUseWindow: X window already assigned");
     }
     
     /*
@@ -502,7 +502,7 @@ TkMacOSXContainerId(winPtr)
             return (MacDrawable *) containerPtr->parent;
         }
     }
-    panic("TkMacOSXContainerId couldn't find window");
+    Tcl_Panic("TkMacOSXContainerId couldn't find window");
     return None;
 }
 
@@ -831,7 +831,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/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 1a6556c..082e7b2 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.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: tkMacOSXFont.c,v 1.3 2002/10/16 19:44:05 das Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -294,7 +294,7 @@ TkpFontPkgInit(mainPtr)
          * Used for saving and restoring state while drawing and measuring.
          */
         if (NewGWorld(&gWorld, 0, &rect, NULL, NULL, 0) != noErr) {
-            panic("TkpFontPkgInit: NewGWorld failed");
+            Tcl_Panic("TkpFontPkgInit: NewGWorld failed");
         }
         /*
          * The name of each font is stored in the encoding of that font.
@@ -361,7 +361,7 @@ TkpFontPkgInit(mainPtr)
             }
         }
         if (fontMapOffset != numFonts) {
-            panic("TkpFontPkgInit: unexpected number of fonts");
+            Tcl_Panic("TkpFontPkgInit: unexpected number of fonts");
         }
 
         mapPtr = &newFontNameMap[numFonts];
@@ -2086,7 +2086,7 @@ GetUtfFaceName(
             return mapPtr->utfName;
         }
     }
-    panic("GetUtfFaceName: unexpected nativeName");
+    Tcl_Panic("GetUtfFaceName: unexpected nativeName");
     return NULL;
 }
 
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 805467d..cf28026 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.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: tkMacOSXMenus.c,v 1.3 2003/03/08 02:15:46 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tk.h"
@@ -166,11 +166,11 @@ TkMacOSXInitMenus(
      */
 
     if (TkMacOSXUseMenuID(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É");
@@ -180,11 +180,11 @@ TkMacOSXInitMenus(
     */
 
     if (TkMacOSXUseMenuID(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É");
@@ -193,11 +193,11 @@ TkMacOSXInitMenus(
     AppendMenu(tkFileMenu, "\pQuit/Q");
 
     if (TkMacOSXUseMenuID(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");
@@ -205,7 +205,7 @@ TkMacOSXInitMenus(
     AppendMenu(tkEditMenu, "\pPaste/V");
     AppendMenu(tkEditMenu, "\pClear");
     if (TkMacOSXUseMenuID(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/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 0d0764f..4768c94 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.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: tkMacOSXNotify.c,v 1.5 2002/09/26 17:07:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXNotify.c,v 1.6 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tclInt.h"
@@ -288,7 +288,7 @@ TkMacOSXInitNotifier()
     if (notifierCount == 0) {
 	if (Tcl_CreateThread(&notifierThread, NotifierThreadProc, NULL,
 		     TCL_THREAD_STACK_DEFAULT, TCL_THREAD_NOFLAGS) != TCL_OK) {
-	    panic("Tcl_InitNotifier: unable to start notifier thread");
+	    Tcl_Panic("Tcl_InitNotifier: unable to start notifier thread");
 	}
     }
     notifierCount++;
@@ -347,7 +347,7 @@ TkMacOSXFinalizeNotifier(clientData)
 
     if (notifierCount == 0) {
 	if (triggerPipe < 0) {
-	    panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
+	    Tcl_Panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
 	}
 
         /*
@@ -971,7 +971,7 @@ NotifierThreadProc(clientData)
     char buf[2];
 
     if (pipe(fds) != 0) {
-	panic("NotifierThreadProc: could not create trigger pipe.");
+	Tcl_Panic("NotifierThreadProc: could not create trigger pipe.");
     }
 
     receivePipe = fds[0];
@@ -980,19 +980,19 @@ NotifierThreadProc(clientData)
     status = fcntl(receivePipe, F_GETFL);
     status |= O_NONBLOCK;
     if (fcntl(receivePipe, F_SETFL, status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking.");
     }
     status = fcntl(fds[1], F_GETFL);
     status |= O_NONBLOCK;
     if (fcntl(fds[1], F_SETFL, status) < 0) {
-	panic("NotifierThreadProc: could not make trigger pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking.");
     }
 #else
     if (ioctl(receivePipe, (int) FIONBIO, &status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make receive pipe non blocking.");
     }
     if (ioctl(fds[1], (int) FIONBIO, &status) < 0) {
-	panic("NotifierThreadProc: could not make trigger pipe non blocking.");
+	Tcl_Panic("NotifierThreadProc: could not make trigger pipe non blocking.");
     }
 #endif
 
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index def575d..1f8dbc1 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -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: tkMacOSXPort.h,v 1.4 2003/09/30 23:26:09 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.5 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #ifndef _TKMACPORT
@@ -137,9 +137,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/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 380725f..064d470 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.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: tkMacOSXSubwindows.c,v 1.2 2002/08/31 06:12:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.3 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;
 	    
@@ -527,7 +527,7 @@ XMoveWindow(
 	    
 	    contWinPtr = TkpGetOtherWindow(macWin->winPtr);
 	    if (contWinPtr == NULL) {
-	            panic("XMoveWindow could not find container");
+		Tcl_Panic("XMoveWindow could not find container");
 	    }
 	    macParent = contWinPtr->privatePtr;
 	    
@@ -1259,7 +1259,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/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index cb3f39c..ff4b41e 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.8 2003/09/26 16:04:20 cc_benny Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.9 2004/01/13 02:06:01 davygrvy Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -2251,7 +2251,7 @@ Tcl_Obj *CONST objv[];	/* Argument objects. */
     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);
@@ -2306,9 +2306,9 @@ Tcl_Obj *CONST objv[];	/* Argument objects. */
                     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);
         }
@@ -2820,7 +2820,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");
     }
 }
 
@@ -3737,7 +3737,7 @@ Tk_MoveToplevelWindow(
     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;
@@ -4555,7 +4555,7 @@ TkUnsupported1Cmd(
 		    Tcl_SetResult(interp, "floatSideZoomProc", TCL_STATIC);
 		    break;
 		default:
-		   panic("invalid style");
+		   Tcl_Panic("invalid style");
 	    }
 	    if (appearanceSpec) {
 	        Tcl_Obj *attributeList, *newResult = NULL;
@@ -4586,7 +4586,7 @@ TkUnsupported1Cmd(
                         newResult = Tcl_NewStringObj("toolbar", -1);
                         break;
                     default:
-                        panic("invalid class");
+                        Tcl_Panic("invalid class");
                 }
 
  	        attributeList = Tcl_NewListObj(0, NULL);
@@ -4888,13 +4888,13 @@ TkMacOSXMakeRealWindowExist(
 	    return;
 	} else if (gMacEmbedHandler != NULL) {
 	    if (gMacEmbedHandler->containerExistProc != NULL) {
-	        if (gMacEmbedHandler->containerExistProc((Tk_Window) winPtr) != TCL_OK) {
-	           panic("ContainerExistProc could not make container");
-	       }
+		if (gMacEmbedHandler->containerExistProc((Tk_Window) winPtr) != TCL_OK) {
+		    Tcl_Panic("ContainerExistProc could not make container");
+		}
 	    }
 	    return;
 	} else {
-	    panic("TkMacOSXMakeRealWindowExist could not find container");
+	    Tcl_Panic("TkMacOSXMakeRealWindowExist could not find container");
 	}
 
 	/*
@@ -4929,10 +4929,10 @@ TkMacOSXMakeRealWindowExist(
     }
     
     if (newWindow == NULL) {
-	panic("couldn't allocate new Mac window");
+	Tcl_Panic("couldn't allocate new Mac window");
     }
     if (CreateRootControl(newWindow,&rootControl) != noErr ) {
-        panic("couldn't create root control for new Mac window");
+        Tcl_Panic("couldn't create root control for new Mac window");
     }
     
     /*
@@ -4956,7 +4956,7 @@ TkMacOSXMakeRealWindowExist(
     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);
     
@@ -5000,7 +5000,7 @@ TkMacOSXRegisterOffScreenWindow(
     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);
 }
@@ -5029,7 +5029,7 @@ TkMacOSXUnregisterMacWindow(
 {
  Tcl_HashEntry *entryPtr;
     if (!windowHashInit) {
-	panic("TkMacOSXUnregisterMacWindow: unmapping before inited");
+	Tcl_Panic("TkMacOSXUnregisterMacWindow: unmapping before inited");
     }
     entryPtr=Tcl_FindHashEntry(&windowTable,(char *) macWinPtr);
     if (!entryPtr) {
@@ -5504,7 +5504,7 @@ TkWmStackorderToplevel(parentPtr)
             frontWindow = GetNextWindow(frontWindow);
 	    }
         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:
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index baadba5..8d9aee7 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.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: tkMacOSXXStubs.c,v 1.3 2003/03/18 13:47:52 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $
  */
 
 #include "tkInt.h"
@@ -178,7 +178,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");
     }
 
     /*
@@ -283,7 +283,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;
 }