summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2000-11-28 11:16:04 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2000-11-28 11:16:04 (GMT)
commitb5702fc7b79150b86cccbae5cb5d1f69d0ca505e (patch)
tree7a69bbd3f26c269aeedb413f8666bcf91b99012c
parent30949cbba8e868da7e1fa1e4200be6385bd07797 (diff)
downloadtk-b5702fc7b79150b86cccbae5cb5d1f69d0ca505e.zip
tk-b5702fc7b79150b86cccbae5cb5d1f69d0ca505e.tar.gz
tk-b5702fc7b79150b86cccbae5cb5d1f69d0ca505e.tar.bz2
Backed out previous change (except for test for bug.)
-rw-r--r--ChangeLog11
-rw-r--r--doc/image.n11
-rw-r--r--generic/tkImage.c14
3 files changed, 14 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 3eaeb60..a478471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2000-11-28 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * doc/image.n:
+ * generic/tkImage.c (Tk_ImageObjCmd): Backed out previous change.
+ Bug #120819 is back again in force. Left the test in there
+ though.
+
2000-11-23 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* doc/image.n:
* tests/image.test (image-1.10):
* generic/tkImage.c (Tk_ImageObjCmd): Prohibited image names that
- start with "." since they can cause some really obscure crashes.
- Fixes Bug #120819. [POTENTIAL INCOMPATABILITY]
+ start with "." since they can cause some really obscure
+ crashes. Fixes Bug #120819.
2000-11-21 Eric Melski <ericm@ajubasolutions.com>
diff --git a/doc/image.n b/doc/image.n
index dcd5034..930dca9 100644
--- a/doc/image.n
+++ b/doc/image.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: image.n,v 1.4 2000/11/23 13:50:10 dkf Exp $
+'\" RCS: @(#) $Id: image.n,v 1.5 2000/11/28 11:16:04 dkf Exp $
'\"
.so man.macros
.TH image n 4.0 Tk "Tk Built-In Commands"
@@ -27,12 +27,9 @@ It can take several different forms, depending on the
Creates a new image and returns its name.
\fItype\fR specifies the type of the image, which must be one of
the types currently defined (e.g., \fBbitmap\fR).
-\fIname\fR specifies the name for the image
-.VS 8.4
-(which may not start with a period "." character);
-.VE 8.4
-if it is omitted then Tk picks a name of the form \fBimage\fIx\fR,
-where \fIx\fR is an integer.
+\fIname\fR specifies the name for the image; if it is omitted then
+Tk picks a name of the form \fBimage\fIx\fR, where \fIx\fR is
+an integer.
There may be any number of \fIoption\fR\-\fIvalue\fR pairs,
which provide configuration options for the new image.
The legal set of options is defined separately for each image
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 2ebb5de..7952108 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.8 2000/11/23 13:50:11 dkf Exp $
+ * RCS: @(#) $Id: tkImage.c,v 1.9 2000/11/28 11:16:04 dkf Exp $
*/
#include "tkInt.h"
@@ -232,18 +232,6 @@ Tk_ImageObjCmd(clientData, interp, objc, objv)
sprintf(idString, "image%d", dispPtr->imageId);
name = idString;
firstOption = 3;
- } else if (arg[0] == '.') {
- /*
- * It is a really bad idea to create an image with the
- * same name as the root window, and who knows what
- * will happen if any other (potential) window name is
- * used. So it's prohibited for safety, so stopping
- * bug #120819
- */
- Tcl_AppendResult(interp, "image names cannot start with "
- "period symbols: \"", arg, "\" is illegal",
- (char *)NULL);
- return TCL_ERROR;
} else {
name = arg;
firstOption = 4;