[gitk] [PATCH] 2/2 Merging master into dev

[Pat Thoyts <patthoyts@users.sourceforge.net>]

commit 2e67e0332adb6896df6e6a7d4d8aeff179d2b657
Author: Pat Thoyts <patthoyts@users.sourceforge.net>
Date:   Fri Nov 6 22:19:09 2009 +0000

    Default to the system colours on Windows
    
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/gitk b/gitk
index 6360077..e591d61 100755
--- a/gitk
+++ b/gitk
@@ -10726,7 +10726,7 @@ proc doprefs {} {
     ${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
     grid $top.cdisp - -sticky w -pady 10
     label $top.ui -padx 40 -relief sunk -background $uicolor
-    button $top.uibut -text [mc "Interface"] -font optionfont \
+    ${NS}::button $top.uibut -text [mc "Interface"] \
        -command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
     grid x $top.uibut $top.ui -sticky w
     label $top.bg -padx 40 -relief sunk -background $bgcolor
@@ -11334,13 +11334,20 @@ if {[tk windowingsystem] eq "aqua"} {
 }
 
 set colors {green red blue magenta darkgrey brown orange}
-set uicolor grey85
-set bgcolor white
-set fgcolor black
+if {[tk windowingsystem] eq "win32"} {
+    set uicolor SystemButtonFace
+    set bgcolor SystemWindow
+    set fgcolor SystemButtonText
+    set selectbgcolor SystemHighlight
+} else {
+    set uicolor grey85
+    set bgcolor white
+    set fgcolor black
+    set selectbgcolor gray85
+}
 set diffcolors {red "#00a000" blue}
 set diffcontext 3
 set ignorespace 0
-set selectbgcolor gray85
 set markbgcolor "#e0e0ff"
 
 set circlecolors {white blue gray blue blue}