svn merge ^/branches/released .

1 files changed, 176 insertions, 180 deletions

diff --git a/libXaw/include/X11/Xaw/PanedP.h b/libXaw/include/X11/Xaw/PanedP.h
index a94b0f34d..99dd076fe 100644
--- a/libXaw/include/X11/Xaw/PanedP.h
+++ b/libXaw/include/X11/Xaw/PanedP.h
@@ -1,180 +1,176 @@
-/***********************************************************
-
-  $Xorg: PanedP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $
-
-
-Copyright 1987, 1988, 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.
-
-
-Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.7 2001/01/17 19:42:28 dawes Exp $ */
-
-/*
- * Updated and significantly modified from the Athena VPaned Widget.
- *
- * Date:    March 1, 1989
- *
- * By:      Chris D. Peterson
- *          MIT X Consortium
- *          kit@expo.lcs.mit.edu
- */
-
-#ifndef _XawPanedP_h
-#define _XawPanedP_h
-
-#include <X11/Xaw/Paned.h>
-
-/* New fields for the Paned widget class record */
-typedef struct _PanedClassPart {
-    XtPointer extension;
-} PanedClassPart;
-
-/* Full Class record declaration */
-typedef struct _PanedClassRec {
-    CoreClassPart       core_class;
-    CompositeClassPart  composite_class;
-    ConstraintClassPart constraint_class;
-    PanedClassPart      paned_class;
-} PanedClassRec;
-
-extern PanedClassRec panedClassRec;
-
-/* Paned constraint record */
-typedef struct _PanedConstraintsPart {
-    /* Resources */
-    Dimension	min;		/* Minimum height */
-    Dimension	max;		/* Maximum height */
-    Boolean	allow_resize;	/* True if child resize requests are ok */
-    Boolean	show_grip;	/* True if child will have grip below it,
-				   when it is not the bottom pane */
-    Boolean skip_adjust;	/* True if child's height should not be
-				   changed without explicit user action */
-    int		position;	/* position location in Paned (relative to
-				   other children) ** NIY ** */
-    Dimension   preferred_size;	/* The Preferred size of the pane.
-				   If this is zero then ask child for size*/
-    Boolean     resize_to_pref;	/* resize this pane to its preferred size
-				   on a resize or change managed after 
-				   realize */
-
-    /* Private state */
-    Position	delta;		/* Desired Location */
-    Position	olddelta;	/* The last value of dy */
-    Boolean     paned_adjusted_me; /* Has the vpaned adjusted this widget w/o
-				     user interaction to make things fit? */
-    Dimension	wp_size;	/* widget's preferred size */ 
-    int size;			/* the size the widget will actually get */
-    Widget	grip;		/* The grip for this child */
-} PanedConstraintsPart, *Pane;
-
-typedef struct _PanedConstraintsRec {
-    PanedConstraintsPart paned;
-} PanedConstraintsRec, *PanedConstraints;
-
-/*
- * The Pane Stack Structure
- */
-typedef struct _PaneStack {
-    struct _PaneStack *next;	/* The next element on the stack */
-    Pane pane;			/* The pane in this element on the stack */
-    int start_size;		/* The size of this element when it
-				   was pushed onto the stack */
-} PaneStack;
-
-/* New Fields for the Paned widget record */
-typedef struct {
-    /* resources */
-    Position    grip_indent;               /* Location of grips (offset	
-					      from right margin) */
-    Boolean     refiguremode;              /* Whether to refigure changes 
-					      right now */
-    XtTranslations grip_translations;      /* grip translation table */
-    Pixel	internal_bp;		/* color of internal borders */
-    Dimension	internal_bw;		/* internal border width */
-    XtOrientation orientation;		/* Orientation of paned widget */
-
-    Cursor	cursor;		           /* Cursor for paned window */
-    Cursor	grip_cursor;               /* inactive grip cursor */
-    Cursor	v_grip_cursor;             /* inactive vert grip cursor */
-    Cursor	h_grip_cursor;             /* inactive horiz grip cursor */
-    Cursor	adjust_this_cursor;        /* active grip cursor: T */
-    Cursor	v_adjust_this_cursor;      /* active vert grip cursor: T */
-    Cursor	h_adjust_this_cursor;      /* active horiz grip cursor: T */
-
-    /* vertical */
-    Cursor	adjust_upper_cursor;      /* active grip cursor: U */
-    Cursor	adjust_lower_cursor;      /* active grip cursor: D */
-
-    /* horizontal */
-    Cursor	adjust_left_cursor;        /* active grip cursor: U */
-    Cursor	adjust_right_cursor;       /* active grip cursor: D */
-
-    /* private */
-    Boolean	recursively_called;        /* for ChangeManaged */
-    Boolean	resize_children_to_pref;   /* override constrain resources
-					      and resize all children to
-					   preferred size */
-    int         start_loc;	           /* mouse origin when adjusting */
-    Widget      whichadd;                  /* Which pane to add changes to */
-    Widget      whichsub;                  /* Which pane to sub changes from */
-    GC          normgc;                    /* GC to use when drawing borders */
-    GC          invgc;                     /* GC to use when erasing borders */
-    GC		flipgc;			   /* GC to use when animating borders */
-    int		num_panes;                 /* count of managed panes */
-    PaneStack	*stack;			   /* The pane stack for this widget */
-#ifndef OLDXAW
-    XtPointer pad[4];	/* for future use and keep binary compatability */
-#endif
-} PanedPart;
-
-/*
- * Full instance record declaration
- */
-typedef struct _PanedRec {
-    CorePart	   core;
-    CompositePart  composite;
-    ConstraintPart constraint;
-    PanedPart	   paned;
-} PanedRec;
-
-#endif /* _XawPanedP_h */
+/***********************************************************

+

+Copyright 1987, 1988, 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.

+

+

+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+******************************************************************/

