summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-09-17 23:45:05 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-09-17 23:45:05 (GMT)
commitb789bd9bde8fcc02d873ec79094b914aa2627fbc (patch)
tree8c012bdb25f7fdb644aaa9ff6419a25fb5ed77e4 /generic
parent0ddd7518115e5c1fd63e8b56a674493a4d89a065 (diff)
downloadtk-b789bd9bde8fcc02d873ec79094b914aa2627fbc.zip
tk-b789bd9bde8fcc02d873ec79094b914aa2627fbc.tar.gz
tk-b789bd9bde8fcc02d873ec79094b914aa2627fbc.tar.bz2
* generic/tkImage.c: Stopped [image create] from generating an
* tests/image.test: image command name that would overwrite an existing command name. Thanks to Michael Schlenker. [Bug 808039].
Diffstat (limited to 'generic')
-rw-r--r--generic/tkImage.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 78e2a56..d813c96 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.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: tkImage.c,v 1.19.2.1 2003/07/07 09:43:01 dkf Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.19.2.2 2003/09/17 23:45:05 dgp Exp $
*/
#include "tkInt.h"
@@ -233,9 +233,12 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
*/
if ((objc == 3) || (*(arg = Tcl_GetString(objv[3])) == '-')) {
- dispPtr->imageId++;
- sprintf(idString, "image%d", dispPtr->imageId);
- name = idString;
+ Tcl_CmdInfo dummy;
+ do {
+ dispPtr->imageId++;
+ sprintf(idString, "image%d", dispPtr->imageId);
+ name = idString;
+ } while (Tcl_GetCommandInfo(interp, name, &dummy) != 0);
firstOption = 3;
} else {
TkWindow *topWin;