diff options
| author | lecoanet | 2004-05-19 13:04:54 +0000 |
|---|---|---|
| committer | lecoanet | 2004-05-19 13:04:54 +0000 |
| commit | 789d114e1e48cb7db167618c1e56516b8d086221 (patch) | |
| tree | 4854fea14f57559b03bc40548a68dbf267c0406b /generic/Field.c | |
| parent | b0ebecfc8a6389443e6528e48fcf548417dcce2b (diff) | |
| download | tkzinc-789d114e1e48cb7db167618c1e56516b8d086221.zip tkzinc-789d114e1e48cb7db167618c1e56516b8d086221.tar.gz tkzinc-789d114e1e48cb7db167618c1e56516b8d086221.tar.bz2 tkzinc-789d114e1e48cb7db167618c1e56516b8d086221.tar.xz | |
Fixed te core dump under openGL. The code wasn't adapted for
the deferred font loading, ooops.
Diffstat (limited to 'generic/Field.c')
| -rw-r--r-- | generic/Field.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/generic/Field.c b/generic/Field.c index aaf09fb..fafc9bc 100644 --- a/generic/Field.c +++ b/generic/Field.c @@ -839,7 +839,7 @@ InitFields(ZnFieldSet field_set) field->tile = ZnUnspecifiedImage; field->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(wi->font)); #ifdef GL - field->tfi = NULL; + field->tfi = ZnGetTexFont(wi, field->font); #endif field->border_edges = ZN_NO_BORDER; field->alignment = TK_JUSTIFY_LEFT; @@ -901,7 +901,7 @@ CloneFields(ZnFieldSet field_set) } field->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(field->font)); #ifdef GL - field->tfi = NULL; + field->tfi = ZnGetTexFont(wi, field->font); #endif field->color = ZnGetGradientByValue(field->color); field->fill_color = ZnGetGradientByValue(field->fill_color); @@ -992,7 +992,7 @@ ConfigureField(ZnFieldSet fs, if (old_font != fptr->font) { if (fptr->tfi) { ZnFreeTexFont(fptr->tfi); - fptr->tfi = NULL; + fptr->tfi = ZnGetTexFont(wi, fptr->font); } } #endif @@ -2049,11 +2049,6 @@ RenderField(ZnWInfo *wi, */ num_bytes = strlen(fptr->text); if (num_bytes) { - if (!fptr->tfi) { - if (! (fptr->tfi = ZnGetTexFont(wi, fptr->font))) { - continue; - } - } glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); if (sel_start >= 0) { color = ZnGetGradientColor(ti->sel_color, 0.0, &alpha); |