1 files changed, 7 insertions, 5 deletions
diff --git a/include/font.h b/include/font.h
index fcc2e03..3377ef0 100644
--- a/include/font.h
+++ b/include/font.h
@@ -5,8 +5,8 @@
 #include <stdarg.h>
 #include <BString.h>
 #include <Handle.h>
-#include <gltexture.h>
-#include <glcolor.h>
+#include <texture.h>
+#include <mcolor.h>
 
 namespace mogltk {
     class font : public Base {
@@ -31,12 +31,14 @@ namespace mogltk {
         Uint8 * sizes;
 	Uint16 nbentries, nbcT, nbT;
 	Uint8 flags, maxX, maxY, nbcU, nbcV, base, inter;
-	texture ** fonttex;
-	Uint16 * corresp;
 	int cx, cy, ox;
 	ColorP textcolor;
 	int shadow, wspace;
-	virtual texture * alloctexture();
+	texture * alloctexture();
+	void Bind(int);
+      private:
+	texture ** fonttex;
+	Uint16 * corresp;
     };
     extern font * SystemFont;
 };