diff options
Diffstat (limited to 'generic/tkCanvText.c')
| -rw-r--r-- | generic/tkCanvText.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 0945857..656c421 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -562,7 +562,7 @@ ConfigureText( static void DeleteText( - Tk_Canvas canvas, /* Info about overall canvas widget. */ + TCL_UNUSED(Tk_Canvas), /* Info about overall canvas widget. */ Tk_Item *itemPtr, /* Item that is being deleted. */ Display *display) /* Display containing window for canvas. */ { @@ -835,7 +835,7 @@ DisplayCanvText( } selFirstChar = -1; - selLastChar = 0; /* lint. */ + selLastChar = 0; Tk_CanvasDrawableCoords(canvas, textPtr->drawOrigin[0], textPtr->drawOrigin[1], &drawableX, &drawableY); @@ -1010,7 +1010,8 @@ TextInsert( Tcl_Obj *obj) /* New characters to be inserted. */ { TextItem *textPtr = (TextItem *) itemPtr; - int byteIndex, byteCount, charsAdded; + int byteIndex, charsAdded; + int byteCount; char *newStr, *text; const char *string; Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr; @@ -1606,9 +1607,7 @@ TextToPostscript( Tcl_GetString(Tcl_GetObjResult(interp))); } - x = 0; y = 0; justify = NULL; switch (textPtr->anchor) { - case TK_ANCHOR_NW: x = 0; y = 0; break; case TK_ANCHOR_N: x = 1; y = 0; break; case TK_ANCHOR_NE: x = 2; y = 0; break; case TK_ANCHOR_E: x = 2; y = 1; break; @@ -1617,11 +1616,12 @@ TextToPostscript( case TK_ANCHOR_SW: x = 0; y = 2; break; case TK_ANCHOR_W: x = 0; y = 1; break; case TK_ANCHOR_CENTER: x = 1; y = 1; break; + default: x = 0; y = 0; break; } switch (textPtr->justify) { - case TK_JUSTIFY_LEFT: justify = "0"; break; case TK_JUSTIFY_CENTER: justify = "0.5"; break; case TK_JUSTIFY_RIGHT: justify = "1"; break; + default: justify = "0"; break; } Tk_GetFontMetrics(textPtr->tkfont, &fm); |