Change GdkEventExpose to gpointer

[grits] / src / grits-opengl.c

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 861bfc933a8cd5a38674e926f6df6ebabd456b3f..6a5ea32ecf0001e91e9796da5b945256fb20efd6 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -356,12 +356,12 @@ static void _draw_level(gpointer _level, gpointer _opengl)
                        nunsorted, nsorted);
 }
 
-static gboolean on_expose(GritsOpenGL *opengl, GdkEventExpose *event, gpointer _)
+static gboolean on_expose(GritsOpenGL *opengl, gpointer data, gpointer _)
 {
        g_debug("GritsOpenGL: on_expose - begin");
 
        if (opengl->pickmode)
-               return run_mouse_move(opengl, (GdkEventMotion*)event);
+               return run_mouse_move(opengl, &(GdkEventMotion){});
 
        if (opengl->mouse_queue.type != GDK_NOTHING) {
                run_mouse_move(opengl, &opengl->mouse_queue);
@@ -399,23 +399,23 @@ static gboolean on_expose(GritsOpenGL *opengl, GdkEventExpose *event, gpointer _
 static gboolean on_key_press(GritsOpenGL *opengl, GdkEventKey *event, gpointer _)
 {
        g_debug("GritsOpenGL: on_key_press - key=%x, state=%x, plus=%x",
-                       event->keyval, event->state, GDK_plus);
+                       event->keyval, event->state, GDK_KEY_plus);
 
        guint kv = event->keyval;
        /* Testing */
-       if (kv == GDK_w) {
+       if (kv == GDK_KEY_w) {
                opengl->wireframe = !opengl->wireframe;
                grits_viewer_queue_draw(GRITS_VIEWER(opengl));
        }
-       if (kv == GDK_p) {
+       if (kv == GDK_KEY_p) {
                opengl->pickmode = !opengl->pickmode;
                grits_viewer_queue_draw(GRITS_VIEWER(opengl));
        }
 #ifdef ROAM_DEBUG
-       else if (kv == GDK_n) roam_sphere_split_one(opengl->sphere);
-       else if (kv == GDK_p) roam_sphere_merge_one(opengl->sphere);
-       else if (kv == GDK_r) roam_sphere_split_merge(opengl->sphere);
-       else if (kv == GDK_u) roam_sphere_update_errors(opengl->sphere);
+       else if (kv == GDK_KEY_n) roam_sphere_split_one(opengl->sphere);
+       else if (kv == GDK_KEY_p) roam_sphere_merge_one(opengl->sphere);
+       else if (kv == GDK_KEY_r) roam_sphere_split_merge(opengl->sphere);
+       else if (kv == GDK_KEY_u) roam_sphere_update_errors(opengl->sphere);
        grits_viewer_queue_draw(GRITS_VIEWER(opengl));
 #endif
        return FALSE;