Minor adjustments of recently-changed frame functions.

[gnu-emacs] / lwlib / xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index b7ea9de54f71d347d5461ae821812b2ec2bd8e96..5decd562eedaaa1d8347db5f950761f7dd20d9f6 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
 /* Internals of a lightweight menubar widget.
 
 /* Internals of a lightweight menubar widget.
 

-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.

 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.


@@ -59,11 +59,11 @@ typedef struct _XlwMenu_part
   XFontSetExtents *font_extents;
 #endif
 #ifdef HAVE_XFT
   XFontSetExtents *font_extents;
 #endif
 #ifdef HAVE_XFT

-  String        faceName;

   int           default_face;
   XftFont*      xft_font;
   XftColor      xft_fg, xft_bg, xft_disabled_fg;
 #endif
   int           default_face;
   XftFont*      xft_font;
   XftColor      xft_fg, xft_bg, xft_disabled_fg;
 #endif

+  String       fontName;

   XFontStruct* font;
   Pixel                foreground;
   Pixel                disabled_foreground;
   XFontStruct* font;
   Pixel                foreground;
   Pixel                disabled_foreground;