diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-01-06 19:57:00 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-01-06 19:57:00 +0000 |
| commit | bbf64ac88f26106cd694a76d874b77dd9b295459 (patch) | |
| tree | 6cdb7dfe47db72f22011ed7e20f2c4c3418618dc /src/Label.c | |
| parent | c7f720ae3f0dea94bc6e9eb9bdbbf00e6bb16b24 (diff) | |
| download | xorg-lib-libXaw-bbf64ac88f26106cd694a76d874b77dd9b295459.tar.gz | |
Integrate 6.8.2 RC2 changes.lg3d-dev-0-6-1
Diffstat (limited to 'src/Label.c')
| -rw-r--r-- | src/Label.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Label.c b/src/Label.c index f2882f2..029fdb8 100644 --- a/src/Label.c +++ b/src/Label.c @@ -527,6 +527,8 @@ 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) + XtError("Aborting: no fontset found\n"); if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); @@ -722,8 +724,8 @@ XawLabelSetValues(Widget current, Widget request, Widget cnew, if (curlw->label.encoding != newlw->label.encoding) was_resized = True; - if (curlw->label.fontset != newlw->label.fontset && - curlw->simple.international) + if (curlw->simple.international + && curlw->label.fontset != newlw->label.fontset) was_resized = True; if (curlw->label.label != newlw->label.label) { |