Skip to content

Commit 83a2de9

Browse files
committed
gitk: eliminate unused ui color variables
gitk has a number of variables used in setting up colors for the classic (non-themed) widget set. These variables are unused with ttk, so let's eliminate them. But, leave the variables in the config file for now - those can be eliminated after this change is merged. Signed-off-by: Mark Levedahl <[email protected]>
1 parent 1eadf0f commit 83a2de9

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

gitk

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,7 +2381,6 @@ proc makewindow {} {
23812381
global highlight_files gdttype
23822382
global searchstring sstring
23832383
global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor
2384-
global uifgcolor uifgdisabledcolor
23852384
global filesepbgcolor filesepfgcolor
23862385
global mergecolors foundbgcolor currentsearchhitbgcolor
23872386
global headctxmenu progresscanv progressitem progresscoords statusw
@@ -11734,7 +11733,7 @@ proc prefspage_general {notebook} {
1173411733
}
1173511734
1173611735
proc prefspage_colors {notebook} {
11737-
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11736+
global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
1173811737
global diffbgcolors
1173911738
1174011739
set page [create_prefs_page $notebook.colors]
@@ -11781,7 +11780,7 @@ proc prefspage_colors {notebook} {
1178111780
}
1178211781
1178311782
proc prefspage_set_colorswatches {page} {
11784-
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11783+
global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
1178511784
global diffbgcolors
1178611785
1178711786
$page.bg configure -background $bgcolor
@@ -11909,7 +11908,7 @@ proc setfg {c} {
1190911908
}
1191011909
1191111910
proc set_gui_colors {} {
11912-
global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
11911+
global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
1191311912
global diffbgcolors
1191411913
1191511914
setbg $bgcolor
@@ -12508,17 +12507,11 @@ if {[tk windowingsystem] eq "aqua"} {
1250812507
1250912508
set colors {"#00ff00" red blue magenta darkgrey brown orange}
1251012509
if {[tk windowingsystem] eq "win32"} {
12511-
set uicolor SystemButtonFace
12512-
set uifgcolor SystemButtonText
12513-
set uifgdisabledcolor SystemDisabledText
1251412510
set bgcolor SystemWindow
1251512511
set fgcolor SystemWindowText
1251612512
set selectbgcolor SystemHighlight
1251712513
set web_browser "cmd /c start"
1251812514
} else {
12519-
set uicolor grey85
12520-
set uifgcolor black
12521-
set uifgdisabledcolor "#999"
1252212515
set bgcolor white
1252312516
set fgcolor black
1252412517
set selectbgcolor gray85
@@ -12560,6 +12553,9 @@ set currentsearchhitbgcolor orange
1256012553
1256112554
set theme [ttk::style theme use]
1256212555
set themeloader {}
12556+
set uicolor {}
12557+
set uifgcolor {}
12558+
set uifgdisabledcolor {}
1256312559
1256412560
# button for popping up context menus
1256512561
if {[tk windowingsystem] eq "aqua" && [package vcompare $::tcl_version 8.7] < 0} {

0 commit comments

Comments
 (0)