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/Porthole.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/Porthole.h')
-rw-r--r-- | libXaw/include/X11/Xaw/Porthole.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libXaw/include/X11/Xaw/Porthole.h b/libXaw/include/X11/Xaw/Porthole.h index d7c260cba..2dbcf1890 100644 --- a/libXaw/include/X11/Xaw/Porthole.h +++ b/libXaw/include/X11/Xaw/Porthole.h @@ -32,26 +32,26 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xaw/Reports.h> /***************************************************************************** - * + * * Porthole Widget (subclass of Composite) - * + * * This widget is similar to a viewport without scrollbars. Child movement * is done by external panners or scrollbars. - * + * * Parameters: - * + * * Name Class Type Default * ---- ----- ---- ------- - * + * * background Background Pixel XtDefaultBackground * border BorderColor Pixel XtDefaultForeground * borderWidth BorderWidth Dimension 1 * height Height Dimension 0 * reportCallback ReportCallback Pointer NULL * width Width Dimension 0 - * x Position Position 0 + * x Position Position 0 * y Position Position 0 - * + * *****************************************************************************/ extern WidgetClass portholeWidgetClass; |