* xlwmenuP.h (_XlwMenu_part): Add fontSet resource.

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 12cc1790d9dcb85de0c23c8a6a300ab117ca070c..ac908d34b7492eb0f0bb1853a90b07df6e6ad415 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -24,9 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #include "xlwmenu.h"
 #include <X11/CoreP.h>
 
-/* FIXME: HAVE_X_I18N does not work yet. */
-#undef HAVE_X_I18N
-
 /* Elements in the stack arrays. */
 typedef struct _window_state
 {
@@ -47,11 +44,10 @@ typedef struct _XlwMenu_part
 {
   /* slots set by the resources */
 #ifdef HAVE_X_I18N
-  XFontSet     font;
+  XFontSet     fontSet;
   XFontSetExtents *font_extents;
-#else
-  XFontStruct* font;
 #endif
+  XFontStruct* font;
   Pixel                foreground;
   Pixel                disabled_foreground;
   Pixel                button_foreground;