aboutsummaryrefslogtreecommitdiff
path: root/libXaw/src/Text.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
committermarha <marha@users.sourceforge.net>2012-04-10 14:58:33 +0200
commit5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (patch)
treec10939819ba1167cdc905a0c105c7ae4091abbc3 /libXaw/src/Text.c
parent67326634496ef21b4acbf4cef2f05040d34aef9b (diff)
downloadvcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.gz
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.tar.bz2
vcxsrv-5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6.zip
Updated following packages:
bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23
Diffstat (limited to 'libXaw/src/Text.c')
-rw-r--r--libXaw/src/Text.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/libXaw/src/Text.c b/libXaw/src/Text.c
index 060057d1f..72387e919 100644
--- a/libXaw/src/Text.c
+++ b/libXaw/src/Text.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
@@ -83,7 +83,6 @@ SOFTWARE.
#include <X11/Xfuncs.h>
#include <X11/Xutil.h>
#include <X11/Xmu/Misc.h>
-#include <X11/Xmu/SysUtil.h>
#include <X11/Xmu/Xmu.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/MultiSinkP.h>
@@ -308,7 +307,7 @@ static XtResource resources[] = {
XtNdisplayPosition,
XtCTextPosition,
XtRInt,
- sizeof(XawTextPosition),
+ sizeof(XawTextPosition),
offset(text.lt.top),
XtRImmediate,
(XtPointer)0
@@ -695,7 +694,7 @@ XawTextClassInitialize(void)
XawInitializeWidgetSet();
textClassRec.core_class.num_actions = _XawTextActionsTableCount;
-
+
QWrapNever = XrmPermStringToQuark(XtEtextWrapNever);
QWrapLine = XrmPermStringToQuark(XtEtextWrapLine);
QWrapWord = XrmPermStringToQuark(XtEtextWrapWord);
@@ -971,7 +970,7 @@ XawTextRealize(Widget w, XtValueMask *mask, XSetWindowAttributes *attr)
TextWidget ctx = (TextWidget)w;
(*textClassRec.core_class.superclass->core_class.realize)(w, mask, attr);
-
+
if (ctx->text.hbar != NULL) {
XtRealizeWidget(ctx->text.hbar);
XtMapWidget(ctx->text.hbar);
@@ -1092,7 +1091,7 @@ _XawTextGetText(TextWidget ctx, XawTextPosition left, XawTextPosition right)
if (XawTextFormat(ctx, XawFmt8Bit))
bytes = sizeof(unsigned char);
- else if (XawTextFormat(ctx, XawFmtWide))
+ else if (XawTextFormat(ctx, XawFmtWide))
bytes = sizeof(wchar_t);
else /* if there is another fomat, add here */
bytes = 1;
@@ -1163,7 +1162,7 @@ _XawTextGetSTRING(TextWidget ctx, XawTextPosition left, XawTextPosition right)
}
}
-/*
+/*
* This routine maps an x and y position in a window that is displaying text
* into the corresponding position in the source.
*/
@@ -2019,7 +2018,7 @@ TextConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
}
else
*type = *target;
- /*
+ /*
* If salt is True, the salt->contents stores CT string,
* its length is measured in bytes.
* Refer to _XawTextSaltAwaySelection().
@@ -2036,7 +2035,7 @@ TextConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type,
XtFree((char *)*value);
return (False);
}
- XtFree((char *)*value);
+ XtFree((char *)*value);
*value = (XtPointer)textprop.value;
*length = textprop.nitems;
}
@@ -2216,7 +2215,7 @@ TextLoseSelection(Widget w, Atom *selection)
while (salt->s.atom_count
&& salt->s.selections[salt->s.atom_count-1] == 0)
salt->s.atom_count--;
-
+
/*
* Must walk the selection list in opposite order from UnsetSelection
*/
@@ -3623,7 +3622,7 @@ XawTextDestroy(Widget w)
/*
* by the time we are managed (and get this far) we had better
- * have both a source and a sink
+ * have both a source and a sink
*/
static void
XawTextResize(Widget w)
@@ -3938,13 +3937,13 @@ XawTextReplace(Widget w, XawTextPosition startPos, XawTextPosition endPos,
return (result);
}
-XawTextPosition
+XawTextPosition
XawTextTopPosition(Widget w)
{
return (((TextWidget)w)->text.lt.top);
}
-XawTextPosition
+XawTextPosition
XawTextLastPosition(Widget w)
{
return (((TextWidget)w)->text.lastPos);
@@ -4027,7 +4026,7 @@ XawTextDisableRedisplay(Widget w)
_XawTextPrepareToUpdate((TextWidget)w);
}
-void
+void
XawTextEnableRedisplay(Widget w)
{
TextWidget ctx = (TextWidget)w;
@@ -4111,7 +4110,7 @@ XawTextSearch(Widget w,
TextClassRec textClassRec = {
/* core */
{
- (WidgetClass)&simpleClassRec, /* superclass */
+ (WidgetClass)&simpleClassRec, /* superclass */
"Text", /* class_name */
sizeof(TextRec), /* widget_size */
XawTextClassInitialize, /* class_initialize */