Mercurial > hg > xemacs-beta
diff lwlib/xlwmenuP.h @ 3094:ad2f4ae9895b
[xemacs-hg @ 2005-11-26 11:45:47 by stephent]
Xft merge. <87k6ev4p8q.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Sat, 26 Nov 2005 11:46:25 +0000 |
| parents | 8de8e3f6228a |
| children | 6aa26bef0527 |
line wrap: on
line diff
--- a/lwlib/xlwmenuP.h Fri Nov 25 22:51:38 2005 +0000 +++ b/lwlib/xlwmenuP.h Sat Nov 26 11:46:25 2005 +0000 @@ -4,6 +4,11 @@ #include "xlwmenu.h" #include <X11/CoreP.h> +#ifdef USE_XFT_MENUBARS +#include <X11/Xft/Xft.h> +#endif + + /* Elements in the stack arrays. */ typedef struct _window_state { @@ -22,12 +27,17 @@ { /* slots set by the resources */ -#ifdef NEED_MOTIF +#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS) XmFontList font_list; XmFontList font_list_2; XmFontList fallback_font_list; #else XFontStruct * font; +#ifdef USE_XFT_MENUBARS + /* #### Fix naming convention here */ + String renderFontSpec; + XftFont *renderFont; +#endif # ifdef USE_XFONTSET XFontSet font_set; # endif @@ -47,6 +57,8 @@ Pixel top_shadow_color; Pixel bottom_shadow_color; Pixel select_color; +#ifdef USE_XFT_MENUBARS +#endif Pixmap top_shadow_pixmap; Pixmap bottom_shadow_pixmap; Cursor cursor_shape;