Change GdkEventExpose to gpointer

[grits] / examples / gl / gl.c

diff --git a/examples/gl/gl.c b/examples/gl/gl.c
index 378fd9a65ae884b1e72d7e81fa7ec98ee3f77ff7..45075f6d724616ffe07b23a1c9cd4066e3e28522 100644 (file)
--- a/examples/gl/gl.c
+++ b/examples/gl/gl.c
@@ -13,7 +13,7 @@
  ************************/
 #if defined(SYS_CAIRO)
 gpointer setup(GtkWidget *widget) { return NULL; }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+gboolean expose(GtkWidget *widget, gpointer data, gpointer user_data)
 {
        GtkAllocation alloc;
        gtk_widget_get_allocation(widget, &alloc);
@@ -50,7 +50,7 @@ gpointer setup(GtkWidget *widget)
                        glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE);
        return NULL;
 }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+gboolean expose(GtkWidget *widget, gpointer data, gpointer user_data)
 {
        GtkAllocation alloc;
        gtk_widget_get_allocation(widget, &alloc);
@@ -80,7 +80,7 @@ gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
 #include <gdk/gdkx.h>
 void realize(GtkWidget *widget, gpointer user_data)
 {
-      gdk_window_ensure_native(gtk_widget_get_window(widget));
+       gdk_window_ensure_native(gtk_widget_get_window(widget));
 }
 gpointer setup(GtkWidget *widget)
 {
@@ -98,7 +98,7 @@ gpointer setup(GtkWidget *widget)
                                GLX_DEPTH_SIZE,  1,
                                None};
        XVisualInfo *xvinfo  = glXChooseVisual(xdisplay, nscreen, attribs);
-       GLXContext   context = glXCreateContext(xdisplay, xvinfo, 0, False);
+       GLXContext   context = glXCreateContext(xdisplay, xvinfo, 0, True);
 
        /* Fix up colormap */
        GdkVisual   *visual  = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
@@ -110,7 +110,7 @@ gpointer setup(GtkWidget *widget)
 
        return context;
 }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, GLXContext context)
+gboolean expose(GtkWidget *widget, gpointer data, GLXContext context)
 {
        /* Make current */
        Display     *xdisplay = GDK_SCREEN_XDISPLAY(gdk_screen_get_default());
@@ -168,7 +168,7 @@ gpointer setup(GtkWidget *widget)
        gtk_widget_set_double_buffered(widget, FALSE);
        return FALSE;
 }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+gboolean expose(GtkWidget *widget, gpointer data, gpointer user_data)
 {
        GtkWidget *toplevel = gtk_widget_get_toplevel(widget);
        GdkWindow *window   = gtk_widget_get_window(widget);
@@ -236,6 +236,8 @@ gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
  * Mac OSX implementation *
  **************************/
 #elif defined(SYS_MAC)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
 #include <gdk/gdkquartz.h>
 gpointer setup(GtkWidget *widget)
 {
@@ -268,7 +270,7 @@ gboolean configure(GtkWidget *widget, GdkEventConfigure *event, NSOpenGLContext
        [ctx  update];
        return FALSE;
 }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, NSOpenGLContext *ctx)
+gboolean expose(GtkWidget *widget, gpointer data, NSOpenGLContext *ctx)
 {
        gdk_window_ensure_native(gtk_widget_get_window(widget));
 
@@ -302,7 +304,7 @@ gboolean expose(GtkWidget *widget, GdkEventExpose *event, NSOpenGLContext *ctx)
  ****************************/
 #else
 gpointer setup(GtkWidget *widget) { return NULL; }
-gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+gboolean expose(GtkWidget *widget, gpointer data, gpointer user_data)
 {
        g_message("unimplemented");
        return FALSE;
@@ -316,7 +318,7 @@ gboolean expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
  ***************/
 gboolean key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
-       if (event->keyval == GDK_q)
+       if (event->keyval == GDK_KEY_q)
                gtk_main_quit();
        return FALSE;
 }