Stop using gtk_box_pack_end

It might soon go away!

1 files changed, 32 insertions, 32 deletions

diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index f93bb56f7f..499d101389 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -491,7 +491,7 @@ create_calendar(void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
   frame = create_frame ("<b>Options</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (rpane), frame);
+  gtk_container_add (GTK_CONTAINER (rpane), frame);
   size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   context = gtk_widget_get_style_context (calendar);
@@ -512,9 +512,9 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label);
-  gtk_box_pack_start (GTK_BOX (hbox), button);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
   /* Build the width entry */
 
@@ -533,9 +533,9 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label);
-  gtk_box_pack_start (GTK_BOX (hbox), button);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
   /* Build the height entry */
 
@@ -554,15 +554,15 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label);
-  gtk_box_pack_start (GTK_BOX (hbox), button);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
   /* Build the right details frame */
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
   frame = create_frame ("<b>Details</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_FILL);
-  gtk_box_pack_start (GTK_BOX (rpane), frame);
+  gtk_container_add (GTK_CONTAINER (rpane), frame);
 
   details = gtk_text_view_new();
   calendar_data.details_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (details));
@@ -580,12 +580,12 @@ create_calendar(void)
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
 
-  gtk_box_pack_start (GTK_BOX (vbox), scroller);
+  gtk_container_add (GTK_CONTAINER (vbox), scroller);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
   gtk_widget_set_halign (hbox, GTK_ALIGN_START);
   gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
   button = gtk_button_new_with_mnemonic ("Demonstrate _Details");
 
@@ -594,7 +594,7 @@ create_calendar(void)
                             G_CALLBACK (demonstrate_details),
                             &calendar_data);
 
-  gtk_box_pack_start (GTK_BOX (hbox), button);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
 
   button = gtk_button_new_with_mnemonic ("_Reset Details");
 
@@ -603,24 +603,24 @@ create_calendar(void)
                             G_CALLBACK (reset_details),
                             &calendar_data);
 
-  gtk_box_pack_start (GTK_BOX (hbox), button);
+  gtk_container_add (GTK_CONTAINER (hbox), button);
 
   toggle = gtk_check_button_new_with_mnemonic ("_Use Details");
   g_signal_connect (toggle, "toggled",
                     G_CALLBACK(calendar_toggle_details),
                     &calendar_data);
-  gtk_box_pack_start (GTK_BOX (vbox), toggle);
+  gtk_container_add (GTK_CONTAINER (vbox), toggle);
 
   /* Build the Right frame with the flags in */
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   frame = create_expander ("<b>Flags</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (rpane), frame);
+  gtk_container_add (GTK_CONTAINER (rpane), frame);
 
   for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++)
     {
       toggle = gtk_check_button_new_with_mnemonic(flags[i].label);
-      gtk_box_pack_start (GTK_BOX (vbox), toggle);
+      gtk_container_add (GTK_CONTAINER (vbox), toggle);
       calendar_data.flag_checkboxes[i] = toggle;
 
       g_signal_connect (toggle, "toggled",
@@ -639,25 +639,25 @@ create_calendar(void)
   frame = create_frame ("<b>Signal Events</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
   label = gtk_label_new ("Signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
   calendar_data.last_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig);
+  gtk_container_add (GTK_CONTAINER (hbox), calendar_data.last_sig);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
   label = gtk_label_new ("Previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
   calendar_data.prev_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig);
+  gtk_container_add (GTK_CONTAINER (hbox), calendar_data.prev_sig);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (vbox), hbox);
   label = gtk_label_new ("Second previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label);
+  gtk_container_add (GTK_CONTAINER (hbox), label);
   calendar_data.prev2_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig);
+  gtk_container_add (GTK_CONTAINER (hbox), calendar_data.prev2_sig);
 
   /*
    *  Glue everything together
@@ -672,11 +672,11 @@ create_calendar(void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
 
-  gtk_box_pack_start (GTK_BOX (vbox), hpaned);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
-  gtk_box_pack_start (GTK_BOX (vbox), frame);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
-  gtk_box_pack_start (GTK_BOX (vbox), bbox);
+  gtk_container_add (GTK_CONTAINER (vbox), hpaned);
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (vbox), frame);
+  gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+  gtk_container_add (GTK_CONTAINER (vbox), bbox);
 
   gtk_container_add (GTK_CONTAINER (window), vbox);