Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.

[bpt/emacs.git] / lwlib / xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index c44a93d..0aca2f8 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,7 +1,7 @@
 /* Internals of a lightweight menubar widget.
+
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-  Free Software Foundation, 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
-  String        faceName;
   int           default_face;
   XftFont*      xft_font;
   XftColor      xft_fg, xft_bg, xft_disabled_fg;
 #endif
+  String       fontName;
   XFontStruct* font;
   Pixel                foreground;
   Pixel                disabled_foreground;