Skip to content

Commit

Permalink
Text tag priorities should be Tcl_Size (just as numTags)
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Feb 19, 2024
1 parent ad66bdc commit 0262ac1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions generic/tkTextBTree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
14 changes: 7 additions & 7 deletions generic/tkTextDisp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0262ac1

Please sign in to comment.