diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-10 23:55:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-10 23:55:24 (GMT) |
| commit | c910863e19f9c9cc3db56924634315a37ecfe2bb (patch) | |
| tree | 50bfed10a7859a141c470f598ee83cd31ca8ebfd /unix | |
| parent | d0aa23eb9005cbc9b4e706ab70b5082be80bad35 (diff) | |
| download | tk-c910863e19f9c9cc3db56924634315a37ecfe2bb.zip tk-c910863e19f9c9cc3db56924634315a37ecfe2bb.tar.gz tk-c910863e19f9c9cc3db56924634315a37ecfe2bb.tar.bz2 | |
proposed fix for bug-3486474
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixColor.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixCursor.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c index d001be5..aebbbca 100644 --- a/unix/tkUnixColor.c +++ b/unix/tkUnixColor.c @@ -168,7 +168,7 @@ TkpGetColor(tkwin, name) FindClosestColor(tkwin, &screen, &color); } } else { - if (XParseColor(display, colormap, buf, &color) == 0) { + if (TkParseColor(display, colormap, buf, &color) == 0) { return (TkColor *) NULL; } if (XAllocColor(display, colormap, &color) != 0) { diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 70e8b93..a4ee0cb 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -194,7 +194,7 @@ TkGetCursorByName(interp, tkwin, string) fg.red = fg.green = fg.blue = 0; bg.red = bg.green = bg.blue = 65535; } else { - if (XParseColor(display, Tk_Colormap(tkwin), argv[1], + if (TkParseColor(display, Tk_Colormap(tkwin), argv[1], &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[1], "\"", (char *) NULL); @@ -204,7 +204,7 @@ TkGetCursorByName(interp, tkwin, string) bg.red = bg.green = bg.blue = 0; maskIndex = namePtr->shape; } else { - if (XParseColor(display, Tk_Colormap(tkwin), argv[2], + if (TkParseColor(display, Tk_Colormap(tkwin), argv[2], &bg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[2], "\"", (char *) NULL); @@ -262,7 +262,7 @@ TkGetCursorByName(interp, tkwin, string) goto cleanup; } if (argc == 2) { - if (XParseColor(display, Tk_Colormap(tkwin), argv[1], + if (TkParseColor(display, Tk_Colormap(tkwin), argv[1], &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[1], "\"", (char *) NULL); @@ -285,13 +285,13 @@ TkGetCursorByName(interp, tkwin, string) TCL_STATIC); goto cleanup; } - if (XParseColor(display, Tk_Colormap(tkwin), argv[2], + if (TkParseColor(display, Tk_Colormap(tkwin), argv[2], &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[2], "\"", (char *) NULL); goto cleanup; } - if (XParseColor(display, Tk_Colormap(tkwin), argv[3], + if (TkParseColor(display, Tk_Colormap(tkwin), argv[3], &bg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[3], "\"", (char *) NULL); |