Remove TEXTCOLOR build option
This commit is contained in:
@@ -165,10 +165,8 @@ struct window_procs X11_procs = {
|
||||
* Local functions.
|
||||
*/
|
||||
static winid find_free_window(void);
|
||||
#ifdef TEXTCOLOR
|
||||
static void nhFreePixel(XtAppContext, XrmValuePtr, XtPointer, XrmValuePtr,
|
||||
Cardinal *);
|
||||
#endif
|
||||
static boolean new_resource_macro(String, unsigned);
|
||||
static void load_default_resources(void);
|
||||
static void release_default_resources(void);
|
||||
@@ -708,7 +706,6 @@ load_boldfont(struct xwindow *wp, Widget w)
|
||||
wp->boldfs = XLoadQueryFont(dpy, fontname);
|
||||
}
|
||||
|
||||
#ifdef TEXTCOLOR
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
nhFreePixel(
|
||||
@@ -736,7 +733,6 @@ nhFreePixel(
|
||||
(unsigned long *) toVal->addr, 1, (unsigned long) 0);
|
||||
}
|
||||
}
|
||||
#endif /*TEXTCOLOR*/
|
||||
|
||||
/* [ALI] Utility function to ask Xaw for font height, since the previous
|
||||
* assumption of ascent + descent is not always valid.
|
||||
@@ -1622,13 +1618,11 @@ X11_init_nhwindows(int *argcp, char **argv)
|
||||
|
||||
old_error_handler = XSetErrorHandler(panic_on_error);
|
||||
|
||||
#ifdef TEXTCOLOR
|
||||
/* add new color converter to deal with overused colormaps */
|
||||
XtSetTypeConverter(XtRString, XtRPixel, nhCvtStringToPixel,
|
||||
(XtConvertArgList) nhcolorConvertArgs,
|
||||
XtNumber(nhcolorConvertArgs), XtCacheByDisplay,
|
||||
nhFreePixel);
|
||||
#endif /* TEXTCOLOR */
|
||||
|
||||
/* Register the actions mentioned in "actions". */
|
||||
XtAppAddActions(app_context, actions, XtNumber(actions));
|
||||
|
||||
Reference in New Issue
Block a user