From 0c788d36d7c122f62783a2a3a124a1363e59657c Mon Sep 17 00:00:00 2001
From: hobbs <hobbs@noemail.net>
Date: Tue, 29 Jun 2004 23:20:25 +0000
Subject: 	* generic/tkCmds.c (Tk_WinfoObjCmd): refetch interp result obj
 for 	'winfo id' as it can change when making the window exist.

FossilOrigin-Name: 6a3441f17ed1de82851bbc9c60338c300ac783bb
---
 ChangeLog        | 5 +++++
 generic/tkCmds.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b696af8..f2e10e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-29  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* generic/tkCmds.c (Tk_WinfoObjCmd): refetch interp result obj for
+	'winfo id' as it can change when making the window exist.
+
 2004-06-25  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tkImgPhoto.c (ImgPhotoDisplay): Early exit from image
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index e84ba83..c9d684e 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCmds.c,v 1.31 2002/09/02 19:16:23 hobbs Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.31.2.1 2004/06/29 23:20:26 hobbs Exp $
  */
 
 #include "tkPort.h"
@@ -1245,6 +1245,10 @@ Tk_WinfoObjCmd(clientData, interp, objc, objv)
 	    
 	    Tk_MakeWindowExist(tkwin);
 	    TkpPrintWindowId(buf, Tk_WindowId(tkwin));
+	    /*
+	     * interp result may have changed, refetch it
+	     */
+	    resultPtr = Tcl_GetObjResult(interp);
 	    Tcl_SetStringObj(resultPtr, buf, -1);
 	    break;
 	}
-- 
cgit v0.12