* library/tkfbox.tcl: Moved an overlooked tkFDialog* function inscriptics_sc_2_0_fixedscriptics_sc_2_0_b5

::tk::dialog::file namespace.

* tests/unixWm.test: Added tests for memory leak conditions in
tkUnixWm.c.

* tests/canvas.test: Added test for bad configuration options on
empty and non-empty canvas.

* generic/tkCanvas.c: Removed bad code in CANV_CONFIGURE block of
CanvasWidgetCmd; this was causing non-empty canvases to improperly
handle bad configuration options [Bug: 4456].

1 files changed, 1 insertions, 13 deletions

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 268b182..176e44a 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkCanvas.c,v 1.11 2000/01/12 11:45:02 hobbs Exp $
+ * RCS: @(#) $Id: tkCanvas.c,v 1.12 2000/03/29 00:09:06 ericm Exp $
  */
 
 /* #define USE_OLD_TAG_SEARCH 1 */
@@ -876,18 +876,6 @@ CanvasWidgetCmd(clientData, interp, argc, argv)
 	} else {
 	    result = ConfigureCanvas(interp, canvasPtr, argc-2, argv+2,
 		    TK_CONFIG_ARGV_ONLY);
-	    for (itemPtr = canvasPtr->firstItemPtr;
-		itemPtr != NULL; itemPtr = itemPtr->nextPtr) {
-		if (itemPtr->state != TK_STATE_NULL) {
-		    continue;
-		}
-		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
-		result = (*itemPtr->typePtr->configProc)(interp,
-			(Tk_Canvas) canvasPtr, itemPtr, 0, (Tcl_Obj **) NULL,
-			TK_CONFIG_ARGV_ONLY);
-		EventuallyRedrawItem((Tk_Canvas) canvasPtr, itemPtr);
-		canvasPtr->flags |= REPICK_NEEDED;
-	    }
 	}
 	break;
       }