Update to tk 8.5.19

This commit is contained in:
Zachary Ware
2017-11-24 17:53:51 -06:00
parent 27e7dfc7da
commit c67b328f06
325 changed files with 12511 additions and 12047 deletions

View File

@@ -1117,7 +1117,7 @@ TkBTreeInsertChars(
/*
* I don't believe it's possible for either of the two lines passed to
* this function to be the last line of text, but the function is robust
* to that case anyway. (We must never re-calculated the line height of
* to that case anyway. (We must never re-calculate the line height of
* the last line).
*/
@@ -1882,8 +1882,7 @@ TkBTreePreviousLine(
* number of pixels in the widget.
*
* Results:
* The result is the index of linePtr within the tree, where 0
* corresponds to the first line in the tree.
* The result is the pixel height of the top of the given line.
*
* Side effects:
* None.
@@ -3616,20 +3615,6 @@ TkTextIsElided(
infoPtr->elidePriority = -1;
for (i = infoPtr->numTags-1; i >=0; i--) {
if (infoPtr->tagCnts[i] & 1) {
/*
* Who would make the selection elided?
*/
if ((tagPtr == textPtr->selTagPtr)
&& !(textPtr->flags & GOT_FOCUS)
&& (textPtr->inactiveSelBorder == NULL
#ifdef MAC_OSX_TK
/* Don't show inactive selection in disabled widgets. */
|| textPtr->state == TK_TEXT_STATE_DISABLED
#endif
)) {
continue;
}
infoPtr->elide = infoPtr->tagPtrs[i]->elide;
/*