aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
authorlecoanet2004-05-10 15:38:17 +0000
committerlecoanet2004-05-10 15:38:17 +0000
commit38bc0336f32babcbb291c9a206f310ba3e1cf222 (patch)
tree3b8c69869517d9e5ec387d5724a4deaae79bf61e /generic
parentd52537b88bc85808a821786790f1bb1d07f250b3 (diff)
downloadtkzinc-38bc0336f32babcbb291c9a206f310ba3e1cf222.zip
tkzinc-38bc0336f32babcbb291c9a206f310ba3e1cf222.tar.gz
tkzinc-38bc0336f32babcbb291c9a206f310ba3e1cf222.tar.bz2
tkzinc-38bc0336f32babcbb291c9a206f310ba3e1cf222.tar.xz
Changed the point when the GL fonts are loaded. It is now
at init or configure time (there is a deferring list).
Diffstat (limited to 'generic')
-rw-r--r--generic/Text.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/Text.c b/generic/Text.c
index c3cf746..43907e9 100644
--- a/generic/Text.c
+++ b/generic/Text.c
@@ -200,7 +200,7 @@ Init(ZnItem item,
text->alignment = TK_JUSTIFY_LEFT;
text->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(wi->font));
#ifdef GL
- text->tfi = NULL;
+ text->tfi = ZnGetTexFont(wi, text->font);
#endif
text->width = 0;
text->spacing = 0;
@@ -237,7 +237,7 @@ Clone(ZnItem item)
text->color = ZnGetGradientByValue(text->color);
text->font = Tk_GetFont(wi->interp, wi->win, Tk_NameOfFont(text->font));
#ifdef GL
- text->tfi = NULL;
+ text->tfi = ZnGetTexFont(wi, text->font);
#endif
/*
@@ -313,7 +313,7 @@ Configure(ZnItem item,
if (old_font != text->font) {
if (text->tfi) {
ZnFreeTexFont(text->tfi);
- text->tfi = NULL;
+ text->tfi = ZnGetTexFont(item->wi, text->font);
}
}
#endif
@@ -1112,13 +1112,13 @@ Render(ZnItem item)
if (!text->text_info) {
return;
}
-
+ /*
if (!text->tfi) {
if (! (text->tfi = ZnGetTexFont(wi, text->font))) {
return;
}
- }
-
+ }*/
+
#ifdef GL_LIST
if (!item->gl_list) {
item->gl_list = glGenLists(1);