From 0262ac12623d18f863fce92e6894c97021dbc331 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 19 Feb 2024 14:28:59 +0000 Subject: Text tag priorities should be Tcl_Size (just as numTags) --- generic/tkTextBTree.c | 4 ++-- generic/tkTextDisp.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 0765ad0..4810b30 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -3520,10 +3520,10 @@ TkTextIsElided( TkTextLine *siblingLinePtr; TkTextSegment *segPtr; TkTextTag *tagPtr = NULL; - int i, index; + Tcl_Size i; TkTextElideInfo *infoPtr; TkTextLine *linePtr; - int elide; + int elide, index; if (elideInfo == NULL) { infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo)); diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index b7ab109..44fbbd5 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -784,13 +784,13 @@ GetStyle( * The variables below keep track of the highest-priority specification * that has occurred for each of the various fields of the StyleValues. */ - int borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio; - int fgPrio, fontPrio, fgStipplePrio; - int underlinePrio, elidePrio, justifyPrio, offsetPrio; - int lMargin1Prio, lMargin2Prio, rMarginPrio; - int lMarginColorPrio, rMarginColorPrio; - int spacing1Prio, spacing2Prio, spacing3Prio; - int overstrikePrio, tabPrio, tabStylePrio, wrapPrio; + Tcl_Size borderPrio, borderWidthPrio, reliefPrio, bgStipplePrio; + Tcl_Size fgPrio, fontPrio, fgStipplePrio; + Tcl_Size underlinePrio, elidePrio, justifyPrio, offsetPrio; + Tcl_Size lMargin1Prio, lMargin2Prio, rMarginPrio; + Tcl_Size lMarginColorPrio, rMarginColorPrio; + Tcl_Size spacing1Prio, spacing2Prio, spacing3Prio; + Tcl_Size overstrikePrio, tabPrio, tabStylePrio, wrapPrio; /* * Find out what tags are present for the character, then compute a -- cgit v0.12