Refill some long/short copyright headers.

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

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index ca2b7dc..b7ea9de 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,12 +1,13 @@
 /* Internals of a lightweight menubar widget.
 /* Internals of a lightweight menubar widget.

-   Copyright (C) 1999, 2000, 2002, 2003, 2004, 
-                 2005 Free Software Foundation, Inc.
+
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, 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
 
 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)
+the Free Software Foundation; either version 1, or (at your option)

 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,
 any later version.
 
 The Lucid Widget Library is distributed in the hope that it will be useful,


@@ -24,19 +25,28 @@ Boston, MA 02110-1301, USA.  */
 
 #include "xlwmenu.h"
 #include <X11/CoreP.h>
 
 #include "xlwmenu.h"
 #include <X11/CoreP.h>

+#ifdef HAVE_XFT
+#include <X11/Xft/Xft.h>
+#endif

 
 /* Elements in the stack arrays. */
 typedef struct _window_state
 {
 
 /* Elements in the stack arrays. */
 typedef struct _window_state
 {

+  Widget        w;

   Window       window;
   Window       window;

+  Pixmap        pixmap;

   Position     x;
   Position     y;
   Dimension    width;
   Dimension    height;
   Dimension    label_width;
   Position     x;
   Position     y;
   Dimension    width;
   Dimension    height;
   Dimension    label_width;

+  int           max_rest_width;

 
   /* Width of toggle buttons or radio buttons.  */
   Dimension     button_width;
 
   /* Width of toggle buttons or radio buttons.  */
   Dimension     button_width;

+#ifdef HAVE_XFT
+  XftDraw*      xft_draw;
+#endif

 } window_state;
 
 
 } window_state;
 
 


@@ -47,6 +57,12 @@ typedef struct _XlwMenu_part
 #ifdef HAVE_X_I18N
   XFontSet     fontSet;
   XFontSetExtents *font_extents;
 #ifdef HAVE_X_I18N
   XFontSet     fontSet;
   XFontSetExtents *font_extents;

+#endif
+#ifdef HAVE_XFT
+  String        faceName;
+  int           default_face;
+  XftFont*      xft_font;
+  XftColor      xft_fg, xft_bg, xft_disabled_fg;

 #endif
   XFontStruct* font;
   Pixel                foreground;
 #endif
   XFontStruct* font;
   Pixel                foreground;


@@ -64,6 +80,7 @@ typedef struct _XlwMenu_part
   Cursor       cursor_shape;
   XtCallbackList       open;
   XtCallbackList       select, highlight;
   Cursor       cursor_shape;
   XtCallbackList       open;
   XtCallbackList       select, highlight;

+  XtCallbackList        enter, leave;

   widget_value*        contents;
   int          horizontal;
 
   widget_value*        contents;
   int          horizontal;
 


@@ -76,6 +93,7 @@ typedef struct _XlwMenu_part
   int                  old_depth;
   widget_value**       old_stack;
   int                  old_stack_length;
   int                  old_depth;
   widget_value**       old_stack;
   int                  old_stack_length;

+  widget_value*         inside_entry;

 
   /* New state after the user moved */
   int                  new_depth;
 
   /* New state after the user moved */
   int                  new_depth;


@@ -124,5 +142,3 @@ extern XlwMenuClassRec xlwMenuClassRec;
 
 #endif /* _XlwMenuP_h */
 
 
 #endif /* _XlwMenuP_h */
 

-/* arch-tag: 18d7fc41-ffa0-47a3-a49f-3469900c7a25
-   (do not change this comment) */