Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/lwlib/xlwmenuP.h Wed Feb 03 09:04:35 2010 +0000 +++ b/lwlib/xlwmenuP.h Wed Feb 03 09:06:58 2010 +0000 @@ -4,7 +4,7 @@ #include "xlwmenu.h" #include <X11/CoreP.h> -#ifdef USE_XFT_MENUBARS +#ifdef HAVE_XFT_MENUBARS #include <X11/Xft/Xft.h> #endif @@ -27,13 +27,13 @@ { /* slots set by the resources */ -#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS) +#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS) XmFontList font_list; XmFontList font_list_2; XmFontList fallback_font_list; #else XFontStruct * font; -#ifdef USE_XFT_MENUBARS +#ifdef HAVE_XFT_MENUBARS String fcFontName; String xftFontName; XftFont *renderFont; @@ -57,7 +57,7 @@ Pixel top_shadow_color; Pixel bottom_shadow_color; Pixel select_color; -#ifdef USE_XFT_MENUBARS +#ifdef HAVE_XFT_MENUBARS #endif Pixmap top_shadow_pixmap; Pixmap bottom_shadow_pixmap;