summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2015-02-11 20:45:27 (GMT)
committerfvogel <fvogelnew1@free.fr>2015-02-11 20:45:27 (GMT)
commit784583fabc13c80d219daf0a6acdbfc62783239d (patch)
tree57bf5e7e7250b84bc16d7fa0fa19dfecde1daa96 /generic
parent968a521de8898dbeb3926a2af63004958ad5f7d0 (diff)
parent7f41da748fce16f6accf68d1beed3e4a7e78ed71 (diff)
downloadtk-784583fabc13c80d219daf0a6acdbfc62783239d.zip
tk-784583fabc13c80d219daf0a6acdbfc62783239d.tar.gz
tk-784583fabc13c80d219daf0a6acdbfc62783239d.tar.bz2
Merged core-8-5-branch
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTextBTree.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index eaab652..7383d21 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -3615,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;
/*