gtk: remove "gboolean homogeneous" from gtk_box_new()

[~andy/gtk] / tests / testtooltips.c

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 35a7de0febf37b27c1092518483b54d325b4e27d..9cb1fcc0555f8bdb280e62f981e28ca616c0e6a6 100644 (file)
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -205,23 +205,14 @@ query_tooltip_drawing_area_cb (GtkWidget  *widget,
 }
 
 static gboolean
-drawing_area_expose (GtkWidget      *drawing_area,
-                    GdkEventExpose *event,
-                    gpointer        data)
+drawing_area_draw (GtkWidget *drawing_area,
+                  cairo_t   *cr,
+                  gpointer   data)
 {
-  GtkAllocation allocation;
-  GdkWindow *window;
   gint i;
-  cairo_t *cr;
 
-  window =  gtk_widget_get_window (drawing_area);
-
-  cr = gdk_cairo_create (window);
-
-  gtk_widget_get_allocation (drawing_area, &allocation);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
   cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-  cairo_fill (cr);
+  cairo_paint (cr);
 
   for (i = 0; i < G_N_ELEMENTS (rectangles); i++)
     {
@@ -236,8 +227,6 @@ drawing_area_expose (GtkWidget      *drawing_area,
       cairo_fill (cr);
     }
 
-  cairo_destroy (cr);
-
   return FALSE;
 }
 
@@ -286,7 +275,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "delete_event",
                    G_CALLBACK (gtk_main_quit), NULL);
 
-  box = gtk_vbox_new (FALSE, 3);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_container_add (GTK_CONTAINER (window), box);
 
   /* A check button using the tooltip-markup property */
@@ -402,8 +391,8 @@ main (int argc, char *argv[])
   drawing_area = gtk_drawing_area_new ();
   gtk_widget_set_size_request (drawing_area, 320, 240);
   g_object_set (drawing_area, "has-tooltip", TRUE, NULL);
-  g_signal_connect (drawing_area, "expose_event",
-                   G_CALLBACK (drawing_area_expose), NULL);
+  g_signal_connect (drawing_area, "draw",
+                   G_CALLBACK (drawing_area_draw), NULL);
   g_signal_connect (drawing_area, "query-tooltip",
                    G_CALLBACK (query_tooltip_drawing_area_cb), NULL);
   gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE, FALSE, 2);