(Several Buffers): Replace inforef to emacs-xtra by conditional xref's,

[gnu-emacs] / lwlib / xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 1cf8319e10180d71d35e294318dfc1a3e91e2ed4..ce170d7bfe4eb097cb6b5cf25f498e4191fe2b15 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,3 +1,24 @@
+/* Internals of a lightweight menubar widget.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004, 
+                 2005, 2006 Free Software Foundation, Inc.
+
+This file is part of the Lucid Widget Library.
+
+The Lucid Widget Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+The Lucid Widget Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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
+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.  */
+
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
 
@@ -20,11 +41,16 @@ typedef struct _window_state
 
 
 /* New fields for the XlwMenu widget instance record */
-typedef struct _XlwMenu_part 
+typedef struct _XlwMenu_part
 {
   /* 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;
   Dimension    margin;
   Dimension    horizontal_spacing;
@@ -44,8 +70,9 @@ typedef struct _XlwMenu_part
   /* 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;
-  
+
   /* State of the XlwMenu */
+  int                   top_depth;
   int                  old_depth;
   widget_value**       old_stack;
   int                  old_stack_length;
@@ -63,7 +90,7 @@ typedef struct _XlwMenu_part
   GC                   foreground_gc;
   GC                   button_gc;
   GC                   background_gc;
-  GC                   inactive_gc;
+  GC                   disabled_gc;
   GC                   inactive_button_gc;
   GC                   shadow_top_gc;
   GC                   shadow_bottom_gc;
@@ -73,20 +100,20 @@ typedef struct _XlwMenu_part
 } XlwMenuPart;
 
 /* Full instance record declaration */
-typedef struct _XlwMenuRec 
+typedef struct _XlwMenuRec
 {
   CorePart     core;
   XlwMenuPart  menu;
 } XlwMenuRec;
 
 /* New fields for the XlwMenu widget class record */
-typedef struct 
+typedef struct
 {
   int  dummy;
 } XlwMenuClassPart;
 
 /* Full class record declaration. */
-typedef struct _XlwMenuClassRec 
+typedef struct _XlwMenuClassRec
 {
   CoreClassPart                core_class;
   XlwMenuClassPart     menu_class;
@@ -96,3 +123,6 @@ typedef struct _XlwMenuClassRec
 extern XlwMenuClassRec xlwMenuClassRec;
 
 #endif /* _XlwMenuP_h */
+
+/* arch-tag: 18d7fc41-ffa0-47a3-a49f-3469900c7a25
+   (do not change this comment) */