From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 1 Apr 2005 18:42:33 +0000 (+0000)
Subject: * xlwmenuP.h (_XlwMenu_part): Add fontSet resource.
X-Git-Tag: ttn-vms-21-2-B4~1295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37484540505b15f84f3eb33726df96450a1cc500;p=emacs.git

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

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 12cc1790d9d..ac908d34b74 100644
--- 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;