AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: remove unused GTK_BUTTONBOX_DEFAULT_STYLE from gtkenums.h tests: remove GTK_BUTTONBOX_DEFAULT_STYLE from testbbox.c and fix crashing

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=721317
This commit is contained in:
Clayton Walker 2014-01-02 00:38:37 +01:00 committed by Matthias Clasen
parent 64855f1295
commit 568e867dad
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/gtkenums.h
View File

@ -155,7 +155,6 @@ typedef enum
/**
* GtkButtonBoxStyle:
* @GTK_BUTTONBOX_DEFAULT_STYLE: Default packing.
* @GTK_BUTTONBOX_SPREAD: Buttons are evenly spread across the box.
* @GTK_BUTTONBOX_EDGE: Buttons are placed at the edges of the box.
* @GTK_BUTTONBOX_START: Buttons are grouped towards the start of the box,

31
tests/testbbox.c
View File

@ -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);