gitk: Default to the system colours on Windows
Also convert a button to use the themed widget set. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
Pat Thoyts committed
Nov 6, 2009 at 23:28 UTC
1924d1bc0dc99cd3460d3551671908cc76c09d3b
1 file changed
+12
-5
gitk
+12
-5
@@ -10732,7 +10732,7 @@ proc doprefs {} {
10732
${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
10733
grid $top.cdisp - -sticky w -pady 10
10734
label $top.ui -padx 40 -relief sunk -background $uicolor
10735
- button $top.uibut -text [mc "Interface"] -font optionfont \
10735
+ ${NS}::button $top.uibut -text [mc "Interface"] \
10736
-command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
10737
grid x $top.uibut $top.ui -sticky w
10738
label $top.bg -padx 40 -relief sunk -background $bgcolor
@@ -11350,13 +11350,20 @@ if {[tk windowingsystem] eq "aqua"} {
11350
}
11351
11352
set colors {green red blue magenta darkgrey brown orange}
11353
-set uicolor grey85
11354
-set bgcolor white
11355
-set fgcolor black
11353
+if {[tk windowingsystem] eq "win32"} {
11354
+ set uicolor SystemButtonFace
11355
+ set bgcolor SystemWindow
11356
+ set fgcolor SystemButtonText
11357
+ set selectbgcolor SystemHighlight
11358
+} else {
11359
+ set uicolor grey85
11360
+ set bgcolor white
11361
+ set fgcolor black
11362
+ set selectbgcolor gray85
11363
+}
11364
set diffcolors {red "#00a000" blue}
11365
set diffcontext 3
11366
set ignorespace 0
11359
-set selectbgcolor gray85
11367
set markbgcolor "#e0e0ff"
11368
11369
set circlecolors {white blue gray blue blue}