summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@noemail.net>2012-08-25 01:54:40 (GMT)
committerdgp <dgp@noemail.net>2012-08-25 01:54:40 (GMT)
commit694330fc240836053c9cf323e5bc3d9c414598f0 (patch)
treecd8890c1f54e58f13d18009bc67da0ae2e67560d
parent06ec4158f2baafe6498addcd0ea5ef5401bed622 (diff)
parent6643143e69f66b40239997640e1f5dcf429d104e (diff)
downloadtk-694330fc240836053c9cf323e5bc3d9c414598f0.zip
tk-694330fc240836053c9cf323e5bc3d9c414598f0.tar.gz
tk-694330fc240836053c9cf323e5bc3d9c414598f0.tar.bz2
3554026 3561016 Better fix from Emiliano Gavilan
FossilOrigin-Name: 5b17b72936621b19c9e97557ec48396f59ce999e
-rw-r--r--unix/tkUnixWm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index c79f7cb..2626d71 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6753,14 +6753,14 @@ TkSetTransientFor(Tk_Window tkwin, Tk_Window parent)
if (parent == None) {
parent = Tk_Parent(tkwin);
while (!Tk_IsTopLevel(parent))
- parent = Tk_Parent(tkwin);
+ parent = Tk_Parent(parent);
}
/*
* Prevent crash due to incomplete initialization, or other problems.
* [Bugs 3554026, 3561016]
*/
if (((TkWindow *)parent)->wmInfoPtr->wrapperPtr == NULL) {
- return;
+ CreateWrapper(((TkWindow *)parent)->wmInfoPtr);
}
XSetTransientForHint(Tk_Display(tkwin),
((TkWindow *)tkwin)->wmInfoPtr->wrapperPtr->window,