Mercurial > hg > xemacs-beta

comparison src/console-xlike-inc.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
parents b3ce27ca7647
children fce43cb76a1c
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
90 # endif 90 # endif
91 # ifdef NEED_OBJECTS_IMPL_H 91 # ifdef NEED_OBJECTS_IMPL_H
92 # include "objects-gtk-impl.h" 92 # include "objects-gtk-impl.h"
93 # endif 93 # endif
94 #endif /* THIS_IS_GTK */ 94 #endif /* THIS_IS_GTK */
95
96 /* Just because we have XFT support doesn't mean we should use it.
97 In particular, the xlike routines are used by both X and GTK code,
98 but XFT stuff is X-specific. HAVE_XFT will still be defined when
99 the GTK flavor is active, but we don't want to trigger the XFT code
100 in this case. We could just undefine HAVE_XFT but I'd rather make
101 it clearer that something else is going on. --ben */
102
103 #if defined (THIS_IS_X) && defined (HAVE_XFT)
104 #define USE_XFT
105 #define USE_XFT_MENUBARS
106 #define USE_XFT_TABS
107 #define USE_XFT_GAUGES
108 #endif
95 109
96 /***************************************************************************/ 110 /***************************************************************************/
97 /* Common definitions */ 111 /* Common definitions */
98 /***************************************************************************/ 112 /***************************************************************************/
99 113