callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gail: Fix tests compilation - too many casts

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-28 18:26:31 +02:00
parent 65dee4e31b
commit d9c581900b
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/other/gail/tests/ferret.c
View File

@ -964,7 +964,7 @@ _print_action (AtkAction *aobject)
nv->atkobj = ATK_OBJECT(aobject); nv->atkobj = ATK_OBJECT(aobject);
nv->action_num = j; 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); "clicked", G_CALLBACK (_action_cb), nv);
g_free(label_str); g_free(label_str);
@ -1597,10 +1597,10 @@ _create_notebook (void)
tab = nbook_tabs[VALUE]; tab = nbook_tabs[VALUE];
_add_notebook_page (notebook, tab->main_box, &tab->page, "<b>_Value</b>"); _add_notebook_page (notebook, tab->main_box, &tab->page, "<b>_Value</b>");
g_signal_connect (GTK_OBJECT (notebook), g_signal_connect (notebook,
"switch-page", "switch-page",
G_CALLBACK (_update_current_page), G_CALLBACK (_update_current_page),
NULL); NULL);
} }
static void static void
@ -1667,9 +1667,9 @@ _create_window (void)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (window, "Ferret Window"); gtk_widget_set_name (window, "Ferret Window");
g_signal_connect (GTK_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), G_CALLBACK (gtk_widget_destroyed),
&window); &window);
gtk_window_set_title (GTK_WINDOW (window), "GTK+ Ferret Output"); gtk_window_set_title (GTK_WINDOW (window), "GTK+ Ferret Output");
gtk_window_set_default_size (GTK_WINDOW (window), 333, 550); gtk_window_set_default_size (GTK_WINDOW (window), 333, 550);
@ -1724,7 +1724,7 @@ _add_menu(GtkWidget ** menu, GtkWidget ** menuitem, gchar * name,
GTK_CHECK_MENU_ITEM(*menuitem), init_value); GTK_CHECK_MENU_ITEM(*menuitem), init_value);
gtk_menu_shell_append (GTK_MENU_SHELL (*menu), *menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (*menu), *menuitem);
gtk_widget_show(*menuitem); gtk_widget_show(*menuitem);
g_signal_connect(GTK_OBJECT(*menuitem), "toggled", func, NULL); g_signal_connect(*menuitem, "toggled", func, NULL);
} }
int int

2
modules/other/gail/tests/testbutton.c
View File

@ -65,7 +65,7 @@ _check_object (AtkObject *obj)
g_assert (GTK_IS_ACCESSIBLE (atk_button)); g_assert (GTK_IS_ACCESSIBLE (atk_button));
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_button)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_button));
g_assert (GTK_IS_BUTTON (widget)); g_assert (GTK_IS_BUTTON (widget));
g_signal_connect (GTK_OBJECT (widget), g_signal_connect (widget,
"pressed", "pressed",
G_CALLBACK (button_pressed_handler), G_CALLBACK (button_pressed_handler),
NULL); NULL);

4
modules/other/gail/tests/testimage.c
View File

@ -53,13 +53,13 @@ static void _check_arrows (AtkObject *obj)
gtk_box_pack_start(GTK_BOX (content_area), md->arrow2, TRUE,TRUE, 0); gtk_box_pack_start(GTK_BOX (content_area), md->arrow2, TRUE,TRUE, 0);
gtk_box_pack_start(GTK_BOX (content_area), md->arrow3, TRUE,TRUE, 0); gtk_box_pack_start(GTK_BOX (content_area), md->arrow3, TRUE,TRUE, 0);
gtk_box_pack_start(GTK_BOX (content_area), md->arrow4, TRUE,TRUE, 0); gtk_box_pack_start(GTK_BOX (content_area), md->arrow4, TRUE,TRUE, 0);
g_signal_connect(GTK_OBJECT(md->dialog), "destroy", g_signal_connect(md->dialog, "destroy",
G_CALLBACK (destroy), md->dialog); G_CALLBACK (destroy), md->dialog);
md->image = GTK_IMAGE(gtk_image_new_from_file("circles.xbm")); md->image = GTK_IMAGE(gtk_image_new_from_file("circles.xbm"));
gtk_box_pack_start(GTK_BOX (content_area), GTK_WIDGET(md->image), TRUE,TRUE, 0); gtk_box_pack_start(GTK_BOX (content_area), GTK_WIDGET(md->image), TRUE,TRUE, 0);
md->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); md->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
g_signal_connect(GTK_OBJECT(md->close_button), "clicked", g_signal_connect(md->close_button, "clicked",
G_CALLBACK (destroy), md->dialog); G_CALLBACK (destroy), md->dialog);
gtk_box_pack_start(GTK_BOX (action_area), md->close_button, TRUE,TRUE, 0); gtk_box_pack_start(GTK_BOX (action_area), md->close_button, TRUE,TRUE, 0);

