diff options
| author | hobbs <hobbs> | 2006-09-06 22:01:24 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-09-06 22:01:24 (GMT) |
| commit | 2b8ba9bf056be6ce619118ddfdca3f76474d15da (patch) | |
| tree | 983074bdc91b005de21970a3ec98bae0c6d5af63 /generic/tkTextBTree.c | |
| parent | 89223b8ae040533895f4ce1c2ed66cb168bbaaf5 (diff) | |
| download | tk-2b8ba9bf056be6ce619118ddfdca3f76474d15da.zip tk-2b8ba9bf056be6ce619118ddfdca3f76474d15da.tar.gz tk-2b8ba9bf056be6ce619118ddfdca3f76474d15da.tar.bz2 | |
* generic/tkEntry.c: move hard-coded ALWAYS_SHOW_SELECTION
* generic/tkInt.h: control of entry/text selection display
* generic/tkText.c: based on focus to the Tcl level,
* generic/tkTextBTree.c: controlled by ::tk::AlwaysShowSelection
* generic/tkTextDisp.c: (boolean, private). [Bug 1553691]
* generic/tkWindow.c:
* library/tk.tcl
* unix/tkUnixPort.h:
Diffstat (limited to 'generic/tkTextBTree.c')
| -rw-r--r-- | generic/tkTextBTree.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 5c5fb86..5c4069e 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTextBTree.c,v 1.6.2.1 2005/11/27 02:44:25 das Exp $ + * RCS: @(#) $Id: tkTextBTree.c,v 1.6.2.2 2006/09/06 22:01:25 hobbs Exp $ */ #include "tkInt.h" @@ -2550,13 +2550,12 @@ TkTextIsElided(textPtr, indexPtr) for (i = numTags-1; i >=0; i--) { if (tagCnts[i] & 1) { -#ifndef ALWAYS_SHOW_SELECTION /* who would make the selection elided? */ - if ((tagPtr == textPtr->selTagPtr) + if (!TkpAlwaysShowSelection(textPtr->tkwin) + && (tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) { continue; } -#endif elide = tagPtrs[i]->elide; break; } |