reftests: add a reftest for the CSS :only-child selector

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

diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index e4d2b8c9e289f98d0b8b89d83ac23823335d710d..291caaf7355966b89db91b696e89f5b48d0641f6 100644 (file)
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -84,8 +84,7 @@ ebox_draw_cb (GtkWidget *widget,
   gtk_widget_translate_coordinates (label, widget, 0, 0, &x, &y);
   layout = gtk_widget_create_pango_layout (widget, "");
 
-  gtk_size_request_get_size (GTK_SIZE_REQUEST (label), 
-                            &minimum_size, &natural_size); 
+  gtk_widget_get_preferred_size (label, &minimum_size, &natural_size); 
 
   pango_layout_set_markup (layout,
     "<span color='#c33'>\342\227\217 requisition</span>\n"
@@ -134,17 +133,18 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  combo = gtk_combo_box_new_text ();
-  scale = gtk_hscale_new_with_range (0, 360, 1);
+  combo = gtk_combo_box_text_new ();
+  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                    0, 360, 1);
   label = gtk_label_new ("This label may be ellipsized\nto make it fit.");
 
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "NONE");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "START");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "MIDDLE");
-  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), "END");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "NONE");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "START");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "MIDDLE");
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "END");
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
 
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);