X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftesttooltips.c;h=483b8fd2a3b09f0b084e405810e9ea14356557b4;hb=fc27f0737eb23266f09b3c11d6c5c341c644aafc;hp=8aee9583e66ccd48b1c35c32444c5739c5265bee;hpb=d219adfa5a4b13fa48cd173c0f47cce76f3cc247;p=~andy%2Fgtk

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 8aee9583e..483b8fd2a 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -46,10 +46,10 @@ query_tooltip_custom_cb (GtkWidget  *widget,
 			 GtkTooltip *tooltip,
 			 gpointer    data)
 {
-  GdkColor color = { 0, 0, 65535 };
+  GdkRGBA color = { 0, 0, 1, 1 };
   GtkWindow *window = gtk_widget_get_tooltip_window (widget);
 
-  gtk_widget_modify_bg (GTK_WIDGET (window), GTK_STATE_NORMAL, &color);
+  gtk_widget_override_background_color (GTK_WIDGET (window), 0, &color);
 
   return TRUE;
 }
@@ -205,22 +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)
 {
   gint i;
-  cairo_t *cr;
 
-  gdk_window_get_pointer (drawing_area->window, NULL, NULL, NULL);
-
-  cr = gdk_cairo_create (drawing_area->window);
-
-  cairo_rectangle (cr, 0, 0,
-		   drawing_area->allocation.width,
-		   drawing_area->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++)
     {
@@ -235,8 +227,6 @@ drawing_area_expose (GtkWidget      *drawing_area,
       cairo_fill (cr);
     }
 
-  cairo_destroy (cr);
-
   return FALSE;
 }
 
@@ -285,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 */
@@ -369,7 +359,7 @@ main (int argc, char *argv[])
   /* Set a tooltip on the column */
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), 0);
   gtk_tree_view_column_set_clickable (column, TRUE);
-  g_object_set (column->button, "tooltip-text", "Header", NULL);
+  g_object_set (gtk_tree_view_column_get_button (column), "tooltip-text", "Header", NULL);
 
   gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE, FALSE, 2);
 
@@ -401,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);