Mercurial > hg > xemacs-beta

comparison lwlib/xlwmenuP.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 ade4c7e2c6cb
comparison
equal deleted inserted replaced
4909:87175eb65ff4 4916:a6c778975d7d
2 #define INCLUDED_xlwmenuP_h_ 2 #define INCLUDED_xlwmenuP_h_
3 3
4 #include "xlwmenu.h" 4 #include "xlwmenu.h"
5 #include <X11/CoreP.h> 5 #include <X11/CoreP.h>
6 6
7 #ifdef USE_XFT_MENUBARS 7 #ifdef HAVE_XFT_MENUBARS
8 #include <X11/Xft/Xft.h> 8 #include <X11/Xft/Xft.h>
9 #endif 9 #endif
10 10
11 11
12 /* Elements in the stack arrays. */ 12 /* Elements in the stack arrays. */
25 /* New fields for the XlwMenu widget instance record */ 25 /* New fields for the XlwMenu widget instance record */
26 typedef struct _XlwMenu_part 26 typedef struct _XlwMenu_part
27 { 27 {
28 /* slots set by the resources */ 28 /* slots set by the resources */
29 29
30 #if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS) 30 #if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
31 XmFontList font_list; 31 XmFontList font_list;
32 XmFontList font_list_2; 32 XmFontList font_list_2;
33 XmFontList fallback_font_list; 33 XmFontList fallback_font_list;
34 #else 34 #else
35 XFontStruct * font; 35 XFontStruct * font;
36 #ifdef USE_XFT_MENUBARS 36 #ifdef HAVE_XFT_MENUBARS
37 String fcFontName; 37 String fcFontName;
38 String xftFontName; 38 String xftFontName;
39 XftFont *renderFont; 39 XftFont *renderFont;
40 #endif 40 #endif
41 # ifdef USE_XFONTSET 41 # ifdef USE_XFONTSET
55 Dimension shadow_thickness; 55 Dimension shadow_thickness;
56 Dimension indicator_size; 56 Dimension indicator_size;
57 Pixel top_shadow_color; 57 Pixel top_shadow_color;
58 Pixel bottom_shadow_color; 58 Pixel bottom_shadow_color;
59 Pixel select_color; 59 Pixel select_color;
60 #ifdef USE_XFT_MENUBARS 60 #ifdef HAVE_XFT_MENUBARS
61 #endif 61 #endif
62 Pixmap top_shadow_pixmap; 62 Pixmap top_shadow_pixmap;
63 Pixmap bottom_shadow_pixmap; 63 Pixmap bottom_shadow_pixmap;
64 Cursor cursor_shape; 64 Cursor cursor_shape;
65 XtCallbackList open; 65 XtCallbackList open;