summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/tlshell
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2019-10-11 11:45:12 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2019-10-11 11:45:12 +0000
commit1e7c9553a21edc3e757745f1d5c4e887bbcde1df (patch)
treed34ceeacc2039728853f89bc30077d23177e3af8 /Master/texmf-dist/scripts/tlshell
parent2c7e2045cc69f3e8a43e73164839710827c04553 (diff)
Better handling of titlebar Close button
git-svn-id: svn://tug.org/texlive/trunk@52337 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/tlshell')
-rwxr-xr-xMaster/texmf-dist/scripts/tlshell/tlshell.tcl11
1 files changed, 8 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/tlshell/tlshell.tcl b/Master/texmf-dist/scripts/tlshell/tlshell.tcl
index e9bedea6890..c34147b4d8e 100755
--- a/Master/texmf-dist/scripts/tlshell/tlshell.tcl
+++ b/Master/texmf-dist/scripts/tlshell/tlshell.tcl
@@ -167,8 +167,10 @@ proc long_message {str type {p "."}} {
}
if [winfo exists .tlmg.cancel] {
bind .tlmg <Escape> {.tlmg.cancel invoke}
+ wm protocol WM_DELETE_WINDOW {cancel_or_destroy .tlmg.cancel .tlmg}
} elseif {$type eq "ok"} {
bind .tlmg <Escape> {.tlmg.ok invoke}
+ wm protocol WM_DELETE_WINDOW {cancel_or_destroy .tlmg.ok .tlmg}
}
ppack [ttk::frame .tlmg.tx] -in .tlmg.bg -side top -fill both -expand 1
@@ -796,6 +798,7 @@ If this takes too long, press Abort and choose another repository." \
}
ttk::button .loading.abo -text [__ "Abort"] -command abort_load
ppack .loading.abo -in .loading.buttons -side right
+ wm protocol .loading {cancel_or_destroy .loading.abo .loading}
wm resizable .loading 0 0
place_dlg .loading .
} ; # splash_loading
@@ -918,7 +921,8 @@ proc show_logs {} {
ppack [ttk::label .tllg.status -textvariable ::busy -anchor w] \
-in .tllg.bottom -side left
bind .tllg <Escape> {.tllg.close invoke}
- wm protocol .tllg WM_DELETE_WINDOW {.tllg.close invoke}
+ wm protocol .tllg WM_DELETE_WINDOW \
+ {cancel_or_destroy .tllg.close .tllg}
# notebook pages and scrollbars
ttk::frame .tllg.log
@@ -1271,7 +1275,8 @@ proc repository_dialog {} {
ppack .tlr.cancel -in .tlr.closebuttons -side right
bind .tlr <Escape> {.tlr.cancel invoke}
- wm protocol .tlr WM_DELETE_WINDOW {.tlr.cancel invoke}
+ wm protocol .tlr WM_DELETE_WINDOW \
+ {cancel_or_destroy .tlr.cancel .tlr}
wm resizable .tlr 1 0
place_dlg .tlr .
} ; # repository_dialog
@@ -2314,7 +2319,7 @@ proc populate_main {} {
bind .pkg_popup <Leave> {.pkg_popup unpost}
}
- wm protocol . WM_DELETE_WINDOW {.q invoke}
+ wm protocol . WM_DELETE_WINDOW {cancel_or_destroy .q .}
wm resizable . 1 1
wm state . normal
}