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

testgtk: Upgrade alpha windows test from GtkTable to GtkGrid

Browse Source 
Also fix some extra code.
This commit is contained in:
Benjamin Otte 2011-09-28 02:25:07 +02:00
parent 41e17d92c6
commit 06440b40e2
1 changed files with 22 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
tests/testgtk.c
View File

@ -169,64 +169,38 @@ on_alpha_window_draw (GtkWidget *widget,
static GtkWidget * static GtkWidget *
build_alpha_widgets (void) build_alpha_widgets (void)
{ {
GtkWidget *table; GtkWidget *grid;
GtkWidget *radio_button; GtkWidget *radio_button;
GtkWidget *check_button;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *entry; GtkWidget *entry;
table = gtk_table_new (1, 1, FALSE); grid = gtk_grid_new ();
radio_button = gtk_radio_button_new_with_label (NULL, "Red"); radio_button = gtk_radio_button_new_with_label (NULL, "Red");
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (radio_button, TRUE);
radio_button, gtk_grid_attach (GTK_GRID (grid), radio_button, 0, 0, 1, 1);
0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Green"); radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Green");
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (radio_button, TRUE);
radio_button, gtk_grid_attach (GTK_GRID (grid), radio_button, 0, 1, 1, 1);
0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Blue"), radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Blue"),
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (radio_button, TRUE);
radio_button, gtk_grid_attach (GTK_GRID (grid), radio_button, 0, 2, 1, 1);
0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
gtk_table_attach (GTK_TABLE (table), check_button = gtk_check_button_new_with_label ("Sedentary"),
gtk_check_button_new_with_label ("Sedentary"), gtk_widget_set_hexpand (check_button, TRUE);
1, 2, 0, 1, gtk_grid_attach (GTK_GRID (grid), check_button, 1, 0, 1, 1);
GTK_EXPAND | GTK_FILL, 0,
0, 0);
gtk_table_attach (GTK_TABLE (table),
gtk_check_button_new_with_label ("Nocturnal"),
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
gtk_table_attach (GTK_TABLE (table),
gtk_check_button_new_with_label ("Compulsive"),
1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Green"); check_button = gtk_check_button_new_with_label ("Nocturnal"),
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (check_button, TRUE);
radio_button, gtk_grid_attach (GTK_GRID (grid), check_button, 1, 1, 1, 1);
0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (radio_button), "Blue"), check_button = gtk_check_button_new_with_label ("Compulsive"),
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (check_button, TRUE);
radio_button, gtk_grid_attach (GTK_GRID (grid), check_button, 1, 2, 1, 1);
0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new (NULL); label = gtk_label_new (NULL);
@ -234,13 +208,10 @@ build_alpha_widgets (void)
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
entry = gtk_entry_new (); entry = gtk_entry_new ();
gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_table_attach (GTK_TABLE (table), gtk_widget_set_hexpand (hbox, TRUE);
hbox, gtk_grid_attach (GTK_GRID (grid), hbox, 0, 3, 2, 1);
0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
return table; return grid;
} }
static void static void