diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-19 14:30:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-02-19 14:30:53 (GMT) |
| commit | 01b3cae548441e7981c53663d22a205321d08d28 (patch) | |
| tree | c5230825b5ad183c10ab111ff6fda7a059e2469f /generic | |
| parent | ae62cfef8e3727274cf0c7bde552b0e06ec2f2db (diff) | |
| parent | 0262ac12623d18f863fce92e6894c97021dbc331 (diff) | |
| download | tk-01b3cae548441e7981c53663d22a205321d08d28.zip tk-01b3cae548441e7981c53663d22a205321d08d28.tar.gz tk-01b3cae548441e7981c53663d22a205321d08d28.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkTextBTree.c | 4 | ||||
| -rw-r--r-- | 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 6ca9db9..0c601ab 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 |