diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-08-28 04:03:07 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-09-01 20:06:38 -0500 |
| commit | 77aa38852ab023e5492059743ae93952af27aad5 (patch) | |
| tree | d2274e6a4f01ee06510ab7d67086fcedd7562a7c /src/AsciiSink.c | |
| parent | 96f8565f2bbac928a76b875415eba993ad806925 (diff) | |
Fix incompatible vfunc pointer warnings
AsciiSink.c:132:41: warning: initialization from incompatible pointer type
AsciiSink.c:135:41: warning: initialization from incompatible pointer type
AsciiSink.c:137:41: warning: initialization from incompatible pointer type
Vendor.c:199:24: warning: initialization from incompatible pointer type
Vendor.c:269:24: warning: initialization from incompatible pointer type
Vendor.c:284:24: warning: initialization from incompatible pointer type
Viewport.c:143:3: warning: initialization from incompatible pointer type
MultiSink.c:160:41: warning: initialization from incompatible pointer type
MultiSink.c:162:41: warning: initialization from incompatible pointer type
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/AsciiSink.c')
| -rw-r--r-- | src/AsciiSink.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/AsciiSink.c b/src/AsciiSink.c index 7a2d9b1..5d5d959 100644 --- a/src/AsciiSink.c +++ b/src/AsciiSink.c @@ -69,13 +69,14 @@ static int MaxLines(Widget, Dimension); static int MaxHeight(Widget, int); static void SetTabs(Widget, int, short *); -static void DisplayText(Widget, Position, Position, Boolean, XawTextPosition, XawTextPosition); +static void DisplayText(Widget, Position, Position, XawTextPosition, + XawTextPosition, Boolean); static void InsertCursor(Widget, Position, Position, XawTextInsertState); -static void FindPosition(Widget, XawTextPosition, int, int, int, +static void FindPosition(Widget, XawTextPosition, int, int, Boolean, XawTextPosition *, int *, int *); static void FindDistance(Widget, XawTextPosition, int, XawTextPosition, int *, XawTextPosition *, int *); -static void Resolve(Widget, XawTextPosition, int, int, XawTextPosition *, XawTextPosition *); +static void Resolve(Widget, XawTextPosition, int, int, XawTextPosition *); static void GetCursorBounds(Widget, XRectangle *); #define offset(field) XtOffsetOf(AsciiSinkRec, ascii_sink.field) @@ -246,8 +247,8 @@ PaintText(Widget w, GC gc, Position x, Position y, unsigned char * buf, int len) */ static void -DisplayText(Widget w, Position x, Position y, Boolean highlight, - XawTextPosition pos1, XawTextPosition pos2) +DisplayText(Widget w, Position x, Position y, XawTextPosition pos1, + XawTextPosition pos2, Boolean highlight) { AsciiSinkObject sink = (AsciiSinkObject) w; Widget source = XawTextGetSource(XtParent(w)); @@ -403,7 +404,7 @@ FindPosition(Widget w, XawTextPosition fromPos, /* Starting position. */ int fromx, /* Horizontal location of starting position.*/ int width, /* Desired width. */ - int stopAtWordBreak, /* Whether the resulting position should + Boolean stopAtWordBreak, /* Whether the resulting position should be at a word break. */ XawTextPosition *resPos, /* Resulting position. */ int *resWidth, /* Actual width used. */ @@ -455,16 +456,14 @@ FindPosition(Widget w, } static void -Resolve (Widget w, XawTextPosition pos, int fromx, int width, - XawTextPosition *leftPos, XawTextPosition *rightPos) +Resolve (Widget w, XawTextPosition pos, int fromx, int width, XawTextPosition *resPos) { int resWidth, resHeight; Widget source = XawTextGetSource(XtParent(w)); - FindPosition(w, pos, fromx, width, FALSE, leftPos, &resWidth, &resHeight); - if (*leftPos > GETLASTPOS) - *leftPos = GETLASTPOS; - *rightPos = *leftPos; + FindPosition(w, pos, fromx, width, FALSE, resPos, &resWidth, &resHeight); + if (*resPos > GETLASTPOS) + *resPos = GETLASTPOS; } static void |