gitk offers to not use themed tk (ttk), and cannot use such on Tcl/Tk
earlier than 8.5 where ttk was introduced. To facilitate this, widgets
are switched from themed to not by use of the global ${NS}: ${NS} == ttk
to select themed widgets, "" for non-themed. The combobox widget exists
only in ttk, and proc makedroplist exists to create a combobox like
widget using only base tk widgets.
However, 904b36b815 ("gitk: add text wrapping preferences", 2024-12-05),
introduced two instances of ${NS}::combobox, and since that commit,
gitk effectively requires Tk >= 8.5 and themed widgets enabled.
Fix this by using makedropbox instead.
Signed-off-by: Mark Levedahl <mlevedahl@xxxxxxxxx>
---
gitk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 11ad639..d48982f 100755
--- a/gitk
+++ b/gitk
@@ -11736,12 +11736,12 @@ 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 \
+ makedroplist $page.wrapcomment -values {none char word} -state readonly \
-textvariable wrapcomment
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 \
+ makedroplist $page.wrapdefault -values {none char word} -state readonly \
-textvariable wrapdefault
grid x $page.wrapdefaultl $page.wrapdefault -sticky w
--
2.49.0.99.610
