X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/76acbdc50490034f233bc78d14a7cd5717d9432e..88f43129a846b261d4144956bcce59d73e75318b:/lwlib/xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 12cc1790d9..c067dd1aaf 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,11 +1,13 @@
 /* Internals of a lightweight menubar widget.
-   Copyright (C) 1999, 2000, 2002, 2004  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  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)
+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,
@@ -15,8 +17,8 @@ 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h
@@ -24,9 +26,6 @@ Boston, MA 02111-1307, USA.  */
 #include "xlwmenu.h"
 #include <X11/CoreP.h>
 
-/* FIXME: HAVE_X_I18N does not work yet. */
-#undef HAVE_X_I18N
-
 /* Elements in the stack arrays. */
 typedef struct _window_state
 {
@@ -47,11 +46,10 @@ typedef struct _XlwMenu_part
 {
   /* slots set by the resources */
 #ifdef HAVE_X_I18N
-  XFontSet	font;
+  XFontSet	fontSet;
   XFontSetExtents *font_extents;
-#else
-  XFontStruct*	font;
 #endif
+  XFontStruct*	font;
   Pixel		foreground;
   Pixel		disabled_foreground;
   Pixel		button_foreground;
@@ -67,6 +65,7 @@ typedef struct _XlwMenu_part
   Cursor	cursor_shape;
   XtCallbackList	open;
   XtCallbackList	select, highlight;
+  XtCallbackList        enter, leave;
   widget_value*	contents;
   int		horizontal;
 
@@ -79,6 +78,7 @@ typedef struct _XlwMenu_part
   int			old_depth;
   widget_value**	old_stack;
   int			old_stack_length;
+  widget_value*         inside_entry;
 
   /* New state after the user moved */
   int			new_depth;