[gtk+/rendering-cleanup-next: 131/153] testgtk: Use draw signal in resize grips example

[Benjamin Otte <otte src gnome org>]

commit 3a3e1285a7c9b4acfc480a6e8770502e1bed4f19
Author: Benjamin Otte <otte redhat com>
Date:   Thu Sep 9 02:31:38 2010 +0200

    testgtk: Use draw signal in resize grips example

 tests/testgtk.c |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/tests/testgtk.c b/tests/testgtk.c
index a5dd347..81f9f6e 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2597,20 +2597,16 @@ grippy_button_press (GtkWidget *area, GdkEventButton *event, GdkWindowEdge edge)
 }
 
 static gboolean
-grippy_expose (GtkWidget *area, GdkEventExpose *event, GdkWindowEdge edge)
+grippy_draw (GtkWidget *area, cairo_t *cr, int width, int height, GdkWindowEdge edge)
 {
-  GtkAllocation allocation;
-
-  gtk_widget_get_allocation (area, &allocation);
-  gtk_paint_resize_grip (gtk_widget_get_style (area),
-                         gtk_widget_get_window (area),
+  gtk_cairo_paint_resize_grip (gtk_widget_get_style (area),
+                         cr,
 			 gtk_widget_get_state (area),
-			 &event->area,
 			 area,
 			 "statusbar",
 			 edge,
 			 0, 0,
-                         allocation.width, allocation.height);
+                         width, height);
 
   return TRUE;
 }
@@ -2644,7 +2640,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_WEST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_WEST));
@@ -2653,7 +2649,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH));
@@ -2662,7 +2658,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_EAST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_EAST));
@@ -2674,7 +2670,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_WEST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_WEST));
@@ -2687,7 +2683,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_EAST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_EAST));
@@ -2700,7 +2696,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_WEST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_WEST));
@@ -2708,7 +2704,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH));
@@ -2717,7 +2713,7 @@ create_resize_grips (GtkWidget *widget)
       area = gtk_drawing_area_new ();
       gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
       gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
-      g_signal_connect (area, "expose_event", G_CALLBACK (grippy_expose),
+      g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_EAST));
       g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
 			GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_EAST));