diff options
| author | das <das> | 2006-09-10 17:07:35 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-10 17:07:35 (GMT) |
| commit | ee49c8360b9e97ffa3717e872fd4eb2964837828 (patch) | |
| tree | 0ebf513edd6850ddaf086cc1404d6768e491fe45 /generic/tkTextBTree.c | |
| parent | 506cb85a4def720b2dbc786b1395ca37d934d483 (diff) | |
| download | tk-ee49c8360b9e97ffa3717e872fd4eb2964837828.zip tk-ee49c8360b9e97ffa3717e872fd4eb2964837828.tar.gz tk-ee49c8360b9e97ffa3717e872fd4eb2964837828.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.
* library/text.tcl (aqua): change focus bindings to implement platform
standard look for inactive text selections using this new color.
* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show text
* generic/tkTextDisp.c (GetStyle): selection when text widget
* generic/tkText.c (TextEventProc): is in disabled state.
* generic/tkEntry.c (DisplayEntry): change default TkAqua selection
* macosx/tkMacOSXDefault.h: relief to "flat" (platform std).
* generic/tkText.c (Tk_TextCmd): 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/Makefile: 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/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): fix typo.
* unix/tcl.m4: sync with tcl/unix/tcl.m4.
Diffstat (limited to 'generic/tkTextBTree.c')
| -rw-r--r-- | generic/tkTextBTree.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 5c4069e..c2a5fbd 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.2 2006/09/06 22:01:25 hobbs Exp $ + * RCS: @(#) $Id: tkTextBTree.c,v 1.6.2.3 2006/09/10 17:07:35 das Exp $ */ #include "tkInt.h" @@ -2551,7 +2551,13 @@ TkTextIsElided(textPtr, indexPtr) for (i = numTags-1; i >=0; i--) { if (tagCnts[i] & 1) { /* who would make the selection elided? */ - if (!TkpAlwaysShowSelection(textPtr->tkwin) + if ( +#ifndef MAC_OSX_TK + !TkpAlwaysShowSelection(textPtr->tkwin) +#else + /* Don't show inactive selection in disabled widgets. */ + textPtr->state == TK_STATE_DISABLED +#endif && (tagPtr == textPtr->selTagPtr) && !(textPtr->flags & GOT_FOCUS)) { continue; |