aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hills <mark@pogo.org.uk>2010-01-13 20:40:18 +0000
committerPaul Mackerras <paulus@samba.org>2010-03-20 20:53:21 +1100
commit75eb2af0e02b9d38742d04929b1c4da46b8d13c9 (patch)
tree6fd17e9da3586f121afafa0baff061a5e595f9fb
parentdecd0a1ea594232f3b84831104257a0225be0085 (diff)
downloadgit-75eb2af0e02b9d38742d04929b1c4da46b8d13c9.tar.gz
git-75eb2af0e02b9d38742d04929b1c4da46b8d13c9.tar.xz
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>
-rwxr-xr-xgitk12
1 files changed, 0 insertions, 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]