forked from osmocom/wireshark
Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_button_box_set_spacing() ==> gtk_box_set_spacing() svn path=/trunk/; revision=25673
This commit is contained in:
parent
44efa0ed2e
commit
d3fc3b6c3e
|
@ -609,7 +609,7 @@ static void flow_graph_dlg_create (void)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
|
||||
|
||||
bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
|
||||
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok);
|
||||
|
|
|
@ -1467,7 +1467,7 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (vbox), hbuttonbox, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
|
||||
gtk_widget_show(hbuttonbox);
|
||||
|
||||
bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
|
||||
|
|
|
@ -463,7 +463,7 @@ mcast_on_params (GtkButton *button _U_,
|
|||
gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_bt);
|
||||
GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
|
||||
|
||||
g_signal_connect(mcast_params_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
|
||||
g_signal_connect(mcast_params_dlg, "destroy", G_CALLBACK(mcast_params_destroy_cb), NULL);
|
||||
|
@ -583,7 +583,7 @@ static void mcaststream_dlg_create (void)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
|
||||
|
||||
/*bt_unselect = gtk_button_new_with_label ("Unselect");
|
||||
gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
|
||||
|
|
|
@ -163,7 +163,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
|
|||
|
||||
bbox = gtk_hbutton_box_new();
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
|
||||
gtk_box_set_spacing(GTK_BOX(bbox), 5);
|
||||
gtk_box_pack_start(GTK_BOX(proto_vb), bbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show(bbox);
|
||||
|
||||
|
|
|
@ -3094,7 +3094,7 @@ static void create_rtp_dialog(user_data_t* user_data)
|
|||
gtk_box_pack_start(GTK_BOX(main_vb), box4, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(box4), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (box4), GTK_BUTTONBOX_EDGE);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (box4), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (box4), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (box4), 4, 0);
|
||||
gtk_widget_show(box4);
|
||||
|
||||
|
|
|
@ -1926,7 +1926,7 @@ rtp_player_dlg_create(void)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (h_jitter_buttons_box), hbuttonbox, TRUE, TRUE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 10);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 10);
|
||||
|
||||
bt_decode = gtk_button_new_with_label("Decode");
|
||||
gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_decode);
|
||||
|
|
|
@ -749,7 +749,7 @@ static void rtpstream_dlg_create (void)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
|
||||
|
||||
bt_unselect = gtk_button_new_with_label ("Unselect");
|
||||
gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
|
||||
|
|
|
@ -534,7 +534,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
|
|||
gtk_box_pack_start(GTK_BOX(page1), hbox, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbox), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (hbox), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (hbox), 4, 0);
|
||||
gtk_widget_show(hbox);
|
||||
|
||||
|
@ -638,7 +638,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
|
|||
gtk_box_pack_start(GTK_BOX(page2), h_button_box, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (h_button_box), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (h_button_box), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (h_button_box), 4, 0);
|
||||
gtk_widget_show(h_button_box);
|
||||
|
||||
|
@ -746,7 +746,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
|
|||
gtk_box_pack_start(GTK_BOX(page3), h_button_box, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (h_button_box), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (h_button_box), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (h_button_box), 4, 0);
|
||||
gtk_widget_show(h_button_box);
|
||||
|
||||
|
|
|
@ -1059,7 +1059,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
|
|||
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbox), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (hbox), 0);
|
||||
gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START);
|
||||
gtk_widget_show(hbox);
|
||||
|
||||
|
|
|
@ -313,7 +313,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction)
|
|||
gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox2, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox2), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbuttonbox2), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (hbuttonbox2), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (hbuttonbox2), 4, 0);
|
||||
gtk_widget_show(hbuttonbox2);
|
||||
|
||||
|
@ -431,7 +431,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data)
|
|||
gtk_box_pack_start(GTK_BOX(main_vb), h_button_box, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(h_button_box), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (h_button_box), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (h_button_box), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (h_button_box), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (h_button_box), 4, 0);
|
||||
gtk_widget_show(h_button_box);
|
||||
|
||||
|
|
|
@ -204,7 +204,7 @@ gtk_sctperror_dlg(void)
|
|||
hbuttonbox2 = gtk_hbutton_box_new ();
|
||||
gtk_widget_show (hbuttonbox2);
|
||||
gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox2, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox2), 5);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 5);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_SPREAD);
|
||||
|
||||
|
||||
|
|
|
@ -1134,7 +1134,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data)
|
|||
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbox), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (hbox), 0);
|
||||
gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START);
|
||||
gtk_widget_show(hbox);
|
||||
|
||||
|
|
|
@ -565,7 +565,7 @@ gtk_sctpstat_dlg(void)
|
|||
gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox2, FALSE, FALSE, 0);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(hbuttonbox2), 10);
|
||||
gtk_button_box_set_layout(GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing(GTK_BUTTON_BOX (hbuttonbox2), 0);
|
||||
gtk_box_set_spacing(GTK_BOX (hbuttonbox2), 0);
|
||||
gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (hbuttonbox2), 4, 0);
|
||||
gtk_widget_show(hbuttonbox2);
|
||||
|
||||
|
|
|
@ -760,7 +760,7 @@ static void voip_calls_dlg_create (void)
|
|||
hbuttonbox = gtk_hbutton_box_new ();
|
||||
gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
|
||||
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
|
||||
gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30);
|
||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
|
||||
|
||||
/*bt_unselect = gtk_button_new_with_label ("Unselect");
|
||||
gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
|
||||
|
|
Loading…
Reference in New Issue