summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-06-29 23:20:25 (GMT)
committerhobbs <hobbs>2004-06-29 23:20:25 (GMT)
commitcf31035e0ca211410ed8592694335b87c80da3b5 (patch)
tree5567b685656b5bbfda34840e3ce86a5343c4b8a4
parenta1acd2611562e08bfddc055cb05256e47a07bdb0 (diff)
downloadtk-cf31035e0ca211410ed8592694335b87c80da3b5.zip
tk-cf31035e0ca211410ed8592694335b87c80da3b5.tar.gz
tk-cf31035e0ca211410ed8592694335b87c80da3b5.tar.bz2
* generic/tkCmds.c (Tk_WinfoObjCmd): refetch interp result obj for
'winfo id' as it can change when making the window exist.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkCmds.c6
2 files changed, 10 insertions, 1 deletions
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;
}