bleh

1 files changed, 9 insertions, 11 deletions

diff --git a/include/glbase.h b/include/glbase.h
index b83f044..90732ef 100644
--- a/include/glbase.h
+++ b/include/glbase.h
@@ -4,25 +4,23 @@
 #include <SDL.h>
 #include <SDL_opengl.h>
 #include <Exceptions.h>
+#include "base.h"
 
 namespace mogltk {
-    class glbase : public Base {
+    class glbase : public base {
       public:
-        static int setup(int w = 640, int h = 480, int flags = 0) throw(GeneralException);
-        static int GetWidth(void);
-        static int GetHeight(void);
-        static int GetInited(void);
-	static void Enter2DMode(void);
-	static void Leave2DMode(void);
-	static void Flip(void);
-	static bool is2D(void);
+          glbase(int w = 640, int h = 480, int flags = 0) throw(GeneralException);
+	  virtual ~glbase();
+	void Enter2DMode(void);
+	void Leave2DMode(void);
+	virtual void Flip(void);
+	bool is2D(void);
         static void glVertex(GLshort, GLshort, GLshort = 0, GLshort = 1);
 	static void glVertex(GLint, GLint, GLint = 0, GLint = 1);
 	static void glVertex(GLfloat, GLfloat, GLfloat = 0.0, GLfloat = 1.0);
 	static void glVertex(GLdouble, GLdouble, GLdouble = 0.0, GLdouble = 1.0);
       private:
-        static int width, height, inited, twoD;
-        static SDL_Surface * surface;
+        int twoD;
     };
 };