gtk: remove "gboolean homogeneous" from gtk_box_new()

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

diff --git a/modules/other/gail/tests/ferret.c b/modules/other/gail/tests/ferret.c
index d6754f263034c24628cdf89ea8a39af0e33ada9f..cb9db66df069c416f72826e7a8a1d195b1666632 100644 (file)
--- a/modules/other/gail/tests/ferret.c
+++ b/modules/other/gail/tests/ferret.c
@@ -1,6 +1,4 @@
 #define MAX_BUFFER 256
-#undef GTK_DISABLE_DEPRECATED
-#define GTK_ENABLE_BROKEN
 #define MAX_GROUPS 20
 #define MAX_NAME_VALUE 20
 
@@ -576,10 +574,11 @@ _object_is_ours (AtkObject *aobject)
    */
    if (aobject != NULL)
      {
-       if (GTK_ACCESSIBLE(toplevel)->widget == mainWindow)
-         {
+       GtkWidget *widget;
+
+       widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (toplevel));
+       if (widget == mainWindow)
            return TRUE;
-         }
      }
 
   return FALSE;
@@ -617,6 +616,7 @@ ferret_get_name_from_container (AtkObject *aobject)
 static gint
 _print_object (AtkObject *aobject)
 {
+    GtkWidget *widget;
     G_CONST_RETURN gchar * parent_name = NULL;
     G_CONST_RETURN gchar * name = NULL;
     G_CONST_RETURN gchar * description = NULL;
@@ -656,11 +656,11 @@ _print_object (AtkObject *aobject)
         accel_name = "";
       }
 
-    if (GTK_IS_ACCESSIBLE (aobject) &&
-        GTK_IS_WIDGET (GTK_ACCESSIBLE (aobject)->widget))
+    widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (aobject));
+    if (widget)
       {
         _print_key_value(tab_n, group_num, "Widget name",
-          (gpointer)gtk_widget_get_name(GTK_ACCESSIBLE (aobject)->widget),
+          (gpointer)gtk_widget_get_name (widget),
           VALUE_STRING);
       }
     else
@@ -964,7 +964,7 @@ _print_action (AtkAction *aobject)
 
         nv->atkobj = ATK_OBJECT(aobject);
         nv->action_num = j;
-        nv->signal_id = g_signal_connect (GTK_OBJECT (nv->button),
+        nv->signal_id = g_signal_connect (nv->button,
           "clicked", G_CALLBACK (_action_cb), nv);
 
         g_free(label_str);
@@ -1479,7 +1479,7 @@ _mouse_watcher (GSignalInvocationHint *ihint,
     widget = GTK_WIDGET (object);
     if (GTK_IS_WINDOW (widget))
     {
-        GtkWidget *focus_widget = GTK_WINDOW (widget)->focus_widget;
+        GtkWidget *focus_widget = gtk_window_get_focus (GTK_WINDOW (widget));
         if (focus_widget != NULL)
             widget = focus_widget;
     }
@@ -1558,7 +1558,7 @@ static void _add_notebook_page (GtkNotebook *nbook,
     }
   else
     {
-      *new_page = gtk_vpaned_new ();
+      *new_page = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
     }
 
   label = gtk_label_new ("");
@@ -1597,10 +1597,10 @@ _create_notebook (void)
   tab = nbook_tabs[VALUE];
   _add_notebook_page (notebook, tab->main_box, &tab->page, "<b>_Value</b>");
 
-  g_signal_connect (GTK_OBJECT (notebook),
-                      "switch-page",
-                      G_CALLBACK (_update_current_page),
-                      NULL);
+  g_signal_connect (notebook,
+                    "switch-page",
+                    G_CALLBACK (_update_current_page),
+                    NULL);
 }
 
 static void
@@ -1610,49 +1610,49 @@ _init_data(void)
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Object";
   nbook_tabs[OBJECT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Action";
   nbook_tabs[ACTION] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Component";
   nbook_tabs[COMPONENT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Image";
   nbook_tabs[IMAGE] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Selection";
   nbook_tabs[SELECTION] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Table";
   nbook_tabs[TABLE] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Text";
   nbook_tabs[TEXT] = the_tab;
 
   the_tab = g_new0(TabInfo, 1);
   the_tab->page = NULL;
-  the_tab->main_box = gtk_vbox_new(FALSE, 20);
+  the_tab->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
   the_tab->name = "Value";
   nbook_tabs[VALUE] = the_tab;
 }
@@ -1667,15 +1667,15 @@ _create_window (void)
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         gtk_widget_set_name (window, "Ferret Window");
 
-        g_signal_connect (GTK_OBJECT (window), "destroy",
-                           G_CALLBACK (gtk_widget_destroyed),
-                           &window);
+        g_signal_connect (window, "destroy",
+                          G_CALLBACK (gtk_widget_destroyed),
+                          &window);
 
         gtk_window_set_title (GTK_WINDOW (window), "GTK+ Ferret Output");
         gtk_window_set_default_size (GTK_WINDOW (window), 333, 550);
         gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-        vbox1 = gtk_vbox_new (FALSE, 0);
+        vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (window), vbox1);
         gtk_widget_show (vbox1);
 
@@ -1724,7 +1724,7 @@ _add_menu(GtkWidget ** menu, GtkWidget ** menuitem, gchar * name,
       GTK_CHECK_MENU_ITEM(*menuitem), init_value);
     gtk_menu_shell_append (GTK_MENU_SHELL (*menu), *menuitem);
     gtk_widget_show(*menuitem);
-    g_signal_connect(GTK_OBJECT(*menuitem), "toggled", func, NULL);
+    g_signal_connect(*menuitem, "toggled", func, NULL);
 }
 
 int
