Merge changes from emacs-23 branch.

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

diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 949fbf7..a514e8d 100644 (file)
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,3 +1,25 @@
+/* Interface of a lightweight menubar widget.
+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
+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,
+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 _XlwMenu_h
 #define _XlwMenu_h
 
@@ -10,6 +32,8 @@
 #include "lwlib.h"
 
 /* Resource names used by the XlwMenu widget */
+#define XtNdisabledForeground "disabledForeground"
+#define XtCDisabledForeground "DisabledForeground"
 #define XtNbuttonForeground "buttonForeground"
 #define XtCButtonForeground "ButtonForeground"
 #define XtNmargin "margin"
@@ -20,6 +44,9 @@
 #define XtCMenu "Menu"
 #define XtNopen "open"
 #define XtNselect "select"
+#define XtNhighlightCallback "highlightCallback"
+#define XtNenterCallback "enterCallback"
+#define XtNleaveCallback "leaveCallback"
 #define XtNmenuBorderWidth "menuBorderWidth"
 #define XtNhorizontal "horizontal"
 #define XtCHorizontal "Horizontal"
@@ -31,6 +58,10 @@
 #define XtCResizeToPreferred "ResizeToPreferred"
 #define XtNallowResize "allowResize"
 #define XtCAllowResize "AllowResize"
+#define XtNfaceName "faceName"
+#define XtCFaceName "FaceName"
+#define XtNdefaultFace "defaultFace"
+#define XtCDefaultFace "DefaultFace"
 
 /* Motif-compatible resource names */
 #define XmNshadowThickness     "shadowThickness"
@@ -50,7 +81,10 @@ typedef struct _XlwMenuClassRec *XlwMenuWidgetClass;
 
 extern WidgetClass xlwMenuWidgetClass;
 
-void
-pop_up_menu ();
+extern int xlwmenu_window_p (Widget w, Window window);
+extern void xlwmenu_redisplay (Widget);
 
 #endif /* _XlwMenu_h */
+
+/* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07
+   (do not change this comment) */