diff options
| author | Clayton Walker <clayton.m.walker@gmail.com> | 2014-01-02 00:38:37 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-01-04 13:56:42 -0500 |
| commit | 568e867dad4bbea600b12333b86b358944c24d13 (patch) | |
| tree | a53fb8e06af3bad357beecc54407748b07352b22 /tests | |
| parent | 64855f129579a632fc1a5deb217ab0a0c66039ec (diff) | |
| download | gtk+-568e867dad4bbea600b12333b86b358944c24d13.tar.gz | |
gtk: remove unused GTK_BUTTONBOX_DEFAULT_STYLE from gtkenums.h tests: remove GTK_BUTTONBOX_DEFAULT_STYLE from testbbox.c and fix crashing
https://bugzilla.gnome.org/show_bug.cgi?id=721317
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testbbox.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/tests/testbbox.c b/tests/testbbox.c index 1edade5922..a56be68126 100644 --- a/tests/testbbox.c +++ b/tests/testbbox.c @@ -23,8 +23,7 @@ GtkWidget *bbox = NULL; GtkWidget *hbbox = NULL, *vbbox = NULL; -static const char* styles[] = { "GTK_BUTTONBOX_DEFAULT_STYLE", - "GTK_BUTTONBOX_SPREAD", +static const char* styles[] = { "GTK_BUTTONBOX_SPREAD", "GTK_BUTTONBOX_EDGE", "GTK_BUTTONBOX_START", "GTK_BUTTONBOX_END", @@ -51,16 +50,10 @@ static void combo_changed_cb (GtkComboBoxText *combo, gpointer user_data) { - char *text; - int i; - - text = gtk_combo_box_text_get_active_text (combo); - - for (i = 0; styles[i]; i++) { - if (g_str_equal (text, styles[i])) { - gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), (GtkButtonBoxStyle)i); - } - } + gint active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + + gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), + (GtkButtonBoxStyle) (active + 1)); } static void @@ -82,19 +75,19 @@ combo_types_changed_cb (GtkComboBoxText *combo, char *text; GtkWidget *old_parent, *new_parent; GtkButtonBoxStyle style; - - text = gtk_combo_box_text_get_active_text (combo); - - if (g_str_equal (text, "GtkHButtonBox")) { + + gint active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); + + if (active == GTK_ORIENTATION_HORIZONTAL) { old_parent = vbbox; new_parent = hbbox; } else { old_parent = hbbox; new_parent = vbbox; } - + bbox = new_parent; - + for (i = 0; i < N_BUTTONS; i++) { reparent_widget (buttons[i], old_parent, new_parent); } @@ -144,6 +137,8 @@ main (int argc, } bbox = hbbox; + + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD); /* GtkVButtonBox */ vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); |