VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-24 07:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

XtConvertAndStore() was added in R4, so the check was incorrect; and

Browse Source 
other, unchecked code already assumes R4 or greater, so we may as well
discard the alternative here.
This commit is contained in:
William McBrine
2007-04-16 06:03:05 +00:00
parent 54485c8782
commit 0f2bec7919
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
x11/x11.c
View File

@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
RCSID("$Id: x11.c,v 1.80 2007/04/11 17:43:55 wmcbrine Exp $");
RCSID("$Id: x11.c,v 1.81 2007/04/16 06:03:05 wmcbrine Exp $");
#ifndef XPOINTER_TYPEDEFED
typedef char * XPointer;
@@ -3143,28 +3143,16 @@ int XCursesSetupX(int argc, char *argv[])
rmfrom.size = sizeof(Pixel);
rmto.size = sizeof(XColor);
#if XtSpecificationRelease > 4
rmto.addr = (XPointer)&pointerforecolor;
rmfrom.addr = (XPointer)&(xc_app_data.pointerForeColor);
XtConvertAndStore(drawing, XtRPixel, &rmfrom, XtRColor, &rmto);
#else
rmto.addr = (char *)&pointerforecolor;
rmfrom.addr = (char *)&(xc_app_data.pointerForeColor);
XtConvert(drawing, XtRPixel, &rmfrom, XtRColor, &rmto);
#endif
rmfrom.size = sizeof(Pixel);
rmto.size = sizeof(XColor);
#if XtSpecificationRelease > 4
rmfrom.addr = (XPointer)&(xc_app_data.pointerBackColor);
rmto.addr = (XPointer)&pointerbackcolor;
XtConvertAndStore(drawing, XtRPixel, &rmfrom, XtRColor, &rmto);
#else
rmfrom.addr = (char *)&(xc_app_data.pointerBackColor);
rmto.addr = (char *)&pointerbackcolor;
XtConvert(drawing, XtRPixel, &rmfrom, XtRColor, &rmto);
#endif
XRecolorCursor(XCURSESDISPLAY, xc_app_data.pointer,
&pointerforecolor, &pointerbackcolor);