Commit 2615ebf3 authored by Javier Jardon's avatar Javier Jardon Committed by Tristan Van Berkom

Use gtk_button_box_new() instead gtk_[v|h]_button_box_new()

parent 34627a63
...@@ -18,9 +18,9 @@ create_bbox (gint horizontal, ...@@ -18,9 +18,9 @@ create_bbox (gint horizontal,
frame = gtk_frame_new (title); frame = gtk_frame_new (title);
if (horizontal) if (horizontal)
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
else else
bbox = gtk_vbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_container_add (GTK_CONTAINER (frame), bbox);
......
...@@ -16,9 +16,9 @@ static GtkWidget *create_bbox( gint horizontal, ...@@ -16,9 +16,9 @@ static GtkWidget *create_bbox( gint horizontal,
frame = gtk_frame_new (title); frame = gtk_frame_new (title);
if (horizontal) if (horizontal)
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
else else
bbox = gtk_vbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_container_add (GTK_CONTAINER (frame), bbox);
......
...@@ -286,7 +286,7 @@ static void create_calendar( void ) ...@@ -286,7 +286,7 @@ static void create_calendar( void )
hbox = gtk_hbox_new (FALSE, DEF_PAD); hbox = gtk_hbox_new (FALSE, DEF_PAD);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
hbbox = gtk_hbutton_box_new (); hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD); gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
gtk_box_set_spacing (GTK_BOX (hbbox), 5); gtk_box_set_spacing (GTK_BOX (hbbox), 5);
...@@ -384,7 +384,7 @@ static void create_calendar( void ) ...@@ -384,7 +384,7 @@ static void create_calendar( void )
calendar_data.prev2_sig = gtk_label_new (""); calendar_data.prev2_sig = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
......
...@@ -262,7 +262,7 @@ gtk_dialog_init (GtkDialog *dialog) ...@@ -262,7 +262,7 @@ gtk_dialog_init (GtkDialog *dialog)
gtk_container_add (GTK_CONTAINER (dialog), priv->vbox); gtk_container_add (GTK_CONTAINER (dialog), priv->vbox);
gtk_widget_show (priv->vbox); gtk_widget_show (priv->vbox);
priv->action_area = gtk_hbutton_box_new (); priv->action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->action_area), gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->action_area),
GTK_BUTTONBOX_END); GTK_BUTTONBOX_END);
......
...@@ -616,7 +616,7 @@ gtk_info_bar_init (GtkInfoBar *info_bar) ...@@ -616,7 +616,7 @@ gtk_info_bar_init (GtkInfoBar *info_bar)
gtk_widget_show (content_area); gtk_widget_show (content_area);
gtk_box_pack_start (GTK_BOX (info_bar), content_area, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (info_bar), content_area, TRUE, TRUE, 0);
action_area = gtk_vbutton_box_new (); action_area = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_widget_show (action_area); gtk_widget_show (action_area);
gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END); gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
gtk_box_pack_start (GTK_BOX (info_bar), action_area, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (info_bar), action_area, FALSE, TRUE, 0);
......
...@@ -588,7 +588,7 @@ _create_select_tests_window (AtkObject *obj, ...@@ -588,7 +588,7 @@ _create_select_tests_window (AtkObject *obj,
/* Setup Layout */ /* Setup Layout */
md[window_no]->vbox = gtk_vbox_new (TRUE, 0); md[window_no]->vbox = gtk_vbox_new (TRUE, 0);
md[window_no]->button = gtk_button_new_with_mnemonic ("_Run Tests"); md[window_no]->button = gtk_button_new_with_mnemonic ("_Run Tests");
hbuttonbox = gtk_hbutton_box_new (); hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox),
GTK_BUTTONBOX_SPREAD); GTK_BUTTONBOX_SPREAD);
gtk_box_pack_end (GTK_BOX (hbuttonbox), gtk_box_pack_end (GTK_BOX (hbuttonbox),
......
...@@ -137,7 +137,7 @@ main (int argc, ...@@ -137,7 +137,7 @@ main (int argc,
/* GtkHButtonBox */ /* GtkHButtonBox */
hbbox = gtk_hbutton_box_new (); hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE, 5); gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE, 5);
for (i = 0; i < N_BUTTONS; i++) { for (i = 0; i < N_BUTTONS; i++) {
...@@ -148,7 +148,7 @@ main (int argc, ...@@ -148,7 +148,7 @@ main (int argc,
bbox = hbbox; bbox = hbbox;
/* GtkVButtonBox */ /* GtkVButtonBox */
vbbox = gtk_vbutton_box_new (); vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE, 5); gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE, 5);
/* Options */ /* Options */
......
...@@ -642,7 +642,7 @@ create_calendar(void) ...@@ -642,7 +642,7 @@ create_calendar(void)
* Glue everything together * Glue everything together
*/ */
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
button = gtk_button_new_with_label ("Close"); button = gtk_button_new_with_label ("Close");
......
...@@ -644,7 +644,7 @@ main (int argc, char **argv) ...@@ -644,7 +644,7 @@ main (int argc, char **argv)
control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
vbbox = gtk_vbutton_box_new (); vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (control_window), vbbox); gtk_container_add (GTK_CONTAINER (control_window), vbbox);
button = gtk_button_new_with_mnemonic ("_Select all"); button = gtk_button_new_with_mnemonic ("_Select all");
......
...@@ -1088,9 +1088,9 @@ create_bbox (gint horizontal, ...@@ -1088,9 +1088,9 @@ create_bbox (gint horizontal,
frame = gtk_frame_new (title); frame = gtk_frame_new (title);
if (horizontal) if (horizontal)
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
else else
bbox = gtk_vbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_container_add (GTK_CONTAINER (frame), bbox);
...@@ -5194,7 +5194,7 @@ create_forward_back (const char *title, ...@@ -5194,7 +5194,7 @@ create_forward_back (const char *title,
GtkTextDirection text_dir) GtkTextDirection text_dir)
{ {
GtkWidget *frame = gtk_frame_new (title); GtkWidget *frame = gtk_frame_new (title);
GtkWidget *bbox = gtk_hbutton_box_new (); GtkWidget *bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
GtkWidget *back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK); GtkWidget *back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
GtkWidget *forward_button = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD); GtkWidget *forward_button = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
...@@ -5652,7 +5652,7 @@ create_display_screen (GtkWidget *widget) ...@@ -5652,7 +5652,7 @@ create_display_screen (GtkWidget *widget)
gtk_table_attach_defaults (GTK_TABLE (table), radio_scr, 0, 1, 1, 2); gtk_table_attach_defaults (GTK_TABLE (table), radio_scr, 0, 1, 1, 2);
gtk_table_attach_defaults (GTK_TABLE (table), combo_dpy, 1, 2, 0, 1); gtk_table_attach_defaults (GTK_TABLE (table), combo_dpy, 1, 2, 0, 1);
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
applyb = gtk_button_new_from_stock (GTK_STOCK_APPLY); applyb = gtk_button_new_from_stock (GTK_STOCK_APPLY);
cancelb = gtk_button_new_from_stock (GTK_STOCK_CANCEL); cancelb = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
......
...@@ -558,7 +558,7 @@ main (gint argc, gchar **argv) ...@@ -558,7 +558,7 @@ main (gint argc, gchar **argv)
gtk_paned_add2 (GTK_PANED (paned), scrolled_window); gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
...@@ -582,7 +582,7 @@ main (gint argc, gchar **argv) ...@@ -582,7 +582,7 @@ main (gint argc, gchar **argv)
g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list); g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list);
gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
bbox = gtk_hbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
......
...@@ -75,7 +75,7 @@ main (int argc, char **argv) ...@@ -75,7 +75,7 @@ main (int argc, char **argv)
TRUE, TRUE, 0); TRUE, TRUE, 0);
/* GtkButtonBox */ /* GtkButtonBox */
box = gtk_hbutton_box_new (); 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_table_attach_defaults (GTK_TABLE (table), box, 1, 2, 1, 2);
gtk_box_pack_start (GTK_BOX (box), gtk_box_pack_start (GTK_BOX (box),
......
...@@ -176,7 +176,7 @@ main (int argc, ...@@ -176,7 +176,7 @@ main (int argc,
control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
vbbox = gtk_vbutton_box_new (); vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (control_window), vbbox); gtk_container_add (GTK_CONTAINER (control_window), vbbox);
button = gtk_button_new_with_mnemonic ("_Select all"); button = gtk_button_new_with_mnemonic ("_Select all");
......
...@@ -272,7 +272,7 @@ msgbox_run (GtkWindow *parent, ...@@ -272,7 +272,7 @@ msgbox_run (GtkWindow *parent,
separator = gtk_hseparator_new (); separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
button_box = gtk_hbutton_box_new (); button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (button_box), 8); gtk_container_set_border_width (GTK_CONTAINER (button_box), 8);
......
...@@ -840,7 +840,7 @@ main (int argc, char *argv[]) ...@@ -840,7 +840,7 @@ main (int argc, char *argv[])
vbox2 = gtk_vbox_new (FALSE, 8); vbox2 = gtk_vbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
bbox = gtk_vbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
...@@ -858,7 +858,7 @@ main (int argc, char *argv[]) ...@@ -858,7 +858,7 @@ main (int argc, char *argv[])
"changed", G_CALLBACK (selection_changed), button); "changed", G_CALLBACK (selection_changed), button);
gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
bbox = gtk_vbutton_box_new (); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment