Merge from origin/emacs-25

[gnu-emacs] / lwlib / xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index b7ea9de54f71d347d5461ae821812b2ec2bd8e96..893ea0b1dccbc0721794a18531221640d64ebfc8 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-2016 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.


@@ -16,9 +16,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h


@@ -59,11 +57,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;


@@ -85,8 +83,8 @@ typedef struct _XlwMenu_part
   int          horizontal;
 
   /* True means top_shadow_color and/or bottom_shadow_color must be freed.  */
   int          horizontal;
 
   /* True means top_shadow_color and/or bottom_shadow_color must be freed.  */

-  unsigned free_top_shadow_color_p : 1;
-  unsigned free_bottom_shadow_color_p : 1;
+  bool_bf free_top_shadow_color_p : 1;
+  bool_bf free_bottom_shadow_color_p : 1;

 
   /* State of the XlwMenu */
   int                   top_depth;
 
   /* State of the XlwMenu */
   int                   top_depth;


@@ -141,4 +139,3 @@ typedef struct _XlwMenuClassRec
 extern XlwMenuClassRec xlwMenuClassRec;
 
 #endif /* _XlwMenuP_h */
 extern XlwMenuClassRec xlwMenuClassRec;
 
 #endif /* _XlwMenuP_h */

-