gitk: Remove forced use of sans-serif font
The X resources set using uifont cover this case. Signed-off-by: Mark Hills <mark@pogo.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
Mark Hills committed
Jan 13, 2010 at 20:40 UTC
75eb2af0e02b9d38742d04929b1c4da46b8d13c9
1 file changed
-12
gitk
-12
@@ -10531,7 +10531,6 @@ proc mkfontdisp {font top which} {
10531
set fontpref($font) [set $font]
10532
${NS}::button $top.${font}but -text $which \
10533
-command [list choosefont $font $which]
10534
- if {!$use_ttk} {$top.${font}but configure -font optionfont}
10534
${NS}::label $top.$font -relief flat -font $font \
10535
-text $fontattr($font,family) -justify left
10536
grid x $top.${font}but $top.$font -sticky w
@@ -10794,15 +10793,6 @@ proc doprefs {} {
10793
mkfontdisp textfont $top [mc "Diff display font"]
10794
mkfontdisp uifont $top [mc "User interface font"]
10795
10797
- if {!$use_ttk} {
10798
- foreach w {maxpctl maxwidthl showlocal autoselect tabstopl ntag
10799
- ldiff lattr extdifff.l extdifff.b bgbut fgbut
10800
- diffoldbut diffnewbut hunksepbut markbgbut selbgbut
10801
- want_ttk ttk_note} {
10802
- $top.$w configure -font optionfont
10803
- }
10804
- }
10805
-
10796
${NS}::frame $top.buts
10797
${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active
10798
${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal
@@ -11414,8 +11404,6 @@ namespace import ::msgcat::mc
11404
11405
catch {source ~/.gitk}
11406
11417
-font create optionfont -family sans-serif -size -12
11418
-
11407
parsefont mainfont $mainfont
11408
eval font create mainfont [fontflags mainfont]
11409
eval font create mainfontbold [fontflags mainfont 1]