From 38bc0336f32babcbb291c9a206f310ba3e1cf222 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 10 May 2004 15:38:17 +0000
Subject: Changed the point when the GL fonts are loaded. It is now at init or
 configure time (there is a deferring list).

---
 generic/Text.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'generic')

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);
-- 
cgit v1.1