* Merged 8.1 branch into the main trunk

1 files changed, 6 insertions, 5 deletions

diff --git a/generic/tkVisual.c b/generic/tkVisual.c
index 96a2979..39b627a 100644
--- a/generic/tkVisual.c
+++ b/generic/tkVisual.c
@@ -6,12 +6,12 @@
  *	prototype implementation by Paul Mackerras.
  *
  * Copyright (c) 1994 The Regents of the University of California.
- * Copyright (c) 1994-1995 Sun Microsystems, Inc.
+ * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkVisual.c,v 1.2 1998/09/14 18:23:20 stanton Exp $
+ * RCS: @(#) $Id: tkVisual.c,v 1.3 1999/04/16 01:51:25 stanton Exp $
  */
 
 #include "tkInt.h"
@@ -74,7 +74,7 @@ struct TkColormap {
  * Results:
  *	The return value is normally a pointer to a visual.  If an
  *	error occurred in looking up the visual, NULL is returned and
- *	an error message is left in interp->result.  The depth of the
+ *	an error message is left in the interp's result.  The depth of the
  *	visual is returned to *depthPtr under normal returns.  If
  *	colormapPtr is non-NULL, then this procedure also finds a
  *	suitable colormap for use with the visual in tkwin, and it
@@ -243,7 +243,8 @@ Tk_GetVisual(interp, tkwin, string, depthPtr, colormapPtr)
     visInfoList = XGetVisualInfo(Tk_Display(tkwin), mask, &template,
 	    &numVisuals);
     if (visInfoList == NULL) {
-	interp->result = "couldn't find an appropriate visual";
+	Tcl_SetResult(interp, "couldn't find an appropriate visual",
+		TCL_STATIC);
 	return NULL;
     }
 
@@ -352,7 +353,7 @@ Tk_GetVisual(interp, tkwin, string, depthPtr, colormapPtr)
  * Results:
  *	The return value is normally the X resource identifier for the
  *	colormap.  If an error occurs, None is returned and an error
- *	message is placed in interp->result.
+ *	message is placed in the interp's result.
  *
  * Side effects:
  *	A reference count is incremented for the colormap, so