aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/Vendor.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-15 14:13:55 +0200
committermarha <marha@users.sourceforge.net>2012-06-15 14:13:55 +0200
commit1501699f035761714a1d4540d65a1afb7c567abe (patch)
tree4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/src/Vendor.c
parent38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff)
parenta33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff)
downloadvcxsrv-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/src/Vendor.c')
-rw-r--r--libXaw/src/Vendor.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libXaw/src/Vendor.c b/libXaw/src/Vendor.c
index c73d17fe7..dd6a117c6 100644
--- a/libXaw/src/Vendor.c
+++ b/libXaw/src/Vendor.c
@@ -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
@@ -174,7 +174,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
/* class_part_init */ XawVendorShellClassPartInit,
/* Class init'ed ? */ FALSE,
/* initialize */ XawVendorShellInitialize,
- /* initialize_hook */ NULL,
+ /* initialize_hook */ NULL,
/* realize */ XawVendorShellRealize,
/* actions */ NULL,
/* num_actions */ 0,
@@ -189,8 +189,8 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
/* resize */ XawVendorShellExtResize,
/* expose */ NULL,
/* set_values */ XawVendorShellSetValues,
- /* set_values_hook */ NULL,
- /* set_values_almost */ XtInheritSetValuesAlmost,
+ /* set_values_hook */ NULL,
+ /* set_values_almost */ XtInheritSetValuesAlmost,
/* get_values_hook */ NULL,
/* accept_focus */ NULL,
/* intrinsics version */ XtVersion,
@@ -250,7 +250,7 @@ externaldef(vendorshellextclassrec) XawVendorShellExtClassRec
/* class_part_initialize*/ NULL,
/* Class init'ed ? */ FALSE,
/* initialize */ XawVendorShellExtInitialize,
- /* initialize_hook */ NULL,
+ /* initialize_hook */ NULL,
/* pad */ NULL,
/* pad */ NULL,
/* pad */ 0,
@@ -265,8 +265,8 @@ externaldef(vendorshellextclassrec) XawVendorShellExtClassRec
/* pad */ NULL,
/* pad */ NULL,
/* set_values */ XawVendorShellExtSetValues,
- /* set_values_hook */ NULL,
- /* pad */ NULL,
+ /* set_values_hook */ NULL,
+ /* pad */ NULL,
/* get_values_hook */ NULL,
/* pad */ NULL,
/* version */ XtVersion,
@@ -324,7 +324,7 @@ XawVendorShellClassInitialize(void)
sizeof(Screen *)}
};
- XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,
+ XtAddConverter(XtRString, XtRCursor, XmuCvtStringToCursor,
screenConvertArg, XtNumber(screenConvertArg));
XtAddConverter(XtRString, XtRBitmap, XmuCvtStringToBitmap,
@@ -340,9 +340,9 @@ XawVendorShellClassPartInit(WidgetClass cclass)
CompositeClassExtension ext;
VendorShellWidgetClass vsclass = (VendorShellWidgetClass)cclass;
- if ((ext = (CompositeClassExtension)
+ if ((ext = (CompositeClassExtension)
XtGetClassExtension (cclass,
- XtOffsetOf(CompositeClassRec,
+ XtOffsetOf(CompositeClassRec,
composite_class.extension),
NULLQUARK, 1L, (Cardinal) 0)) == NULL) {
ext = (CompositeClassExtension) XtNew (CompositeClassExtensionRec);
@@ -495,7 +495,7 @@ XawVendorShellGeometryManager(Widget wid, XtWidgetGeometry *request,
* so, whatever the WM sized us to (if the Shell requested
* only one of the two) is now the correct child size
*/
-
+
wid->core.width = shell->core.width;
wid->core.height = shell->core.height;
if (request->request_mode & CWBorderWidth) {