summaryrefslogtreecommitdiffstats
path: root/generic/tkTextDisp.c
diff options
context:
space:
mode:
authordavygrvy <davygrvy>2004-01-13 02:05:59 (GMT)
committerdavygrvy <davygrvy>2004-01-13 02:05:59 (GMT)
commit0b57d545f35e883f425daf39630dffd611add1b2 (patch)
treed3e42f48fb70b654f8a82545d3a63ea270c93825 /generic/tkTextDisp.c
parentf59aebfdb48e5d3f9d4bc7f626c008e69c9a51ff (diff)
downloadtk-0b57d545f35e883f425daf39630dffd611add1b2.zip
tk-0b57d545f35e883f425daf39630dffd611add1b2.tar.gz
tk-0b57d545f35e883f425daf39630dffd611add1b2.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 'generic/tkTextDisp.c')
-rw-r--r--generic/tkTextDisp.c18
1 files changed, 10 insertions, 8 deletions
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) {