Mercurial > hg > xemacs-beta
comparison src/event-Xt.c @ 365:30d2cfa1092a r21-1-12
Import from CVS: tag r21-1-12
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:00:12 +0200 |
parents | 7c94d56991e1 |
children | a4f53d9b3154 |
comparison
equal
deleted
inserted
replaced
364:63c3368d1275 | 365:30d2cfa1092a |
---|---|
2800 | 2800 |
2801 /* Originally called XAllocNamedColor() here. */ | 2801 /* Originally called XAllocNamedColor() here. */ |
2802 if ((d = get_device_from_display_1(dpy))) { | 2802 if ((d = get_device_from_display_1(dpy))) { |
2803 visual = DEVICE_X_VISUAL(d); | 2803 visual = DEVICE_X_VISUAL(d); |
2804 if (colormap != DEVICE_X_COLORMAP(d)) { | 2804 if (colormap != DEVICE_X_COLORMAP(d)) { |
2805 XtAppWarningMsg(the_app_con, "wierdColormap", "cvtStringToPixel", | 2805 XtAppWarningMsg(the_app_con, "weirdColormap", "cvtStringToPixel", |
2806 "XtToolkitWarning", | 2806 "XtToolkitWarning", |
2807 "The colormap passed to cvtStringToPixel doesn't match the one registerd to the device.\n", | 2807 "The colormap passed to cvtStringToPixel doesn't match the one registered to the device.\n", |
2808 NULL, 0); | 2808 NULL, 0); |
2809 status = XAllocNamedColor(dpy, colormap, (char*)str, &screenColor, &exactColor); | 2809 status = XAllocNamedColor(dpy, colormap, (char*)str, &screenColor, &exactColor); |
2810 } else { | 2810 } else { |
2811 status = XParseColor (dpy, colormap, (char*)str, &screenColor); | 2811 status = XParseColor (dpy, colormap, (char*)str, &screenColor); |
2812 if (status) { | 2812 if (status) { |