From 86d9383e5ac170ca8a034085bb778f6fd96b7755 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 9 Nov 2015 15:43:08 +0000
Subject: Fix [5ee8af61e5ef8e233158a43459624f4ecf58a6fe|5ee8af61e5] on Unix:
 Window embedding can not work on 64-bit Unix and Windows

---
 unix/tkUnixEmbed.c |  5 ++---
 unix/tkUnixXId.c   | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 5b5f486..119bc67 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -100,7 +100,7 @@ TkpUseWindow(
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
     TkWindow *usePtr;
-    int id, anyError;
+    int anyError;
     Window parent;
     Tk_ErrorHandler handler;
     Container *containerPtr;
@@ -113,10 +113,9 @@ TkpUseWindow(
 		"can't modify container after widget is created", 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) {
diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c
index ca2eb33..444be30 100644
--- a/unix/tkUnixXId.c
+++ b/unix/tkUnixXId.c
@@ -586,13 +586,23 @@ TkpScanWindowId(
     CONST char *string,
     Window *idPtr)
 {
-    int value;
+    int code;
+    Tcl_Obj obj;
 
-    if (Tcl_GetInt(interp, string, &value) != TCL_OK) {
-	return TCL_ERROR;
+    obj.refCount = 1;
+    obj.bytes = (char *) string;	/* DANGER?! */
+    obj.length = strlen(string);
+    obj.typePtr = NULL;
+
+    code = Tcl_GetLongFromObj(interp, &obj, (long *)idPtr);
+
+    if (obj.refCount > 1) {
+	Tcl_Panic("invalid sharing of Tcl_Obj on C stack");
+    }
+    if (obj.typePtr && obj.typePtr->freeIntRepProc) {
+	obj.typePtr->freeIntRepProc(&obj);
     }
-    *idPtr = (Window) value;
-    return TCL_OK;
+    return code;
 }
 
 /*
-- 
cgit v0.12