diff options
author | davygrvy <davygrvy> | 2004-01-13 02:05:59 (GMT) |
---|---|---|
committer | davygrvy <davygrvy> | 2004-01-13 02:05:59 (GMT) |
commit | 475a691cd4526144149fa20e18994e84959a7361 (patch) | |
tree | d3e42f48fb70b654f8a82545d3a63ea270c93825 /mac/tkMacSubwindows.c | |
parent | 176a8ad27faf6ea66dae60d38d4452762528499e (diff) | |
download | tk-475a691cd4526144149fa20e18994e84959a7361.zip tk-475a691cd4526144149fa20e18994e84959a7361.tar.gz tk-475a691cd4526144149fa20e18994e84959a7361.tar.bz2 |
* 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:
Diffstat (limited to 'mac/tkMacSubwindows.c')
-rw-r--r-- | mac/tkMacSubwindows.c | 36 |
1 files changed, 18 insertions, 18 deletions
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"); } /* |