diff options
Diffstat (limited to 'libXaw/src/Label.c')
| -rw-r--r-- | libXaw/src/Label.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libXaw/src/Label.c b/libXaw/src/Label.c index 5ce3b7dca..25a26a111 100644 --- a/libXaw/src/Label.c +++ b/libXaw/src/Label.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 @@ -468,7 +468,7 @@ GetGrayGC(LabelWidget lw) values.font = lw->label.font->fid; values.fill_style = FillTiled; values.tile = XmuCreateStippledPixmap(XtScreen((Widget)lw), - lw->label.foreground, + lw->label.foreground, lw->core.background_pixel, lw->core.depth); values.graphics_exposures = False; @@ -482,7 +482,7 @@ GetGrayGC(LabelWidget lw) GCGraphicsExposures, &values, GCFont, 0); else - lw->label.gray_GC = XtGetGC((Widget)lw, + lw->label.gray_GC = XtGetGC((Widget)lw, GCForeground | GCBackground | GCFont | GCTile | GCFillStyle | GCGraphicsExposures, @@ -493,7 +493,7 @@ static void compute_bitmap_offsets(LabelWidget lw) { /* - * bitmap will be eventually be displayed at + * bitmap will be eventually be displayed at * (internal_width, internal_height + lbm_y) */ if (lw->label.lbm_height != 0) @@ -527,10 +527,10 @@ XawLabelInitialize(Widget request, Widget cnew, LabelWidget lw = (LabelWidget)cnew; if (!lw->label.font) XtError("Aborting: no font found\n"); - if (lw->simple.international && !lw->label.fontset) + if (lw->simple.international && !lw->label.fontset) XtError("Aborting: no fontset found\n"); - - if (lw->label.label == NULL) + + if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); else lw->label.label = XtNewString(lw->label.label); @@ -615,7 +615,7 @@ XawLabelRedisplay(Widget gw, XEvent *event, Region region) else XDrawString(XtDisplay(gw), XtWindow(gw), gc, w->label.label_x, y, label, (int)(nl - label)); - y += w->label.font->max_bounds.ascent + + y += w->label.font->max_bounds.ascent + w->label.font->max_bounds.descent; label = nl + 1; } @@ -724,7 +724,7 @@ XawLabelSetValues(Widget current, Widget request, Widget cnew, if (curlw->label.encoding != newlw->label.encoding) was_resized = True; - if (curlw->simple.international + if (curlw->simple.international && curlw->label.fontset != newlw->label.fontset) was_resized = True; |