Mercurial > hg > xemacs-beta
comparison lwlib/xlwmenuP.h @ 4920:a96517f26e3a
Merge.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 03 Feb 2010 09:06:58 +0000 |
parents | a6c778975d7d |
children | ade4c7e2c6cb |
comparison
equal
deleted
inserted
replaced
4919:9c6ea1581159 | 4920:a96517f26e3a |
---|---|
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; |