Merge 9.0core-tip-626

1 files changed, 6 insertions, 6 deletions

diff --git a/generic/tkCursor.c b/generic/tkCursor.c
index 9785470..f2d3af0 100644
--- a/generic/tkCursor.c
+++ b/generic/tkCursor.c
@@ -65,7 +65,7 @@ const TkObjType tkCursorObjType = {
     DupCursorObjProc,		/* dupIntRepProc */
     NULL,			/* updateStringProc */
     NULL,			/* setFromAnyProc */
-    TCL_OBJTYPE_V0},
+    TCL_OBJTYPE_V1(TkLengthOne)},
     0
 };
 
@@ -190,7 +190,7 @@ Tk_Cursor
 Tk_GetCursor(
     Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
     Tk_Window tkwin,		/* Window in which cursor will be used. */
-    Tk_Uid string)		/* Description of cursor. See manual entry for
+    const char *string)		/* Description of cursor. See manual entry for
 				 * details on legal syntax. */
 {
     TkCursor *cursorPtr = TkcGetCursor(interp, tkwin, string);
@@ -321,8 +321,8 @@ Tk_GetCursorFromData(
     const char *mask,		/* Bitmap data for cursor mask. */
     int width, int height,	/* Dimensions of cursor. */
     int xHot, int yHot,		/* Location of hot-spot in cursor. */
-    Tk_Uid fg,			/* Foreground color for cursor. */
-    Tk_Uid bg)			/* Background color for cursor. */
+    const char *fg,			/* Foreground color for cursor. */
+    const char *bg)			/* Background color for cursor. */
 {
     DataKey dataKey;
     Tcl_HashEntry *dataHashPtr;
@@ -341,8 +341,8 @@ Tk_GetCursorFromData(
     dataKey.height = height;
     dataKey.xHot = xHot;
     dataKey.yHot = yHot;
-    dataKey.fg = fg;
-    dataKey.bg = bg;
+    dataKey.fg = Tk_GetUid(fg);
+    dataKey.bg = Tk_GetUid(bg);
     dataKey.display = Tk_Display(tkwin);
     dataHashPtr = Tcl_CreateHashEntry(&dispPtr->cursorDataTable,
 	    (char *) &dataKey, &isNew);