AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 00:30:08 +00:00
Code Issues Projects Releases Wiki Activity

tests: Use a grid in testorientable instead of a table

Browse Source
This commit is contained in:
Benjamin Otte 2011-09-27 05:32:49 +02:00
parent 814b6c27aa
commit fa656acb63
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/testorientable.c
View File

@ -49,21 +49,21 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
GtkWidget *window; GtkWidget *window;
GtkWidget *table; GtkWidget *grid;
GtkWidget *box, *button; GtkWidget *box, *button;
GList *orientables = NULL; GList *orientables = NULL;
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
table = gtk_table_new (2, 3, FALSE); grid= gtk_grid_new ();
gtk_table_set_row_spacings (GTK_TABLE (table), 12); gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
gtk_table_set_col_spacings (GTK_TABLE (table), 12); gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
/* GtkBox */ /* GtkBox */
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
orientables = g_list_prepend (orientables, box); orientables = g_list_prepend (orientables, box);
gtk_table_attach_defaults (GTK_TABLE (table), box, 0, 1, 1, 2); gtk_grid_attach (GTK_GRID (grid), box, 0, 1, 1, 1);
gtk_box_pack_start (GTK_BOX (box), gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkBox 1"), gtk_button_new_with_label ("GtkBox 1"),
TRUE, TRUE, 0); TRUE, TRUE, 0);
@ -77,7 +77,7 @@ main (int argc, char **argv)
/* GtkButtonBox */ /* GtkButtonBox */
box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
orientables = g_list_prepend (orientables, box); orientables = g_list_prepend (orientables, box);
gtk_table_attach_defaults (GTK_TABLE (table), box, 1, 2, 1, 2); gtk_grid_attach (GTK_GRID (grid), box, 1, 1, 1, 1);
gtk_box_pack_start (GTK_BOX (box), gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkButtonBox 1"), gtk_button_new_with_label ("GtkButtonBox 1"),
TRUE, TRUE, 0); TRUE, TRUE, 0);
@ -91,15 +91,14 @@ main (int argc, char **argv)
/* GtkSeparator */ /* GtkSeparator */
box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
orientables = g_list_prepend (orientables, box); orientables = g_list_prepend (orientables, box);
gtk_table_attach_defaults (GTK_TABLE (table), box, 2, 3, 1, 2); gtk_grid_attach (GTK_GRID (grid), box, 2, 1, 1, 1);
button = gtk_toggle_button_new_with_label ("Horizontal"); button = gtk_toggle_button_new_with_label ("Horizontal");
gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
GTK_FILL, GTK_FILL, 0, 0);
g_signal_connect (button, "toggled", g_signal_connect (button, "toggled",
G_CALLBACK (orient_toggled), orientables); G_CALLBACK (orient_toggled), orientables);
gtk_container_add (GTK_CONTAINER (window), table); gtk_container_add (GTK_CONTAINER (window), grid);
gtk_widget_show_all (window); gtk_widget_show_all (window);
g_signal_connect (window, "destroy", g_signal_connect (window, "destroy",