Synchronised line endinge with release branch

1 files changed, 89 insertions, 89 deletions

diff --git a/libXaw/include/X11/Xaw/MenuButton.h b/libXaw/include/X11/Xaw/MenuButton.h
index 62f7d0cd4..2df6191d3 100644
--- a/libXaw/include/X11/Xaw/MenuButton.h
+++ b/libXaw/include/X11/Xaw/MenuButton.h
@@ -1,89 +1,89 @@
-/*

- *

-Copyright 1989, 1994, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

- */

-

-/***********************************************************************

- *

- * MenuButton Widget

- *

- ***********************************************************************/

-

-/*

- * MenuButton.h - Public Header file for MenuButton widget.

- *

- * This is the public header file for the Athena MenuButton widget.

- * It is intended to provide an easy method of activating pulldown menus.

- *

- * Date:    May 2, 1989

- *

- * By:      Chris D. Peterson

- *          MIT X Consortium 

- *          kit@expo.lcs.mit.edu

- */

-

-#ifndef _XawMenuButton_h

-#define _XawMenuButton_h

-

-#include <X11/Xaw/Command.h>

-

-/* Resources:

-

- Name		     Class		RepType		Default Value

- ----		     -----		-------		-------------

- background	     Background		Pixel		XtDefaultBackground

- bitmap		     Pixmap		Pixmap		None

- border		     BorderColor	Pixel		XtDefaultForeground

- borderWidth	     BorderWidth	Dimension	1

- callback	     Callback		Pointer		NULL

- cursor		     Cursor		Cursor		None

- destroyCallback     Callback		Pointer		NULL

- displayList	     DisplayList	XawDisplayList*	NULL

- font		     Font		XFontStruct*	XtDefaultFont

- foreground	     Foreground		Pixel		XtDefaultForeground

- height		     Height		Dimension	text height

- highlightThickness  Thickness		Dimension	2

- insensitiveBorder   Insensitive	Pixmap		Gray

- internalHeight	     Height		Dimension	2

- internalWidth	     Width		Dimension	4

- justify	     Justify		XtJustify	XtJustifyCenter

- label		     Label		String		NULL

- mappedWhenManaged   MappedWhenManaged	Boolean		True

- menuName            MenuName           String          "menu"

- resize		     Resize		Boolean		True

- sensitive	     Sensitive		Boolean		True

- width		     Width		Dimension	text width

- x		     Position		Position	0

- y		     Position		Position	0

-

-*/

-

-#define XtNmenuName "menuName"

-#define XtCMenuName "MenuName"

-

-extern WidgetClass     menuButtonWidgetClass;

-

-typedef struct _MenuButtonClassRec   *MenuButtonWidgetClass;

-typedef struct _MenuButtonRec        *MenuButtonWidget;

-

-#endif /* _XawMenuButton_h */

+/*
+ *
+Copyright 1989, 1994, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+ */
+
+/***********************************************************************
+ *
+ * MenuButton Widget
+ *
+ ***********************************************************************/
+
+/*
+ * MenuButton.h - Public Header file for MenuButton widget.
+ *
+ * This is the public header file for the Athena MenuButton widget.
+ * It is intended to provide an easy method of activating pulldown menus.
+ *
+ * Date:    May 2, 1989
+ *
+ * By:      Chris D. Peterson
+ *          MIT X Consortium 
+ *          kit@expo.lcs.mit.edu
+ */
+
+#ifndef _XawMenuButton_h
+#define _XawMenuButton_h
+
+#include <X11/Xaw/Command.h>
+
+/* Resources:
+
+ Name		     Class		RepType		Default Value
+ ----		     -----		-------		-------------
+ background	     Background		Pixel		XtDefaultBackground
+ bitmap		     Pixmap		Pixmap		None
+ border		     BorderColor	Pixel		XtDefaultForeground
+ borderWidth	     BorderWidth	Dimension	1
+ callback	     Callback		Pointer		NULL
+ cursor		     Cursor		Cursor		None
+ destroyCallback     Callback		Pointer		NULL
+ displayList	     DisplayList	XawDisplayList*	NULL
+ font		     Font		XFontStruct*	XtDefaultFont
+ foreground	     Foreground		Pixel		XtDefaultForeground
+ height		     Height		Dimension	text height
+ highlightThickness  Thickness		Dimension	2
+ insensitiveBorder   Insensitive	Pixmap		Gray
+ internalHeight	     Height		Dimension	2
+ internalWidth	     Width		Dimension	4
+ justify	     Justify		XtJustify	XtJustifyCenter
+ label		     Label		String		NULL
+ mappedWhenManaged   MappedWhenManaged	Boolean		True
+ menuName            MenuName           String          "menu"
+ resize		     Resize		Boolean		True
+ sensitive	     Sensitive		Boolean		True
+ width		     Width		Dimension	text width
+ x		     Position		Position	0
+ y		     Position		Position	0
+
+*/
+
+#define XtNmenuName "menuName"
+#define XtCMenuName "MenuName"
+
+extern WidgetClass     menuButtonWidgetClass;
+
+typedef struct _MenuButtonClassRec   *MenuButtonWidgetClass;
+typedef struct _MenuButtonRec        *MenuButtonWidget;
+
+#endif /* _XawMenuButton_h */