glcolor, first episode

1 files changed, 7 insertions, 7 deletions

diff --git a/include/glfont.h b/include/glfont.h
index 4ace74a..991024e 100644
--- a/include/glfont.h
+++ b/include/glfont.h
@@ -4,24 +4,24 @@
 #include <SDL.h>
 #include <stdarg.h>
 #include <BString.h>
-#include <Color.h>
 #include <Handle.h>
-#include "gltexture.h"
+#include <gltexture.h>
+#include <glcolor.h>
 
 namespace mogltk {
     class font : public Base {
       public:
           font(Handle *);
 	  virtual ~font();
-	void drawentry(Uint16, int, int, Color = Color(255, 255, 255, 255));
+	void drawentry(Uint16, int, int, ColorP = WHITE);
 	void putcursor(int, int);
-	void putentry(Uint16, Color = Color(255, 255, 255, 255));
-	void putchar(char, Color = Color(255, 255, 255, 255));
+	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(Color);
+	void setcolor(ColorP);
 	void setshadow(int);
 	int getchar(char) const;
 	int singletextsize(const String &) const;
@@ -34,7 +34,7 @@ namespace mogltk {
 	Uint16 * corresp;
 	void Bind(int);
 	int cx, cy, ox;
-	Color textcolor;
+	ColorP textcolor;
 	int shadow;
     };
     extern font * SystemFont;