[libgxps] test-gxps: Port to GTK 3

[Carlos Garcia Campos <carlosgc src gnome org>]

commit ce828051dba5e961a8bb64a51b032020db7558ec
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Tue Oct 11 18:21:53 2011 +0200

    test-gxps: Port to GTK 3

 configure.ac     |    2 +-
 test/test-gxps.c |   23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6cd6038..d4ceb4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ AC_ARG_ENABLE(test,
               [AC_HELP_STRING([--enable-test], [Compile tests])],enable_test="$enableval",enable_test=yes)
 
 if test "x$enable_test" = "xyes"; then
-   PKG_CHECK_MODULES(GTK, gtk+-2.0, enable_test=yes,enable_test=no)
+   PKG_CHECK_MODULES(GTK, gtk+-3.0, enable_test=yes,enable_test=no)
 
   if test "x$enable_test" != "xyes"; then
     AC_MSG_WARN("Tests disabled since required GTK+ library was not found")
diff --git a/test/test-gxps.c b/test/test-gxps.c
index 761bc20..acb9554 100644
--- a/test/test-gxps.c
+++ b/test/test-gxps.c
@@ -15,23 +15,20 @@ typedef struct {
 } GXPSView;
 
 static gboolean
-drawing_area_expose (GtkWidget      *drawing_area,
-		     GdkEventExpose *event,
-		     GXPSView       *view)
+drawing_area_draw (GtkWidget *drawing_area,
+                   cairo_t   *cr,
+                   GXPSView  *view)
 {
-	cairo_t *cr;
-
-	gdk_window_clear (drawing_area->window);
-
 	if (!view->surface)
 		return FALSE;
 
-	cr = gdk_cairo_create (drawing_area->window);
-	cairo_set_source_rgb (cr, 1., 1., 1.);
-	cairo_paint (cr);
+        cairo_set_source_rgb (cr, 1., 1., 1.);
+        cairo_rectangle (cr, 0, 0,
+                         cairo_image_surface_get_width (view->surface),
+                         cairo_image_surface_get_height (view->surface));
+	cairo_fill (cr);
 	cairo_set_source_surface (cr, view->surface, 0, 0);
 	cairo_paint (cr);
-	cairo_destroy (cr);
 
 	return TRUE;
 }
@@ -138,8 +135,8 @@ gint main (gint argc, gchar **argv)
 	gtk_widget_show (hbox);
 
 	view->darea = gtk_drawing_area_new ();
-	g_signal_connect (view->darea, "expose-event",
-			  G_CALLBACK (drawing_area_expose),
+	g_signal_connect (view->darea, "draw",
+			  G_CALLBACK (drawing_area_draw),
 			  view);
 
 	sw = gtk_scrolled_window_new (NULL, NULL);