summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixEmbed.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-09 15:44:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-09 15:44:24 (GMT)
commite450bb2502ab019788b0d6a85ba30cb3f947a81b (patch)
tree0de6a8886d3712b0093d2b9ee8bd22ab9838934c /unix/tkUnixEmbed.c
parent7d5930a9d7546ee43e622dd476c4a167e5217ff6 (diff)
parent86d9383e5ac170ca8a034085bb778f6fd96b7755 (diff)
downloadtk-e450bb2502ab019788b0d6a85ba30cb3f947a81b.zip
tk-e450bb2502ab019788b0d6a85ba30cb3f947a81b.tar.gz
tk-e450bb2502ab019788b0d6a85ba30cb3f947a81b.tar.bz2
Fix [5ee8af61e5ef8e233158a43459624f4ecf58a6fe|5ee8af61e5] on Unix: Window embedding can not work on 64-bit Unix and Windows
Diffstat (limited to 'unix/tkUnixEmbed.c')
-rw-r--r--unix/tkUnixEmbed.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 7f3f94b..b170ad0 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -101,7 +101,7 @@ TkpUseWindow(
{
TkWindow *winPtr = (TkWindow *) tkwin;
TkWindow *usePtr;
- int id, anyError;
+ int anyError;
Window parent;
Tk_ErrorHandler handler;
Container *containerPtr;
@@ -115,10 +115,9 @@ TkpUseWindow(
Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL);
return TCL_ERROR;
}
- if (Tcl_GetInt(interp, string, &id) != TCL_OK) {
+ if (TkpScanWindowId(interp, string, &parent) != TCL_OK) {
return TCL_ERROR;
}
- parent = (Window) id;
usePtr = (TkWindow *) Tk_IdToWindow(winPtr->display, parent);
if (usePtr != NULL && !(usePtr->flags & TK_CONTAINER)) {