Move OpenGL includes to a common place

[grits] / src / objects / grits-poly.c

diff --git a/src/objects/grits-poly.c b/src/objects/grits-poly.c
index 2b62997e249c7a85ba5d6998dda27e46e0ed71b2..5d54a70da80d06d6f22ff2939c03d97af2421f44 100644 (file)
--- a/src/objects/grits-poly.c
+++ b/src/objects/grits-poly.c
@@ -23,8 +23,7 @@
  */
 
 #include <config.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include "gtkgl.h"
 #include "grits-poly.h"
 
 /* Drawing */
@@ -153,7 +152,7 @@ static void grits_poly_pick(GritsObject *_poly, GritsOpenGL *opengl)
 
 static gboolean grits_poly_delete(gpointer list)
 {
-       glDeleteLists((guint)list, 1);
+       glDeleteLists((guintptr)list, 1);
        return FALSE;
 }
 
@@ -242,8 +241,8 @@ static void grits_poly_finalize(GObject *_poly)
 {
        //g_debug("GritsPoly: finalize");
        GritsPoly *poly = GRITS_POLY(_poly);
-       if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)poly->list[0]);
-       if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)poly->list[1]);
+       if (poly->list[0]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[0]);
+       if (poly->list[1]) g_idle_add(grits_poly_delete, (gpointer)(guintptr)poly->list[1]);
 }
 
 static void grits_poly_class_init(GritsPolyClass *klass)