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/src/Tip.c | |
| 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/src/Tip.c')
| -rw-r--r-- | libXaw/src/Tip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libXaw/src/Tip.c b/libXaw/src/Tip.c index 9f8b32ad3..8328aace3 100644 --- a/libXaw/src/Tip.c +++ b/libXaw/src/Tip.c @@ -247,7 +247,7 @@ XawTipInitialize(Widget req, Widget w, ArgList args, Cardinal *num_args) if (!tip->tip.font) XtError("Aborting: no font found\n"); if (tip->tip.international && !tip->tip.fontset) XtError("Aborting: no fontset found\n"); - + tip->tip.timer = 0; values.foreground = tip->tip.foreground; @@ -352,7 +352,7 @@ XawTipExpose(Widget w, XEvent *event, Region region) else XDrawString(XtDisplay(w), XtWindow(w), gc, tip->tip.left_margin, y, label, (int)(nl - label)); - y += tip->tip.font->max_bounds.ascent + + y += tip->tip.font->max_bounds.ascent + tip->tip.font->max_bounds.descent; label = nl + 1; } |