diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-15 20:57:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-02-15 20:57:48 (GMT) |
| commit | 3db9fce4a20b8969cd5c73671c76dd4918d048f9 (patch) | |
| tree | b69a457a0eaaa41f3bf3c89239cd80372fd4b53e /unix | |
| parent | 751529e39515a7968bd597326de78c0f9f220f44 (diff) | |
| parent | 05750b46ee02ad06be61476b42f8a1a8d8a87597 (diff) | |
| download | tk-3db9fce4a20b8969cd5c73671c76dd4918d048f9.zip tk-3db9fce4a20b8969cd5c73671c76dd4918d048f9.tar.gz tk-3db9fce4a20b8969cd5c73671c76dd4918d048f9.tar.bz2 | |
[Bug 3486474]: Inconsistent color scaling
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 e9fdf11..d3dba23 100644 --- a/unix/tkUnixColor.c +++ b/unix/tkUnixColor.c @@ -166,7 +166,7 @@ TkpGetColor( FindClosestColor(tkwin, &screen, &color); } } else { - if (XParseColor(display, colormap, buf, &color) == 0) { + if (TkParseColor(display, colormap, buf, &color) == 0) { return NULL; } if (XAllocColor(display, colormap, &color) != 0) { diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 2169d1c..1ab238e 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -274,7 +274,7 @@ TkGetCursorByName( fg.red = fg.green = fg.blue = 0; bg.red = bg.green = bg.blue = 65535; } else { - if (XParseColor(display, Tk_Colormap(tkwin), argv[1], &fg) == 0) { + if (TkParseColor(display, Tk_Colormap(tkwin), argv[1], &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[1], "\"", NULL); goto cleanup; @@ -282,7 +282,7 @@ TkGetCursorByName( if (argc == 2) { bg.red = bg.green = bg.blue = 0; maskIndex = namePtr->shape; - } else if (XParseColor(display, Tk_Colormap(tkwin), argv[2], + } else if (TkParseColor(display, Tk_Colormap(tkwin), argv[2], &bg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", argv[2], "\"", NULL); @@ -456,7 +456,7 @@ CreateCursorFromTableOrFile( bg.red = bg.green = bg.blue = 65535; } else if (argc == 2) { fgColor = argv[1]; - if (XParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) { + if (TkParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", fgColor, "\"", NULL); goto cleanup; @@ -475,12 +475,12 @@ CreateCursorFromTableOrFile( fgColor = argv[2]; bgColor = argv[3]; } - if (XParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) { + if (TkParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", fgColor, "\"", NULL); goto cleanup; } - if (XParseColor(display, Tk_Colormap(tkwin), bgColor, &bg) == 0) { + if (TkParseColor(display, Tk_Colormap(tkwin), bgColor, &bg) == 0) { Tcl_AppendResult(interp, "invalid color name \"", bgColor, "\"", NULL); goto cleanup; |