For all recent changes (r43820...r43829) from gtk_container_add() to gtk_box_pack_start() set expand parameter to TRUE.
svn path=/trunk/; revision=43860
This commit is contained in:
parent
5b7e9a9152
commit
5eee82d32f
|
@ -85,14 +85,14 @@ about_wireshark(GtkWidget *parent _U_, GtkWidget *main_vb)
|
||||||
/*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/
|
/*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/
|
||||||
icon = xpm_to_widget(wssplash_xpm);
|
icon = xpm_to_widget(wssplash_xpm);
|
||||||
|
|
||||||
gtk_box_pack_start(GTK_BOX (main_vb), icon, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_vb), icon, TRUE, TRUE, 0);
|
||||||
|
|
||||||
|
|
||||||
msg_label = gtk_label_new(title);
|
msg_label = gtk_label_new(title);
|
||||||
message = g_strdup_printf("<span size=\"x-large\" weight=\"bold\">%s</span>", title);
|
message = g_strdup_printf("<span size=\"x-large\" weight=\"bold\">%s</span>", title);
|
||||||
gtk_label_set_markup(GTK_LABEL(msg_label), message);
|
gtk_label_set_markup(GTK_LABEL(msg_label), message);
|
||||||
g_free(message);
|
g_free(message);
|
||||||
gtk_box_pack_start(GTK_BOX (main_vb), msg_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_vb), msg_label, TRUE, TRUE, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -137,11 +137,11 @@ splash_new(const char *message)
|
||||||
about_wireshark(win, main_box);
|
about_wireshark(win, main_box);
|
||||||
|
|
||||||
main_lb = gtk_label_new(message);
|
main_lb = gtk_label_new(message);
|
||||||
gtk_box_pack_start(GTK_BOX (main_box), main_lb, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_box), main_lb, FALSE, TRUE, 0);
|
||||||
g_object_set_data(G_OBJECT(win), "splash_label", main_lb);
|
g_object_set_data(G_OBJECT(win), "splash_label", main_lb);
|
||||||
|
|
||||||
main_lb = gtk_label_new("");
|
main_lb = gtk_label_new("");
|
||||||
gtk_box_pack_start(GTK_BOX (main_box), main_lb, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_box), main_lb, FALSE, TRUE, 0);
|
||||||
g_object_set_data(G_OBJECT(win), "protocol_label", main_lb);
|
g_object_set_data(G_OBJECT(win), "protocol_label", main_lb);
|
||||||
|
|
||||||
percentage_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
|
percentage_box = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1, FALSE);
|
||||||
|
|
|
@ -358,7 +358,7 @@ dissector_tables_dlg_init(void)
|
||||||
tmp = gtk_label_new("Heuristic tables");
|
tmp = gtk_label_new("Heuristic tables");
|
||||||
gtk_widget_show(tmp);
|
gtk_widget_show(tmp);
|
||||||
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
|
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), tmp, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), tmp, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
||||||
|
|
||||||
scrolled_window = scrolled_window_new(NULL, NULL);
|
scrolled_window = scrolled_window_new(NULL, NULL);
|
||||||
|
|
|
@ -811,9 +811,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
|
||||||
if ( prefs.gui_expert_composite_eyecandy ) {
|
if ( prefs.gui_expert_composite_eyecandy ) {
|
||||||
image = pixbuf_to_widget(expert_error_pb_data);
|
image = pixbuf_to_widget(expert_error_pb_data);
|
||||||
gtk_widget_show(image);
|
gtk_widget_show(image);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0);
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), ss->error_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), ss->error_label, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
||||||
init_error_table(&ss->error_table, 0, temp_page);
|
init_error_table(&ss->error_table, 0, temp_page);
|
||||||
|
|
||||||
|
@ -825,10 +825,10 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
|
||||||
if ( prefs.gui_expert_composite_eyecandy ) {
|
if ( prefs.gui_expert_composite_eyecandy ) {
|
||||||
image = pixbuf_to_widget(expert_warn_pb_data);
|
image = pixbuf_to_widget(expert_warn_pb_data);
|
||||||
gtk_widget_show(image);
|
gtk_widget_show(image);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0);
|
||||||
|
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), ss->warn_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), ss->warn_label, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
||||||
init_error_table(&ss->warn_table, 0, temp_page);
|
init_error_table(&ss->warn_table, 0, temp_page);
|
||||||
|
|
||||||
|
@ -840,9 +840,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
|
||||||
if ( prefs.gui_expert_composite_eyecandy ) {
|
if ( prefs.gui_expert_composite_eyecandy ) {
|
||||||
image = pixbuf_to_widget(expert_note_pb_data);
|
image = pixbuf_to_widget(expert_note_pb_data);
|
||||||
gtk_widget_show(image);
|
gtk_widget_show(image);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0);
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), ss->note_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), ss->note_label, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
||||||
init_error_table(&ss->note_table, 0, temp_page);
|
init_error_table(&ss->note_table, 0, temp_page);
|
||||||
|
|
||||||
|
@ -854,9 +854,9 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
|
||||||
if ( prefs.gui_expert_composite_eyecandy ) {
|
if ( prefs.gui_expert_composite_eyecandy ) {
|
||||||
image = pixbuf_to_widget(expert_chat_pb_data);
|
image = pixbuf_to_widget(expert_chat_pb_data);
|
||||||
gtk_widget_show(image);
|
gtk_widget_show(image);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), image, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0);
|
||||||
}
|
}
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), ss->chat_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), ss->chat_label, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, hbox);
|
||||||
init_error_table(&ss->chat_table, 0, temp_page);
|
init_error_table(&ss->chat_table, 0, temp_page);
|
||||||
|
|
||||||
|
@ -870,7 +870,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
|
||||||
ss->pkt_comments_label = gtk_label_new("Packet Comments: 0/y");
|
ss->pkt_comments_label = gtk_label_new("Packet Comments: 0/y");
|
||||||
gtk_widget_show(ss->pkt_comments_label);
|
gtk_widget_show(ss->pkt_comments_label);
|
||||||
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
|
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
|
||||||
gtk_box_pack_start(GTK_BOX (hbox), ss->pkt_comments_label, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbox), ss->pkt_comments_label, TRUE, TRUE, 0);
|
||||||
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), comments_page, hbox);
|
gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), comments_page, hbox);
|
||||||
|
|
||||||
etd = expert_dlg_new_table();
|
etd = expert_dlg_new_table();
|
||||||
|
|
|
@ -600,13 +600,13 @@ flow_graph_dlg_create (void)
|
||||||
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
|
gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
|
||||||
|
|
||||||
bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
|
bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
|
||||||
gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_ok, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_ok, TRUE, TRUE, 0);
|
||||||
gtk_widget_set_tooltip_text (bt_ok, "Show the flow graph");
|
gtk_widget_set_tooltip_text (bt_ok, "Show the flow graph");
|
||||||
g_signal_connect(bt_ok, "clicked", G_CALLBACK(flow_graph_on_ok), flow_graph_dlg_w);
|
g_signal_connect(bt_ok, "clicked", G_CALLBACK(flow_graph_on_ok), flow_graph_dlg_w);
|
||||||
gtk_widget_show(bt_ok);
|
gtk_widget_show(bt_ok);
|
||||||
|
|
||||||
bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
|
bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
|
||||||
gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_cancel, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_cancel, TRUE, TRUE, 0);
|
||||||
#if GTK_CHECK_VERSION(2,18,0)
|
#if GTK_CHECK_VERSION(2,18,0)
|
||||||
gtk_widget_set_can_default(bt_cancel, TRUE);
|
gtk_widget_set_can_default(bt_cancel, TRUE);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -312,7 +312,7 @@ follow_find_cb(GtkWidget * w _U_, gpointer data)
|
||||||
/* Buttons row */
|
/* Buttons row */
|
||||||
buttons_row = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL,
|
buttons_row = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL,
|
||||||
NULL);
|
NULL);
|
||||||
gtk_box_pack_start(GTK_BOX (main_vb), buttons_row, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_vb), buttons_row, TRUE, TRUE, 0);
|
||||||
find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
|
find_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_FIND);
|
||||||
cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
|
cancel_bt = g_object_get_data(G_OBJECT(buttons_row), GTK_STOCK_CANCEL);
|
||||||
|
|
||||||
|
|
|
@ -1952,13 +1952,13 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data)
|
||||||
gtk_widget_show(hbuttonbox);
|
gtk_widget_show(hbuttonbox);
|
||||||
|
|
||||||
bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
|
bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
|
||||||
gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_save, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_save, TRUE, TRUE, 0);
|
||||||
gtk_widget_show(bt_save);
|
gtk_widget_show(bt_save);
|
||||||
g_signal_connect(bt_save, "clicked", G_CALLBACK(on_save_bt_clicked), user_data);
|
g_signal_connect(bt_save, "clicked", G_CALLBACK(on_save_bt_clicked), user_data);
|
||||||
gtk_widget_set_tooltip_text(bt_save, "Save an ASCII representation of the graph to a file");
|
gtk_widget_set_tooltip_text(bt_save, "Save an ASCII representation of the graph to a file");
|
||||||
|
|
||||||
bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
|
bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
|
||||||
gtk_box_pack_start(GTK_BOX (hbuttonbox), bt_close, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_close, TRUE, TRUE, 0);
|
||||||
#if GTK_CHECK_VERSION(2,18,0)
|
#if GTK_CHECK_VERSION(2,18,0)
|
||||||
gtk_widget_set_can_default(bt_close, TRUE);
|
gtk_widget_set_can_default(bt_close, TRUE);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -339,7 +339,7 @@ void gsm_map_stat_gtk_sum_cb(GtkAction *action _U_, gpointer user_data _U_)
|
||||||
|
|
||||||
/* Button row. */
|
/* Button row. */
|
||||||
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
|
bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
|
||||||
gtk_box_pack_start(GTK_BOX (main_vb), bbox, FALSE, TRUE, 0);
|
gtk_box_pack_start(GTK_BOX(main_vb), bbox, TRUE, TRUE, 0);
|
||||||
gtk_widget_show(bbox);
|
gtk_widget_show(bbox);
|
||||||
|
|
||||||
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
|
close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
|
||||||
|
|
Loading…
Reference in New Issue