Mercurial > hg > xemacs-beta

comparison lwlib/xlwtabsP.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 382b11fa8866
children 308d34e9f07d
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
39 #include <Xm/XmP.h> 39 #include <Xm/XmP.h>
40 #include <Xm/ManagerP.h> 40 #include <Xm/ManagerP.h>
41 #endif 41 #endif
42 42
43 #include "xlwtabs.h" 43 #include "xlwtabs.h"
44 #ifdef USE_XFT_TABS 44 #ifdef HAVE_XFT_TABS
45 #include <X11/Xft/Xft.h> 45 #include <X11/Xft/Xft.h>
46 #endif 46 #endif
47 47
48 /* New fields for the Tabs widget class record */ 48 /* New fields for the Tabs widget class record */
49 typedef struct {XtPointer extension;} TabsClassPart; 49 typedef struct {XtPointer extension;} TabsClassPart;
71 71
72 /* New fields for the Tabs widget record */ 72 /* New fields for the Tabs widget record */
73 typedef struct { 73 typedef struct {
74 /* resources */ 74 /* resources */
75 XFontStruct *font ; 75 XFontStruct *font ;
76 #ifdef USE_XFT_TABS 76 #ifdef HAVE_XFT_TABS
77 XftFont *renderFont; 77 XftFont *renderFont;
78 String fcFontName; 78 String fcFontName;
79 String xftFontName; 79 String xftFontName;
80 #endif 80 #endif
81 Dimension internalHeight, internalWidth ; 81 Dimension internalHeight, internalWidth ;