Move OpenGL code from GisOpenGL to objects

[grits] / src / objects / gis-callback.h

diff --git a/src/objects/gis-callback.h b/src/objects/gis-callback.h
index f3eee6de59a4e71ef95ddb4e7049a6a3d720f4c1..db82739ce80328518e70342126f7083dd315f9d5 100644 (file)
--- a/src/objects/gis-callback.h
+++ b/src/objects/gis-callback.h
@@ -33,11 +33,18 @@
 typedef struct _GisCallback      GisCallback;
 typedef struct _GisCallbackClass GisCallbackClass;
 
-typedef gpointer (*GisCallbackFunc)(GisCallback *callback, gpointer user_data);
+/**
+ * GisCallbackFunc:
+ * @callback:  the callback object to be drawn
+ * @user_data: the user data associated with the callback 
+ *
+ * A function to be called when the callback object is being rendered
+ */
+typedef void (*GisCallbackFunc)(GisCallback *callback, GisOpenGL *opengl, gpointer user_data);
 
 struct _GisCallback {
        GisObject       parent;
-       GisCallbackFunc callback;
+       GisCallbackFunc draw;
        gpointer        user_data;
 };
 
@@ -47,6 +54,6 @@ struct _GisCallbackClass {
 
 GType gis_callback_get_type(void);
 
-GisCallback *gis_callback_new(GisCallbackFunc callback, gpointer user_data);
+GisCallback *gis_callback_new(GisCallbackFunc draw_cb, gpointer user_data);
 
 #endif