diff options
| author | das <das> | 2006-09-10 17:06:31 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-10 17:06:31 (GMT) |
| commit | 41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0 (patch) | |
| tree | 13ad5944ad3d007fdcb67d4af43aa55cb42e1470 /generic/tkTextDisp.c | |
| parent | b0768715132b6b828aa0ec352e5c4669097307f9 (diff) | |
| download | tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.zip tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.tar.gz tk-41dfe0d4791ea37a1f6a7c3b069b3f41c79466b0.tar.bz2 | |
* macosx/tkMacOSXColor.c (TkSetMacColor, TkpGetColor): use AppearanceMgr
* macosx/tkMacOSXDefault.h: to retrieve platform std colors for text
* macosx/tkMacOSXPort.h: selections, add "systemHighlightSecondary"
color name for standard color of inactive selections, use this color as
default for text widget -inactiveselectbackground to implement platform
standard look for inactive text selections.
* library/text.tcl (aqua): remove focus bindings to set selection color.
* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show inactive
* generic/tkTextDisp.c (GetStyle): text selection when text
widget is in disabled state.
* generic/tkEntry.c (DisplayEntry): change default TkAqua selection
* macosx/tkMacOSXDefault.h: relief to "flat" (platform std).
* generic/tkText.c (CreateWidget): fix bug leading to default text
selection relief string DEF_TEXT_SELECT_RELIEF being ignored.
* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): allow mouse
event delivery to background windows with kWindowNoActivatesAttribute
(e.g. overrideredirect windows), as these never come to the foreground
they would not receive any mouse events otherwise. [Bug 1472624]
* macosx/tkMacOSXWindowEvent.c (TkMacOSXGenerateFocusEvent): do not
send focus events to any windows with kWindowNoActivatesAttribute.
* macosx/tkMacOSXXStubs.c (XQueryColor, XQueryColors): implement basic
XColor computation from pixel values, enough to make tkImg's window.c
happy, fixes img::window failures reported on tcl-mac.
* macosx/tkMacOSXMenu.c (DrawMenuEntryLabel): fix leak. [Bug 1554672]
* macosx/GNUmakefile: workaround bug in 'cp -pRH' on Darwin 6 and
earlier, fixes 'make embedded' failure reported on tcl-mac; fix error
from 'make deploy' with same build tree as previous 'make embedded'.
* macosx/Wish.xcodeproj/project.pbxproj: add new tclUnixCompat.c file.
* macosx/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): fix typo.
* unix/tcl.m4: sync with tcl/unix/tcl.m4.
* unix/configure: autoconf-2.59
Diffstat (limited to 'generic/tkTextDisp.c')
| -rw-r--r-- | generic/tkTextDisp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index d330e1d..9dda358 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -12,7 +12,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.58 2006/03/27 13:43:15 cc_benny Exp $ + * RCS: @(#) $Id: tkTextDisp.c,v 1.59 2006/09/10 17:06:32 das Exp $ */ #include "tkPort.h" @@ -815,12 +815,17 @@ GetStyle( /* * If this is the selection tag, and inactiveSelBorder is NULL (the - * default on Windows and Mac), then we need to skip it if we don't + * default on Windows), then we need to skip it if we don't * have focus. */ if ((tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) { - if (textPtr->inactiveSelBorder == NULL) { + if (textPtr->inactiveSelBorder == NULL +#ifdef MAC_OSX_TK + /* Don't show inactive selection in disabled widgets. */ + || textPtr->state == TK_TEXT_STATE_DISABLED +#endif + ) { continue; } border = textPtr->inactiveSelBorder; |