summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-13 12:28:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-13 12:28:42 (GMT)
commit028b768764b0fd08b0df7fe1b1de9529f1702a61 (patch)
treea471fc6dcd2488604d564c62dca89663f7a63c37 /win
parent03f1d5f3767078ab44dabcf7fc6e608af5c3cb3e (diff)
parenta95ee711b8ad3d362ef1e58775e501230809527d (diff)
downloadtk-028b768764b0fd08b0df7fe1b1de9529f1702a61.zip
tk-028b768764b0fd08b0df7fe1b1de9529f1702a61.tar.gz
tk-028b768764b0fd08b0df7fe1b1de9529f1702a61.tar.bz2
merge trunk
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index efed842..e353813 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -5526,7 +5526,7 @@ WmTransientCmd(
}
if (objc == 3) {
if (masterPtr != NULL) {
- Tcl_SetObjResult(interp, TkNewWindowObj(masterPtr));
+ Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
}
return TCL_OK;
}