From 75eb2af0e02b9d38742d04929b1c4da46b8d13c9 Mon Sep 17 00:00:00 2001 From: Mark Hills Date: Wed, 13 Jan 2010 20:40:18 +0000 Subject: [PATCH] gitk: Remove forced use of sans-serif font The X resources set using uifont cover this case. Signed-off-by: Mark Hills Signed-off-by: Paul Mackerras --- gitk | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gitk b/gitk index 50773a3d9..59970aff3 100755 --- a/gitk +++ b/gitk @@ -10531,7 +10531,6 @@ proc mkfontdisp {font top which} { set fontpref($font) [set $font] ${NS}::button $top.${font}but -text $which \ -command [list choosefont $font $which] - if {!$use_ttk} {$top.${font}but configure -font optionfont} ${NS}::label $top.$font -relief flat -font $font \ -text $fontattr($font,family) -justify left grid x $top.${font}but $top.$font -sticky w @@ -10794,15 +10793,6 @@ proc doprefs {} { mkfontdisp textfont $top [mc "Diff display font"] mkfontdisp uifont $top [mc "User interface font"] - if {!$use_ttk} { - foreach w {maxpctl maxwidthl showlocal autoselect tabstopl ntag - ldiff lattr extdifff.l extdifff.b bgbut fgbut - diffoldbut diffnewbut hunksepbut markbgbut selbgbut - want_ttk ttk_note} { - $top.$w configure -font optionfont - } - } - ${NS}::frame $top.buts ${NS}::button $top.buts.ok -text [mc "OK"] -command prefsok -default active ${NS}::button $top.buts.can -text [mc "Cancel"] -command prefscan -default normal @@ -11414,8 +11404,6 @@ namespace import ::msgcat::mc catch {source ~/.gitk} -font create optionfont -family sans-serif -size -12 - parsefont mainfont $mainfont eval font create mainfont [fontflags mainfont] eval font create mainfontbold [fontflags mainfont 1] -- 2.30.2