Skip to content

Commit cb9fa4d

Browse files
committed
gitk: always use themed Tk (ttk)
gitk added the option to used themed Tk (ttk) in 0cc08ff ("gitk: Add a user preference to enable/disable use of themed widgets", 2009-09-05). Using ttk had to be optional as Tk 8.4, then in common use, does not have ttk. ttk is the default when available, so the ttk code paths are by now very well tested. gitk also has code paths for the older default widgets, increasing the maintenance burden. Let's make ttk non-optional to reduce code complexity in later commits. Signed-off-by: Mark Levedahl <[email protected]>
1 parent 5b8103a commit cb9fa4d

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

gitk

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11669,7 +11669,7 @@ proc create_prefs_page {w} {
1166911669
}
1167011670
1167111671
proc prefspage_general {notebook} {
11672-
global NS have_ttk
11672+
global NS
1167311673
global {*}$::config_variables
1167411674
1167511675
set page [create_prefs_page $notebook.general]
@@ -11747,14 +11747,6 @@ proc prefspage_general {notebook} {
1174711747
1174811748
${NS}::label $page.lgen -text [mc "General options"] -font mainfontbold
1174911749
grid $page.lgen - -sticky w -pady 10
11750-
${NS}::checkbutton $page.want_ttk -variable want_ttk \
11751-
-text [mc "Use themed widgets"]
11752-
if {$have_ttk} {
11753-
${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
11754-
} else {
11755-
${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
11756-
}
11757-
grid x $page.want_ttk $page.ttk_note -sticky w
1175811750
return $page
1175911751
}
1176011752
@@ -12506,7 +12498,6 @@ set autocopy 0
1250612498
set autoselect 1
1250712499
set autosellen 40
1250812500
set perfile_attrs 0
12509-
set want_ttk 1
1251012501
1251112502
if {[tk windowingsystem] eq "aqua"} {
1251212503
set extdifftool "opendiff"
@@ -12651,7 +12642,6 @@ set config_variables {
1265112642
uifgdisabledcolor
1265212643
uifont
1265312644
visiblerefs
12654-
want_ttk
1265512645
web_browser
1265612646
workingfilescirclecolor
1265712647
wrapcomment
@@ -12748,16 +12738,9 @@ set nullid "0000000000000000000000000000000000000000"
1274812738
set nullid2 "0000000000000000000000000000000000000001"
1274912739
set nullfile "/dev/null"
1275012740
12751-
if {![info exists have_ttk]} {
12752-
set have_ttk [llength [info commands ::ttk::style]]
12753-
}
12754-
set use_ttk [expr {$have_ttk && $want_ttk}]
12755-
set NS [expr {$use_ttk ? "ttk" : ""}]
12756-
12757-
if {$use_ttk} {
12758-
setttkstyle
12759-
}
12760-
12741+
setttkstyle
12742+
set use_ttk 1
12743+
set NS ttk
1276112744
set appname "gitk"
1276212745
1276312746
set runq {}

0 commit comments

Comments
 (0)