aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-05-20 19:42:52 +0200
committerJohannes Sixt <j6t@kdbg.org>2025-05-20 19:42:52 +0200
commit9d60ba03d60cc32bd350af2f8c1301ac71afbcb0 (patch)
tree67acd1d6d49df2fa967ba769e218d0b247d19390
parentgitk: place file name arguments after options in msgfmt call (diff)
parentgitk: Legacy widgets doesn't have combobox (diff)
downloadgit-9d60ba03d60cc32bd350af2f8c1301ac71afbcb0.tar.gz
git-9d60ba03d60cc32bd350af2f8c1301ac71afbcb0.zip
Merge branch 'yh/fix-non-themed-combobox'
* yh/fix-non-themed-combobox: gitk: Legacy widgets doesn't have combobox
-rwxr-xr-xgitk6
1 files changed, 2 insertions, 4 deletions
diff --git a/gitk b/gitk
index 11ad639d06..966833a19e 100755
--- a/gitk
+++ b/gitk
@@ -11736,13 +11736,11 @@ proc prefspage_general {notebook} {
grid x $page.tabstopl $page.tabstop -sticky w
${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"]
- ${NS}::combobox $page.wrapcomment -values {none char word} -state readonly \
- -textvariable wrapcomment
+ makedroplist $page.wrapcomment wrapcomment none char word
grid x $page.wrapcommentl $page.wrapcomment -sticky w
${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"]
- ${NS}::combobox $page.wrapdefault -values {none char word} -state readonly \
- -textvariable wrapdefault
+ makedroplist $page.wrapdefault wrapdefault none char word
grid x $page.wrapdefaultl $page.wrapdefault -sticky w
${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \