Mercurial > hg > xemacs-beta

comparison lwlib/lwlib-colors.h @ 4916:a6c778975d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split USE_XFT into HAVE_XFT/USE_XFT -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * configure: * configure.ac (TAB): USE_XFT* -> HAVE_XFT*. lwlib/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * lwlib-colors.c: * lwlib-colors.h: * lwlib-fonts.c: * lwlib-fonts.h: * xlwmenu.c: * xlwmenu.c (xlwMenuResources): * xlwmenu.c (x_xft_text_width): * xlwmenu.c (label_button_draw): * xlwmenu.c (push_button_size): * xlwmenu.c (push_button_draw): * xlwmenu.c (make_drawing_gcs): * xlwmenu.c (extract_font_extents): * xlwmenu.c (default_font_of_font_list): * xlwmenu.c (XlwMenuInitialize): * xlwmenu.c (XlwMenuDestroy): * xlwmenu.c (XlwMenuSetValues): * xlwmenuP.h: * xlwmenuP.h (_XlwMenu_part): * xlwtabs.c: * xlwtabs.c (TabsInit): * xlwtabs.c (TabsDestroy): * xlwtabs.c (TabsSetValues): * xlwtabs.c (DrawTab): * xlwtabs.c (TabWidth): * xlwtabs.c (TabsAllocFgGC): * xlwtabs.c (TabsAllocGreyGC): * xlwtabsP.h: USE_XFT* -> HAVE_XFT*. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * Makefile.in.in: * compiler.h: * config.h.in: * console-x-impl.h: * console-x-impl.h (struct x_frame): * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P): * console-x.h: * console-xlike-inc.h: * emacs.c (main_1): * faces.c (complex_vars_of_faces): * font-mgr.h: * frame-x.c (x_delete_frame): * frame-x.c (x_update_frame_external_traits): * glyphs-x.c (update_widget_face): * inline.c: * objects-x-impl.h: * objects-x-impl.h (struct x_color_instance_data): * objects-x-impl.h (struct x_font_instance_data): * objects-x.c: * objects-x.c (x_initialize_color_instance): * objects-x.c (x_initialize_font_instance): * objects-x.c (x_print_font_instance): * objects-x.c (x_finalize_font_instance): * objects-x.c (x_font_instance_truename): * objects-x.c (vars_of_objects_x): * objects-x.h: USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and redisplay-xlike-inc.c, continue to use USE_XFT, and define it appropriately in console-xlike-inc.h when both HAVE_XFT and THIS_IS_X -- even if HAVE_XFT, we don't want to enable XFT code when included in a *-gtk.c file.
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 22:00:29 -0600 (2010-02-02)
parents ad2f4ae9895b
children 8b2f75cecb89
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
37 XColor *color_def); 37 XColor *color_def);
38 /* haired-up version from ../src/objects-x.c */ 38 /* haired-up version from ../src/objects-x.c */
39 int x_allocate_nearest_color (Display *display, Colormap screen_colormap, 39 int x_allocate_nearest_color (Display *display, Colormap screen_colormap,
40 Visual *visual, XColor *color_def); 40 Visual *visual, XColor *color_def);
41 41
42 #ifdef USE_XFT 42 #ifdef HAVE_XFT
43 #define _XFT_NO_COMPAT_ 43 #define _XFT_NO_COMPAT_
44 /* shut up GCC */ 44 /* shut up GCC */
45 #define face_index face_index_arg 45 #define face_index face_index_arg
46 #define glyph_index glyph_index_arg 46 #define glyph_index glyph_index_arg
47 #include <X11/Xft/Xft.h> 47 #include <X11/Xft/Xft.h>
52 #error Xft versions < 2 not supported 52 #error Xft versions < 2 not supported
53 #endif 53 #endif
54 54
55 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, 55 XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual,
56 int c, int dim); 56 int c, int dim);
57 #endif /* USE_XFT */ 57 #endif /* HAVE_XFT */
58 58
59 #endif /* INCLUDED_lwlib_colors_h_ */ 59 #endif /* INCLUDED_lwlib_colors_h_ */