[Emacs-diffs] Changes to emacs/lwlib/xlwmenuP.h

[Jan Djärv]

Index: emacs/lwlib/xlwmenuP.h
diff -c emacs/lwlib/xlwmenuP.h:1.11 emacs/lwlib/xlwmenuP.h:1.12
*** emacs/lwlib/xlwmenuP.h:1.11 Tue Mar 22 21:41:27 2005
--- emacs/lwlib/xlwmenuP.h      Fri Apr  1 18:42:33 2005
***************
*** 24,32 ****
  #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
  {
--- 24,29 ----
***************
*** 47,57 ****
  {
    /* slots set by the resources */
  #ifdef HAVE_X_I18N
!   XFontSet    font;
    XFontSetExtents *font_extents;
- #else
-   XFontStruct*        font;
  #endif
    Pixel               foreground;
    Pixel               disabled_foreground;
    Pixel               button_foreground;
--- 44,53 ----
  {
    /* slots set by the resources */
  #ifdef HAVE_X_I18N
!   XFontSet    fontSet;
    XFontSetExtents *font_extents;
  #endif
+   XFontStruct*        font;
    Pixel               foreground;
    Pixel               disabled_foreground;
    Pixel               button_foreground;