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 /macosx/tkMacOSXWindowEvent.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 'macosx/tkMacOSXWindowEvent.c')
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 2db4bd1..7212ab4 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.14 2006/07/24 04:45:26 das Exp $ + * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.3.2.15 2006/09/10 17:07:36 das Exp $ */ #include "tkMacOSXInt.h" @@ -467,10 +467,11 @@ TkMacOSXGenerateFocusEvent( /* * Don't send focus events to windows of class help or to - * overrideredirect windows. + * windows with the kWindowNoActivatesAttribute. */ if (((TkWindow *)tkwin)->wmInfoPtr->macClass == kHelpWindowClass || - Tk_Attributes(tkwin)->override_redirect) { + ((TkWindow *)tkwin)->wmInfoPtr->attributes & + kWindowNoActivatesAttribute) { return false; } |