Merge 9.0core-tip-626

1 files changed, 15 insertions, 15 deletions

diff --git a/generic/tkCanvas.h b/generic/tkCanvas.h
index 4adde33..4542ec1 100644
--- a/generic/tkCanvas.h
+++ b/generic/tkCanvas.h
@@ -60,11 +60,11 @@ typedef struct TkCanvas {
      * Information used when displaying widget:
      */
 
-    int borderWidth;		/* Width of 3-D border around window. */
+    Tcl_Obj *borderWidthObj;	/* Width of 3-D border around window. */
     Tk_3DBorder bgBorder;	/* Used for canvas background. */
     int relief;			/* Indicates whether window as a whole is
 				 * raised, sunken, or flat. */
-    int highlightWidth;		/* Width in pixels of highlight to draw around
+    Tcl_Obj *highlightWidthObj;	/* Width in pixels of highlight to draw around
 				 * widget when it has the focus. <= 0 means
 				 * don't draw a highlight. */
     XColor *highlightBgColorPtr;
@@ -78,7 +78,7 @@ typedef struct TkCanvas {
 				 * borders. */
     GC pixmapGC;		/* Used to copy bits from a pixmap to the
 				 * screen and also to clear the pixmap. */
-    int width, height;		/* Dimensions to request for canvas window,
+    Tcl_Obj *widthObj, *heightObj;		/* Dimensions to request for canvas window,
 				 * specified in pixels. */
     int redrawX1, redrawY1;	/* Upper left corner of area to redraw, in
 				 * pixel coordinates. Border pixels are
@@ -155,25 +155,25 @@ typedef struct TkCanvas {
      * Information used for managing scrollbars:
      */
 
-    char *xScrollCmd;		/* Command prefix for communicating with
+    Tcl_Obj *xScrollCmdObj;		/* Command prefix for communicating with
 				 * horizontal scrollbar. NULL means no
-				 * horizontal scrollbar. Malloc'ed. */
-    char *yScrollCmd;		/* Command prefix for communicating with
+				 * horizontal scrollbar. */
+    Tcl_Obj *yScrollCmdObj;		/* Command prefix for communicating with
 				 * vertical scrollbar. NULL means no vertical
-				 * scrollbar. Malloc'ed. */
+				 * scrollbar. */
     int scrollX1, scrollY1, scrollX2, scrollY2;
 				/* These four coordinates define the region
 				 * that is the 100% area for scrolling (i.e.
 				 * these numbers determine the size and
 				 * location of the sliders on scrollbars).
 				 * Units are pixels in canvas coords. */
-    char *regionString;		/* The option string from which scrollX1 etc.
-				 * are derived. Malloc'ed. */
-    int xScrollIncrement;	/* If >0, defines a grid for horizontal
+    Tcl_Obj *regionObj;		/* The option string from which scrollX1 etc.
+				 * are derived. */
+    Tcl_Obj *xScrollIncrementObj;	/* If >0, defines a grid for horizontal
 				 * scrolling. This is the size of the "unit",
 				 * and the left edge of the screen will always
 				 * lie on an even unit boundary. */
-    int yScrollIncrement;	/* If >0, defines a grid for horizontal
+    Tcl_Obj *yScrollIncrementObj;	/* If >0, defines a grid for horizontal
 				 * scrolling. This is the size of the "unit",
 				 * and the left edge of the screen will always
 				 * lie on an even unit boundary. */
@@ -207,9 +207,9 @@ typedef struct TkCanvas {
      */
 
     Tk_Cursor cursor;		/* Current cursor for window, or NULL. */
-    char *takeFocus;		/* Value of -takefocus option; not used in the
+    Tcl_Obj *takeFocusObj;	/* Value of -takefocus option; not used in the
 				 * C code, but used by keyboard traversal
-				 * scripts. Malloc'ed, but may be NULL. */
+				 * scripts. May be NULL. */
     double pixelsPerMM;		/* Scale factor between MM and pixels; used
 				 * when converting coordinates. */
     int flags;			/* Various flags; see below for
@@ -241,7 +241,7 @@ typedef struct TkCanvas {
  *
  * REDRAW_PENDING -		1 means a DoWhenIdle handler has already been
  *				created to redraw some or all of the canvas.
- * REDRAW_BORDERS - 		1 means that the borders need to be redrawn
+ * REDRAW_BORDERS -		1 means that the borders need to be redrawn
  *				during the next redisplay operation.
  * REPICK_NEEDED -		1 means DisplayCanvas should pick a new
  *				current item before redrawing the canvas.
@@ -292,7 +292,7 @@ typedef struct TkCanvas {
 
 MODULE_SCOPE int	TkCanvPostscriptObjCmd(TkCanvas *canvasPtr,
 			    Tcl_Interp *interp, Tcl_Size argc, Tcl_Obj *const objv[]);
-MODULE_SCOPE int 	TkCanvTranslatePath(TkCanvas *canvPtr,
+MODULE_SCOPE int	TkCanvTranslatePath(TkCanvas *canvPtr,
 			    int numVertex, double *coordPtr, int closed,
 			    XPoint *outPtr);
 /*