diff options
author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/include/X11/Xaw/PanedP.h | |
parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/include/X11/Xaw/PanedP.h')
-rw-r--r-- | libXaw/include/X11/Xaw/PanedP.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libXaw/include/X11/Xaw/PanedP.h b/libXaw/include/X11/Xaw/PanedP.h index 08dcd3b25..4e40eafb6 100644 --- a/libXaw/include/X11/Xaw/PanedP.h +++ b/libXaw/include/X11/Xaw/PanedP.h @@ -27,13 +27,13 @@ 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, +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 +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. +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 @@ -90,7 +90,7 @@ typedef struct _PanedConstraintsPart { 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 + on a resize or change managed after realize */ /* Private state */ @@ -98,7 +98,7 @@ typedef struct _PanedConstraintsPart { 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 */ + 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; @@ -120,9 +120,9 @@ typedef struct _PaneStack { /* New Fields for the Paned widget record */ typedef struct { /* resources */ - Position grip_indent; /* Location of grips (offset + Position grip_indent; /* Location of grips (offset from right margin) */ - Boolean refiguremode; /* Whether to refigure changes + Boolean refiguremode; /* Whether to refigure changes right now */ XtTranslations grip_translations; /* grip translation table */ Pixel internal_bp; /* color of internal borders */ |