@@ -1875,7 +1875,7 @@ _get_group(TabInfo *tab, GroupId group_id, const gchar *groupname)
        gtk_container_set_border_width(GTK_CONTAINER(group->frame), 10);
 
        group->name = g_strdup(groupname);
-       group->group_vbox = GTK_VBOX(gtk_vbox_new(FALSE, 10));
+       group->group_vbox = GTK_VBOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 10));
 
        if (group->is_scrolled)
          {
@@ -1971,9 +1971,9 @@ _get_name_value(GroupInfo *group, const gchar *label,
     if (!found)
       {
         name_value = (NameValue *)g_new0(NameValue, 1);
-        name_value->column1 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
-        name_value->column2 = GTK_HBOX(gtk_hbox_new(FALSE, 10));
-        name_value->hbox = GTK_HBOX(gtk_hbox_new(FALSE, 5));
+        name_value->column1 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10));
+        name_value->column2 = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10));
+        name_value->hbox = GTK_HBOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5));
         name_value->label = GTK_LABEL(gtk_label_new(label));
         name_value->string = gtk_label_new (NULL);
         name_value->boolean = gtk_check_button_new ();
@@ -2610,7 +2610,7 @@ void _action_cb(GtkWidget *widget, gpointer  *userdata)
 void _toggle_terminal(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
        display_ascii = TRUE;
    else
        display_ascii = FALSE;
@@ -2619,7 +2619,7 @@ void _toggle_terminal(GtkCheckMenuItem *checkmenuitem,
 void _toggle_no_signals(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
        no_signals = TRUE;
    else
        no_signals = FALSE;
@@ -2628,7 +2628,7 @@ void _toggle_no_signals(GtkCheckMenuItem *checkmenuitem,
 void _toggle_magnifier(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
        use_magnifier = TRUE;
    else
        use_magnifier = FALSE;
@@ -2637,7 +2637,7 @@ void _toggle_magnifier(GtkCheckMenuItem *checkmenuitem,
 void _toggle_festival(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
        use_festival = TRUE;
    else
        use_festival = FALSE;
@@ -2646,7 +2646,7 @@ void _toggle_festival(GtkCheckMenuItem *checkmenuitem,
 void _toggle_festival_terse(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
      {
         say_role = FALSE;
         say_accel = FALSE;
@@ -2661,7 +2661,7 @@ void _toggle_festival_terse(GtkCheckMenuItem *checkmenuitem,
 void _toggle_trackmouse(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
      {
         mouse_watcher_focus_id =
           atk_add_global_event_listener(_mouse_watcher,
@@ -2685,7 +2685,7 @@ void _toggle_trackmouse(GtkCheckMenuItem *checkmenuitem,
 void _toggle_trackfocus(GtkCheckMenuItem *checkmenuitem,
   gpointer user_data)
 {
-   if (checkmenuitem->active)
+   if (gtk_check_menu_item_get_active (checkmenuitem))
      {
        track_focus = TRUE;
        focus_tracker_id = atk_add_focus_tracker (_print_accessible);