+

+/*

+ * Updated and significantly modified from the Athena VPaned Widget.

+ *

+ * Date:    March 1, 1989

+ *

+ * By:      Chris D. Peterson

+ *          MIT X Consortium

+ *          kit@expo.lcs.mit.edu

+ */

+

+#ifndef _XawPanedP_h

+#define _XawPanedP_h

+

+#include <X11/Xaw/Paned.h>

+

+/* New fields for the Paned widget class record */

+typedef struct _PanedClassPart {

+    XtPointer extension;

+} PanedClassPart;

+

+/* Full Class record declaration */

+typedef struct _PanedClassRec {

+    CoreClassPart       core_class;

+    CompositeClassPart  composite_class;

+    ConstraintClassPart constraint_class;

+    PanedClassPart      paned_class;

+} PanedClassRec;

+

+extern PanedClassRec panedClassRec;

+

+/* Paned constraint record */

+typedef struct _PanedConstraintsPart {

+    /* Resources */

+    Dimension	min;		/* Minimum height */

+    Dimension	max;		/* Maximum height */

+    Boolean	allow_resize;	/* True if child resize requests are ok */

+    Boolean	show_grip;	/* True if child will have grip below it,

+				   when it is not the bottom pane */

+    Boolean skip_adjust;	/* True if child's height should not be

+				   changed without explicit user action */

+    int		position;	/* position location in Paned (relative to

+				   other children) ** NIY ** */

+    Dimension   preferred_size;	/* The Preferred size of the pane.

+				   If this is zero then ask child for size*/

+    Boolean     resize_to_pref;	/* resize this pane to its preferred size

+				   on a resize or change managed after 

+				   realize */

+

+    /* Private state */

+    Position	delta;		/* Desired Location */

+    Position	olddelta;	/* The last value of dy */

+    Boolean     paned_adjusted_me; /* Has the vpaned adjusted this widget w/o

+				     user interaction to make things fit? */

+    Dimension	wp_size;	/* widget's preferred size */ 

+    int size;			/* the size the widget will actually get */

+    Widget	grip;		/* The grip for this child */

+} PanedConstraintsPart, *Pane;

+

+typedef struct _PanedConstraintsRec {

+    PanedConstraintsPart paned;

+} PanedConstraintsRec, *PanedConstraints;

+

+/*

+ * The Pane Stack Structure

+ */

+typedef struct _PaneStack {

+    struct _PaneStack *next;	/* The next element on the stack */

+    Pane pane;			/* The pane in this element on the stack */

+    int start_size;		/* The size of this element when it

+				   was pushed onto the stack */

+} PaneStack;

+

+/* New Fields for the Paned widget record */

+typedef struct {

+    /* resources */

+    Position    grip_indent;               /* Location of grips (offset	

+					      from right margin) */

+    Boolean     refiguremode;              /* Whether to refigure changes 

+					      right now */

+    XtTranslations grip_translations;      /* grip translation table */

+    Pixel	internal_bp;		/* color of internal borders */

+    Dimension	internal_bw;		/* internal border width */

+    XtOrientation orientation;		/* Orientation of paned widget */

+

+    Cursor	cursor;		           /* Cursor for paned window */

+    Cursor	grip_cursor;               /* inactive grip cursor */

+    Cursor	v_grip_cursor;             /* inactive vert grip cursor */

+    Cursor	h_grip_cursor;             /* inactive horiz grip cursor */

+    Cursor	adjust_this_cursor;        /* active grip cursor: T */

+    Cursor	v_adjust_this_cursor;      /* active vert grip cursor: T */

+    Cursor	h_adjust_this_cursor;      /* active horiz grip cursor: T */

+

+    /* vertical */

+    Cursor	adjust_upper_cursor;      /* active grip cursor: U */

+    Cursor	adjust_lower_cursor;      /* active grip cursor: D */

+

+    /* horizontal */

+    Cursor	adjust_left_cursor;        /* active grip cursor: U */

+    Cursor	adjust_right_cursor;       /* active grip cursor: D */

+

+    /* private */

+    Boolean	recursively_called;        /* for ChangeManaged */

+    Boolean	resize_children_to_pref;   /* override constrain resources

+					      and resize all children to

+					   preferred size */

+    int         start_loc;	           /* mouse origin when adjusting */

+    Widget      whichadd;                  /* Which pane to add changes to */

+    Widget      whichsub;                  /* Which pane to sub changes from */

+    GC          normgc;                    /* GC to use when drawing borders */

+    GC          invgc;                     /* GC to use when erasing borders */

+    GC		flipgc;			   /* GC to use when animating borders */

+    int		num_panes;                 /* count of managed panes */

+    PaneStack	*stack;			   /* The pane stack for this widget */

+#ifndef OLDXAW

+    XtPointer pad[4];	/* for future use and keep binary compatability */

+#endif

+} PanedPart;

+

+/*

+ * Full instance record declaration

+ */

+typedef struct _PanedRec {

+    CorePart	   core;

+    CompositePart  composite;

+    ConstraintPart constraint;

+    PanedPart	   paned;

+} PanedRec;

+

+#endif /* _XawPanedP_h */