Close bug#3992.

[gnu-emacs] / lwlib / xlwmenuP.h

diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index 695535e104952fb7ab342d163a3101c7cdc0aa3b..e98d657bfa03340fb337c4b895c8840787a5a0a6 100644 (file)
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,11 +1,13 @@
 /* Internals of a lightweight menubar widget.
 /* Internals of a lightweight menubar widget.

-   Copyright (C) 1999, 2000, 2002, 2004, 2005  Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  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
 
 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,


@@ -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
 
 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
 
 #ifndef _XlwMenuP_h
 #define _XlwMenuP_h


@@ -63,6 +65,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;
 


@@ -75,6 +78,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;