Toying

1 files changed, 26 insertions, 12 deletions

diff --git a/include/glshape.h b/include/glshape.h
index 10c5145..b65c21e 100644
--- a/include/glshape.h
+++ b/include/glshape.h
@@ -14,34 +14,48 @@ namespace mogltk {
     } align_t;
     class shape : public Base {
       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, int = 0);
+        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, int = 0);
+        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, int = 0);
+	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, int = 0);
+	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, 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 text3d(int x, int y, String,
+	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,
-			    int bevel = 0);
+			    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);
       private:
         static bool in2D(bool);
 	static void out2D(bool);