summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-15 21:09:27 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-15 21:09:27 (GMT)
commit41cc9023c9d8ba470b41666d54cfe4db9bbb5020 (patch)
treec95bfcb0f17783a66f7d2613c8962ecbd1a63748 /unix
parentda13c5e294143c51bdee3d5d9f42c72b1843dc51 (diff)
parent3db9fce4a20b8969cd5c73671c76dd4918d048f9 (diff)
downloadtk-41cc9023c9d8ba470b41666d54cfe4db9bbb5020.zip
tk-41cc9023c9d8ba470b41666d54cfe4db9bbb5020.tar.gz
tk-41cc9023c9d8ba470b41666d54cfe4db9bbb5020.tar.bz2
[Bug 3486474]: Inconsistent color scaling
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixColor.c2
-rw-r--r--unix/tkUnixCursor.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index afa9d24..df754bd 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 1603ee3..bbf5206 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;