diff options
Diffstat (limited to 'library')
| -rw-r--r-- | library/bgerror.tcl | 7 | ||||
| -rw-r--r-- | library/console.tcl | 5 | ||||
| -rw-r--r-- | library/menu.tcl | 21 |
3 files changed, 22 insertions, 11 deletions
diff --git a/library/bgerror.tcl b/library/bgerror.tcl index 48c212e..2e6229b 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -7,10 +7,10 @@ # Donal K. Fellows. # # Copyright (c) 1998-2000 by Ajuba Solutions. -# All rights reserved. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # -# RCS: @(#) $Id: bgerror.tcl,v 1.23.2.8 2007/05/30 06:37:03 das Exp $ -# $Id: bgerror.tcl,v 1.23.2.8 2007/05/30 06:37:03 das Exp $ +# RCS: @(#) $Id: bgerror.tcl,v 1.23.2.9 2007/11/09 06:26:54 das Exp $ +# $Id: bgerror.tcl,v 1.23.2.9 2007/11/09 06:26:54 das Exp $ namespace eval ::tk::dialog::error { namespace import -force ::tk::msgcat::* @@ -21,6 +21,7 @@ namespace eval ::tk::dialog::error { if {[tk windowingsystem] eq "aqua"} { option add *ErrorDialog*background systemAlertBackgroundActive \ widgetDefault + option add *ErrorDialog*info.text.background white widgetDefault option add *ErrorDialog*Button.highlightBackground \ systemAlertBackgroundActive widgetDefault } diff --git a/library/console.tcl b/library/console.tcl index 037eb59..540fc3c 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -4,10 +4,11 @@ # can be used by non-unix systems that do not have built-in support # for shells. # -# RCS: @(#) $Id: console.tcl,v 1.22.2.5 2006/01/25 18:21:41 dgp Exp $ +# RCS: @(#) $Id: console.tcl,v 1.22.2.6 2007/11/09 06:26:54 das Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -105,7 +106,7 @@ proc ::tk::ConsoleInit {} { pack $con -fill both -expand 1 -side left switch -exact $tcl_platform(platform) { "macintosh" { - $con configure -font {Monaco 9 normal} -highlightthickness 0 + $con configure -font {Monaco 10 normal} -highlightthickness 0 } "windows" { $con configure -font systemfixed diff --git a/library/menu.tcl b/library/menu.tcl index aedeb95..d265156 100644 --- a/library/menu.tcl +++ b/library/menu.tcl @@ -4,11 +4,12 @@ # It also implements keyboard traversal of menus and implements a few # other utility procedures related to menus. # -# RCS: @(#) $Id: menu.tcl,v 1.18.2.4 2006/01/25 18:21:41 dgp Exp $ +# RCS: @(#) $Id: menu.tcl,v 1.18.2.5 2007/11/09 06:26:54 das Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. @@ -203,7 +204,7 @@ proc ::tk::MbEnter w { MbLeave $Priv(inMenubutton) } set Priv(inMenubutton) $w - if {[$w cget -state] ne "disabled"} { + if {[$w cget -state] ne "disabled" && [tk windowingsystem] ne "aqua"} { $w configure -state active } } @@ -222,7 +223,7 @@ proc ::tk::MbLeave w { if {![winfo exists $w]} { return } - if {[$w cget -state] eq "active"} { + if {[$w cget -state] eq "active" && [tk windowingsystem] ne "aqua"} { $w configure -state normal } } @@ -261,9 +262,13 @@ proc ::tk::MbPost {w {x {}} {y {}}} { MenuUnpost {} } set Priv(cursor) [$w cget -cursor] - set Priv(relief) [$w cget -relief] $w configure -cursor arrow - $w configure -relief raised + if {[tk windowingsystem] ne "aqua"} { + set Priv(relief) [$w cget -relief] + $w configure -relief raised + } else { + $w configure -state active + } set Priv(postedMb) $w set Priv(focus) [focus] @@ -405,7 +410,11 @@ proc ::tk::MenuUnpost menu { $menu unpost set Priv(postedMb) {} $mb configure -cursor $Priv(cursor) - $mb configure -relief $Priv(relief) + if {[tk windowingsystem] ne "aqua"} { + $mb configure -relief $Priv(relief) + } else { + $mb configure -state normal + } } elseif {$Priv(popup) ne ""} { $Priv(popup) unpost set Priv(popup) {} |