summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCmds.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1760ae9..c84fdfc 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-26 Joe Mistachkin <joe@mistachkin.com>
* generic/tkConsole.c (ConsoleDeleteProc): Set tsdPtr->gStdoutInterp
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 39aaf06..f664b8c 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.32 2004/03/17 18:15:43 das Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.33 2004/06/29 23:21:43 hobbs Exp $
*/
#include "tkPort.h"
@@ -1241,6 +1241,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;
}