Use gtk_box_new() instead gtk_[v|h]box_new()

[~andy/gtk] / modules / other / gail / tests / testlib.c

diff --git a/modules/other/gail/tests/testlib.c b/modules/other/gail/tests/testlib.c
index a3a99a92c7aa5d948159e8ced66024d9572a51e3..59fb37c9c61fc9606197e501d2982e0996c89b3f 100644 (file)
--- a/modules/other/gail/tests/testlib.c
+++ b/modules/other/gail/tests/testlib.c
@@ -572,7 +572,7 @@ _create_select_tests_window (AtkObject    *obj,
                                 FALSE);
       gtk_window_set_position (GTK_WINDOW(md[window_no]->selecttestsWindow),
                                GTK_WIN_POS_CENTER); 
-      g_signal_connect (GTK_OBJECT(md[window_no]->selecttestsWindow), 
+      g_signal_connect (md[window_no]->selecttestsWindow, 
                         "destroy",
                         G_CALLBACK (_destroy),
                         &md[window_no]->selecttestsWindow);
@@ -586,9 +586,9 @@ _create_select_tests_window (AtkObject    *obj,
                          scrolledWindow);
       
       /* Setup Layout */
-      md[window_no]->vbox = gtk_vbox_new (TRUE, 0);
+      md[window_no]->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, 0);
       md[window_no]->button = gtk_button_new_with_mnemonic ("_Run Tests");
-      hbuttonbox = gtk_hbutton_box_new ();
+      hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox),
                                  GTK_BUTTONBOX_SPREAD);
       gtk_box_pack_end (GTK_BOX (hbuttonbox),
@@ -601,7 +601,7 @@ _create_select_tests_window (AtkObject    *obj,
       testcb[window_no].runtest = runtest;
       testcb[window_no].obj = obj;
       testcb[window_no].win_num = window_no; 
-      g_signal_connect (GTK_OBJECT (md[window_no]->button), 
+      g_signal_connect (md[window_no]->button, 
                         "clicked",
                         G_CALLBACK (_testselectioncb),
                         (gpointer)&testcb[window_no]);
@@ -645,7 +645,7 @@ add_test (gint   window,
     return FALSE;
   else
     {
-      md[window]->hbox = gtk_hbox_new (FALSE, 0);
+      md[window]->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
       gtk_box_set_spacing (GTK_BOX (md[window]->hbox), 10);
       gtk_container_set_border_width (GTK_CONTAINER (md[window]->hbox), 10);
       gtk_container_add (GTK_CONTAINER (md[window]->vbox), md[window]->hbox);
@@ -674,7 +674,7 @@ add_test (gint   window,
          gtk_widget_show (listoftests[window][testcount[window]].parameterLabel[i]);
          gtk_widget_show (listoftests[window][testcount[window]].parameterInput[i]);
         }
-      g_signal_connect (GTK_OBJECT (listoftests[window][testcount[window]].toggleButton),
+      g_signal_connect (listoftests[window][testcount[window]].toggleButton,
                         "toggled",
                         G_CALLBACK (_toggle_selectedcb),
                         (gpointer)&(listoftests[window][testcount[window]]));
@@ -713,7 +713,7 @@ gchar **tests_set(gint window, int *count)
   for (i = 0; i < testcount[window]; i++)
     {
       nullparam = FALSE;
-      if (GTK_TOGGLE_BUTTON(listoftests[window][i].toggleButton)->active)
+      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (listoftests[window][i].toggleButton)))
         {
           num = listoftests[window][i].numParameters;
           for (j = 0; j < num; j++)