6
modules/other/gail/tests/testlib.c
View File

@ -572,7 +572,7 @@ _create_select_tests_window (AtkObject *obj,
FALSE); FALSE);
gtk_window_set_position (GTK_WINDOW(md[window_no]->selecttestsWindow), gtk_window_set_position (GTK_WINDOW(md[window_no]->selecttestsWindow),
GTK_WIN_POS_CENTER); GTK_WIN_POS_CENTER);
g_signal_connect (GTK_OBJECT(md[window_no]->selecttestsWindow), g_signal_connect (md[window_no]->selecttestsWindow,
"destroy", "destroy",
G_CALLBACK (_destroy), G_CALLBACK (_destroy),
&md[window_no]->selecttestsWindow); &md[window_no]->selecttestsWindow);
@ -601,7 +601,7 @@ _create_select_tests_window (AtkObject *obj,
testcb[window_no].runtest = runtest; testcb[window_no].runtest = runtest;
testcb[window_no].obj = obj; testcb[window_no].obj = obj;
testcb[window_no].win_num = window_no; testcb[window_no].win_num = window_no;
g_signal_connect (GTK_OBJECT (md[window_no]->button), g_signal_connect (md[window_no]->button,
"clicked", "clicked",
G_CALLBACK (_testselectioncb), G_CALLBACK (_testselectioncb),
(gpointer)&testcb[window_no]); (gpointer)&testcb[window_no]);
@ -674,7 +674,7 @@ add_test (gint window,
gtk_widget_show (listoftests[window][testcount[window]].parameterLabel[i]); gtk_widget_show (listoftests[window][testcount[window]].parameterLabel[i]);
gtk_widget_show (listoftests[window][testcount[window]].parameterInput[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", "toggled",
G_CALLBACK (_toggle_selectedcb), G_CALLBACK (_toggle_selectedcb),
(gpointer)&(listoftests[window][testcount[window]])); (gpointer)&(listoftests[window][testcount[window]]));

4
modules/other/gail/tests/testtable.c
View File

@ -760,7 +760,7 @@ void test_choice_gui(AtkObject **obj)
window = gtk_window_new(GTK_WINDOW_TOPLEVEL); window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "Test to run"); gtk_window_set_title(GTK_WINDOW(window), "Test to run");
g_signal_connect(GTK_OBJECT (window), "destroy", g_signal_connect(window, "destroy",
G_CALLBACK (destroy), &window); G_CALLBACK (destroy), &window);
vbox = gtk_vbox_new(TRUE, 0); vbox = gtk_vbox_new(TRUE, 0);
@ -818,7 +818,7 @@ void test_choice_gui(AtkObject **obj)
GTK_BUTTONBOX_SPREAD); GTK_BUTTONBOX_SPREAD);
gtk_box_pack_end (GTK_BOX (hbuttonbox), GTK_WIDGET (button), TRUE, TRUE, 0); gtk_box_pack_end (GTK_BOX (hbuttonbox), GTK_WIDGET (button), TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0); gtk_box_pack_end (GTK_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK (choicecb), obj); g_signal_connect(button, "clicked", G_CALLBACK (choicecb), obj);
gtk_container_add(GTK_CONTAINER(window), vbox); gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_widget_show(vbox); gtk_widget_show(vbox);