@@ -2381,7 +2381,6 @@ proc makewindow {} {
2381
2381
global highlight_files gdttype
2382
2382
global searchstring sstring
2383
2383
global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor
2384
- global uifgcolor uifgdisabledcolor
2385
2384
global filesepbgcolor filesepfgcolor
2386
2385
global mergecolors foundbgcolor currentsearchhitbgcolor
2387
2386
global headctxmenu progresscanv progressitem progresscoords statusw
@@ -11734,7 +11733,7 @@ proc prefspage_general {notebook} {
11734
11733
}
11735
11734
11736
11735
proc prefspage_colors {notebook} {
11737
- global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11736
+ global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11738
11737
global diffbgcolors
11739
11738
11740
11739
set page [ create_prefs_page $notebook .colors]
@@ -11781,7 +11780,7 @@ proc prefspage_colors {notebook} {
11781
11780
}
11782
11781
11783
11782
proc prefspage_set_colorswatches {page} {
11784
- global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11783
+ global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11785
11784
global diffbgcolors
11786
11785
11787
11786
$page .bg configure -background $bgcolor
@@ -11909,7 +11908,7 @@ proc setfg {c} {
11909
11908
}
11910
11909
11911
11910
proc set_gui_colors {} {
11912
- global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11911
+ global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11913
11912
global diffbgcolors
11914
11913
11915
11914
setbg $bgcolor
@@ -12508,17 +12507,11 @@ if {[tk windowingsystem] eq "aqua"} {
12508
12507
12509
12508
set colors {" #00ff00" red blue magenta darkgrey brown orange}
12510
12509
if {[ tk windowingsystem] eq " win32" } {
12511
- set uicolor SystemButtonFace
12512
- set uifgcolor SystemButtonText
12513
- set uifgdisabledcolor SystemDisabledText
12514
12510
set bgcolor SystemWindow
12515
12511
set fgcolor SystemWindowText
12516
12512
set selectbgcolor SystemHighlight
12517
12513
set web_browser " cmd /c start"
12518
12514
} else {
12519
- set uicolor grey85
12520
- set uifgcolor black
12521
- set uifgdisabledcolor " #999"
12522
12515
set bgcolor white
12523
12516
set fgcolor black
12524
12517
set selectbgcolor gray85
@@ -12560,6 +12553,9 @@ set currentsearchhitbgcolor orange
12560
12553
12561
12554
set theme [ ttk::style theme use]
12562
12555
set themeloader {}
12556
+ set uicolor {}
12557
+ set uifgcolor {}
12558
+ set uifgdisabledcolor {}
12563
12559
12564
12560
# button for popping up context menus
12565
12561
if {[ tk windowingsystem] eq " aqua" && [ package vcompare $::tcl_version 8.7] < 0} {
0 commit comments