summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-02-21 05:21:54 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-02-21 05:21:54 (GMT)
commitf4d93486aea3a3c20ddef409e5bfd8a60efdc512 (patch)
treeacf2ae11bae5d905518f56968834d785f735f7a3
parentcec8f51bd64410ebd94ac6c9be2f34514298d193 (diff)
parentaba15f7f592c302196401d17a42c772d744555b4 (diff)
downloadgit-f4d93486aea3a3c20ddef409e5bfd8a60efdc512.zip
git-f4d93486aea3a3c20ddef409e5bfd8a60efdc512.tar.gz
git-f4d93486aea3a3c20ddef409e5bfd8a60efdc512.tar.bz2
Merge branch 'maint'
* maint: git-gui: Ensure error dialogs always appear over all other windows
-rw-r--r--lib/error.tcl18
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/error.tcl b/lib/error.tcl
index 0fdd753..45800d5 100644
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -1,6 +1,10 @@
# git-gui branch (create/delete) support
# Copyright (C) 2006, 2007 Shawn Pearce
+proc _error_parent {} {
+ return [grab current .]
+}
+
proc error_popup {msg} {
set title [appname]
if {[reponame] ne {}} {
@@ -11,8 +15,8 @@ proc error_popup {msg} {
-type ok \
-title [append "$title: " [mc "error"]] \
-message $msg]
- if {[winfo ismapped .]} {
- lappend cmd -parent .
+ if {[winfo ismapped [_error_parent]]} {
+ lappend cmd -parent [_error_parent]
}
eval $cmd
}
@@ -27,13 +31,13 @@ proc warn_popup {msg} {
-type ok \
-title [append "$title: " [mc "warning"]] \
-message $msg]
- if {[winfo ismapped .]} {
- lappend cmd -parent .
+ if {[winfo ismapped [_error_parent]]} {
+ lappend cmd -parent [_error_parent]
}
eval $cmd
}
-proc info_popup {msg {parent .}} {
+proc info_popup {msg} {
set title [appname]
if {[reponame] ne {}} {
append title " ([reponame])"
@@ -56,8 +60,8 @@ proc ask_popup {msg} {
-type yesno \
-title $title \
-message $msg]
- if {[winfo ismapped .]} {
- lappend cmd -parent .
+ if {[winfo ismapped [_error_parent]]} {
+ lappend cmd -parent [_error_parent]
}
eval $cmd
}