summaryrefslogtreecommitdiff
path: root/ui/gtk/sctp_assoc_analyse.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-01-15 21:09:12 +0000
committerBill Meier <wmeier@newsguy.com>2013-01-15 21:09:12 +0000
commit026c798c980d07bf9cb8fadde0e1e055883cc13c (patch)
treed27cddf8127d5c82f922ad89fdd1992fe5bdaf34 /ui/gtk/sctp_assoc_analyse.c
parentd0b774d0eae710a89bcd091608aeb689e7a230b9 (diff)
downloadwireshark-026c798c980d07bf9cb8fadde0e1e055883cc13c.tar.gz
Fix several window resize behavior differences between Gtk2 & Gtk3.
Specifically: replace several gtk_container_add() calls by gtk_box_pack_start() calls. svn path=/trunk/; revision=47102
Diffstat (limited to 'ui/gtk/sctp_assoc_analyse.c')
-rw-r--r--ui/gtk/sctp_assoc_analyse.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 5105cd7545..b83ac4c9ca 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -524,7 +524,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
/* Start a notebook for flipping between sets of changes */
notebook = gtk_notebook_new();
- gtk_container_add(GTK_CONTAINER(main_vb), notebook);
+ gtk_box_pack_start(GTK_BOX(main_vb), notebook, TRUE, TRUE, 0);
g_object_set_data(G_OBJECT(window), "notebook", notebook);
g_signal_connect(notebook, "switch_page", G_CALLBACK(on_notebook_switch_page), NULL);
@@ -604,7 +604,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
u_data->analyse_nb->page2 = g_malloc(sizeof(struct page));
u_data->analyse_nb->page2->addr_frame = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(page2), u_data->analyse_nb->page2->addr_frame);
+ gtk_box_pack_start(GTK_BOX(page2), u_data->analyse_nb->page2->addr_frame, TRUE, TRUE, 0);
addr_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5);
@@ -622,7 +622,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
gtk_widget_show(u_data->analyse_nb->page2->scrolled_window);
stat_fr = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(page2), stat_fr);
+ gtk_box_pack_start(GTK_BOX(page2), stat_fr, TRUE, TRUE, 0);
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
@@ -708,10 +708,11 @@ static void create_analyse_window(struct sctp_analyse* u_data)
page3 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(page3), 8);
+
u_data->analyse_nb->page3 = g_malloc(sizeof(struct page));
- u_data->analyse_nb->page3->addr_frame = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(page3), u_data->analyse_nb->page3->addr_frame);
+ u_data->analyse_nb->page3->addr_frame = gtk_frame_new(NULL);
+ gtk_box_pack_start(GTK_BOX(page3), u_data->analyse_nb->page3->addr_frame, TRUE, TRUE, 0);
addr_hb = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(addr_hb), 5);
@@ -730,7 +731,7 @@ static void create_analyse_window(struct sctp_analyse* u_data)
gtk_widget_show(u_data->analyse_nb->page3->scrolled_window);
stat_fr = gtk_frame_new(NULL);
- gtk_container_add(GTK_CONTAINER(page3), stat_fr);
+ gtk_box_pack_start(GTK_BOX(page3), stat_fr, TRUE, TRUE, 0);
hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);