Clean up buffer handling a bit

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

diff --git a/tests/testgrid.c b/tests/testgrid.c
index 76d1a8cb526ac956413db6544507bf0581fdaa7e..a59aefeee9c3a6f2caad9f5f203b958d85ff8596 100644 (file)
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -5,13 +5,13 @@ oriented_test_widget (const gchar *label, const gchar *color, gdouble angle)
 {
   GtkWidget *box;
   GtkWidget *widget;
-  GdkColor c;
+  GdkRGBA c;
 
   widget = gtk_label_new (label);
   gtk_label_set_angle (GTK_LABEL (widget), angle);
   box = gtk_event_box_new ();
-  gdk_color_parse (color, &c);
-  gtk_widget_modify_bg (box, GTK_STATE_NORMAL, &c);
+  gdk_rgba_parse (&c, color);
+  gtk_widget_override_background_color (box, 0, &c);
   gtk_container_add (GTK_CONTAINER (box), widget);
 
   return box;
@@ -78,7 +78,7 @@ text_grid (void)
   paned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (window), paned1);
 
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_paned_pack1 (GTK_PANED (paned1), box, TRUE, FALSE);
   gtk_paned_pack2 (GTK_PANED (paned1), gtk_label_new ("Space"), TRUE, FALSE);
 
@@ -117,13 +117,13 @@ box_comparison (void)
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Grid vs. Box");
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   gtk_container_add (GTK_CONTAINER (vbox), gtk_label_new ("Above"));
   gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
 
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0, FALSE);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (vbox), box);
 
   gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE, 0);