diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:25:06 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-08-16 02:25:06 (GMT) |
| commit | 4b1da35c017b16355d7f8a343f9c81edad30214f (patch) | |
| tree | f917920573ac7301a6f8ac4195b531c7d340fcc6 /library | |
| parent | dba94e780143122a611e39861db5ced7c8d0f0cd (diff) | |
| parent | 4875d4135079ccec5bf1e4e60a5b6a835dbc8602 (diff) | |
| download | tk-4b1da35c017b16355d7f8a343f9c81edad30214f.zip tk-4b1da35c017b16355d7f8a343f9c81edad30214f.tar.gz tk-4b1da35c017b16355d7f8a343f9c81edad30214f.tar.bz2 | |
Merge in core-8-6-branch including updates for macOS 10.15 Catalina
Diffstat (limited to 'library')
| -rw-r--r-- | library/bgerror.tcl | 3 | ||||
| -rw-r--r-- | library/dialog.tcl | 5 | ||||
| -rw-r--r-- | library/msgbox.tcl | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/library/bgerror.tcl b/library/bgerror.tcl index 574ad8b..fa095f3 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -21,7 +21,8 @@ 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*info.text.background \ + systemTextBackgroundColor widgetDefault option add *ErrorDialog*Button.highlightBackground \ systemAlertBackgroundActive widgetDefault } diff --git a/library/dialog.tcl b/library/dialog.tcl index c751621..a099d90 100644 --- a/library/dialog.tcl +++ b/library/dialog.tcl @@ -44,11 +44,6 @@ proc ::tk_dialog {w title text bitmap default args} { } set windowingsystem [tk windowingsystem] - if {$windowingsystem eq "aqua"} { - option add *Dialog*background systemDialogBackgroundActive widgetDefault - option add *Dialog*Button.highlightBackground \ - systemDialogBackgroundActive widgetDefault - } # 1. Create the top-level window and divide it into top # and bottom parts. diff --git a/library/msgbox.tcl b/library/msgbox.tcl index 98603af..646c143 100644 --- a/library/msgbox.tcl +++ b/library/msgbox.tcl @@ -164,9 +164,6 @@ proc ::tk::MessageBox {args} { "warning" {set data(-icon) "caution"} "info" {set data(-icon) "note"} } - option add *Dialog*background systemDialogBackgroundActive widgetDefault - option add *Dialog*Button.highlightBackground \ - systemDialogBackgroundActive widgetDefault } if {![winfo exists $data(-parent)]} { |