aboutsummaryrefslogtreecommitdiff
path: root/lib/error.tcl
diff options
context:
space:
mode:
authorMark Levedahl <mlevedahl@gmail.com>2025-07-14 12:15:49 -0400
committerMark Levedahl <mlevedahl@gmail.com>2025-07-18 23:48:34 -0400
commitfdc0e3a29020276de3d9344d2ab0caf4d086fd3a (patch)
tree29f865e546d585b5f260f5a3561d81ac813e4fb5 /lib/error.tcl
parented7d2af78cd4cb8c9a8db4f2f60f56101d9439f8 (diff)
downloadgit-fdc0e3a29020276de3d9344d2ab0caf4d086fd3a.tar.xz
git-gui: remove ${NS} indirection for ttk
git-gui uses ${NS} to switch between non-themed and themed widgets, with ${NS} == 'ttk' selecting the latter. As git-gui now always uses ttk, this indirection is not needed. Remove it. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Diffstat (limited to 'lib/error.tcl')
-rw-r--r--lib/error.tcl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/error.tcl b/lib/error.tcl
index 8968a57f33..4e95b407bd 100644
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -71,13 +71,13 @@ proc ask_popup {msg} {
}
proc hook_failed_popup {hook msg {is_fatal 1}} {
- global use_ttk NS
+ global use_ttk
set w .hookfail
Dialog $w
wm withdraw $w
- ${NS}::frame $w.m
- ${NS}::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
+ ttk::frame $w.m
+ ttk::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
-anchor w \
-justify left \
-font font_uibold
@@ -89,10 +89,10 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
-width 80 -height 10 \
-font font_diff \
-yscrollcommand [list $w.m.sby set]
- ${NS}::scrollbar $w.m.sby -command [list $w.m.t yview]
+ ttk::scrollbar $w.m.sby -command [list $w.m.t yview]
pack $w.m.l1 -side top -fill x
if {$is_fatal} {
- ${NS}::label $w.m.l2 \
+ ttk::label $w.m.l2 \
-text [mc "You must correct the above errors before committing."] \
-anchor w \
-justify left \
@@ -106,7 +106,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
$w.m.t insert 1.0 $msg
$w.m.t conf -state disabled
- ${NS}::button $w.ok -text OK \
+ ttk::button $w.ok -text OK \
-width 15 \
-command "destroy $w"
pack $w.ok -side bottom -anchor e -pady 10 -padx 10