diff options
| author | hobbs <hobbs> | 2006-09-06 22:01:24 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2006-09-06 22:01:24 (GMT) |
| commit | c1e05e3afb76356ef8e2d5af2a2ce3660c6bee48 (patch) | |
| tree | 983074bdc91b005de21970a3ec98bae0c6d5af63 /generic/tkTextDisp.c | |
| parent | 87caa3a60c4200a5a79707791643a555407a1271 (diff) | |
| download | tk-c1e05e3afb76356ef8e2d5af2a2ce3660c6bee48.zip tk-c1e05e3afb76356ef8e2d5af2a2ce3660c6bee48.tar.gz tk-c1e05e3afb76356ef8e2d5af2a2ce3660c6bee48.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/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 22a5a2e..e13766e 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.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: tkTextDisp.c,v 1.14.2.2 2006/04/05 19:48:07 hobbs Exp $ + * RCS: @(#) $Id: tkTextDisp.c,v 1.14.2.3 2006/09/06 22:01:26 hobbs Exp $ */ #include "tkPort.h" @@ -546,15 +546,15 @@ GetStyle(textPtr, indexPtr) tagPtr = tagPtrs[i]; /* - * On Windows and Mac, we need to skip the selection tag if - * we don't have focus. + * Skip the selection tag if we don't have focus, + * unless we always want to show the selection. */ -#ifndef ALWAYS_SHOW_SELECTION - if ((tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) { + if (!TkpAlwaysShowSelection(textPtr->tkwin) + && (tagPtr == textPtr->selTagPtr) + && !(textPtr->flags & GOT_FOCUS)) { continue; } -#endif if ((tagPtr->border != NULL) && (tagPtr->priority > borderPrio)) { styleValues.border = tagPtr->border; |