bleh

1 files changed, 10 insertions, 50 deletions

diff --git a/include/glshape.h b/include/glshape.h
index b65c21e..81439ad 100644
--- a/include/glshape.h
+++ b/include/glshape.h
@@ -5,60 +5,20 @@
 #include <BString.h>
 #include <glcolor.h>
 #include <gltexture.h>
+#include <shape.h>
 
 namespace mogltk {
-    typedef enum {
-	LEFT,
-	CENTER,
-	RIGHT
-    } align_t;
-    class shape : public Base {
+    class glshape : public shape {
       public:
-        static void pixel(int x, int y, ColorP = WHITE);
-        static void box(int x1, int y1, int x2, int y2, ColorP = WHITE);
-        static void box3d(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false);
-	static void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);
-        static void obox(int x1, int y1, int x2, int y2, ColorP = WHITE);
-        static void obox3d(int x1, int y1, int x2, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	static void obox(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP);	
-	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0);
-	static void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2);
-	static void hline(int x1, int x2, int y, ColorP = WHITE);
-	static void hline3d(int x1, int x2, int y, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	static void hline(int x1, int x2, int y, ColorP, ColorP);
-	static void vline(int x, int y1, int y2, ColorP = WHITE);
-	static void vline3d(int x, int y1, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false);
-	static void vline(int x, int y1, int y2, ColorP, ColorP);
-	static void window(int x1, int y1, int x2, int y2,
-			    const String & title = "",
-	                    ColorP titlecolor = DOS_HIGH_WHITE, 
-			    ColorP titlebackcolor = DOS_MAGENTA, 
-			    ColorP front = DOS_WHITE, 
-			    ColorP shade1 = DOS_HIGH_WHITE,
-			    ColorP shade2 = DOS_GRAY);
-	static void text(int x, int y, const String &,
-			    ColorP textcolor = DOS_HIGH_WHITE,
-			    align_t align = LEFT);
-	static void text3d(int x, int y, const String &,
-			    ColorP textcolor = DOS_BLACK,
-			    ColorP shade1 = DOS_HIGH_WHITE,
-			    ColorP shade2 = DOS_GRAY,
-			    align_t align = LEFT,
-			    bool bevel = false);
-	static void button(int x1, int y1, int x2, int y2, const String &,
-			    bool bevel = false,
-			    ColorP front = DOS_WHITE,
-			    ColorP shade1 = DOS_HIGH_WHITE,
-			    ColorP shade2 = DOS_GRAY,
-			    ColorP round = DOS_BLACK,
-			    ColorP textcolor = DOS_BLACK,
-			    ColorP tshade1 = DOS_HIGH_WHITE,
-			    ColorP tshade2 = DOS_GRAY);
+        virtual void box(int x1, int y1, int x2, int y2, glColorP = WHITE);
+        virtual void box3d(int x1, int y1, int x2, int y2, glColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false);
+	virtual void box(int x1, int y1, int x2, int y2, glColorP, glColorP, glColorP, glColorP);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE);
+	virtual void tbox(texture *, int x1, int y1, int x2, int y2, glColorP, glColorP, glColorP, glColorP, int tx1, int ty1, int tx2, int ty2);
       private:
-        static bool in2D(bool);
-	static void out2D(bool);
+        bool Enter(bool);
+        virtual bool Enter();
+	virtual void Leave(bool);
     };
 };