1 files changed, 5 insertions, 30 deletions

diff --git a/include/glfont.h b/include/glfont.h
index 87efd12..b8663d7 100644
--- a/include/glfont.h
+++ b/include/glfont.h
@@ -2,43 +2,18 @@
 #define __GLFONT_H__
 
 #include <SDL.h>
-#include <stdarg.h>
-#include <BString.h>
-#include <Handle.h>
-#include <gltexture.h>
-#include <glcolor.h>
+#include "font.h"
 
 namespace mogltk {
-    class font : public Base {
+    class glfont : public font {
       public:
-          font(Handle *);
-	  virtual ~font();
-	void drawentry(Uint16, int, int, ColorP = WHITE);
-	void putcursor(int, int);
-	void putentry(Uint16, ColorP = WHITE);
-	void putchar(char, ColorP = WHITE);
-	void newline(void);
-	int printf(const ugly_string &, ...);
-	int printf(const char *, ...);
-	int printf(const ugly_string &, va_list);
-	void setcolor(ColorP);
-	void setshadow(int);
-	void setwspace(int);
-	int getchar(char) const;
-	int singletextsize(const String &) const;
+          glfont(Handle *);
+	  virtual ~glfont();
+	void drawentry(Uint16, int, int, glColorP = WHITE);
 	
       private:
-        Uint8 * sizes;
-	Uint16 nbentries, nbcT, nbT;
-	Uint8 flags, maxX, maxY, nbcU, nbcV, base, inter;
-	texture ** fonttex;
-	Uint16 * corresp;
 	void Bind(int);
-	int cx, cy, ox;
-	ColorP textcolor;
-	int shadow, wspace;
     };
-    extern font * SystemFont;
 };
 
 #endif