diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-07-18 19:44:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-18 19:44:54 +0000 |
| commit | 3be9409ae8d17a051585a57048ae1069b4294785 (patch) | |
| tree | 9c69640cc9cf61c018f3c1abc7ed4e544612dcb9 | |
| parent | e298722f5bb9b9b2a7fea2411d0ecb8dd34c7485 (diff) | |
| download | wireshark-3be9409ae8d17a051585a57048ae1069b4294785.tar.gz | |
From Jakub Zawadzki use gtk_box_pack_start isof gtk_container_add fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377
svn path=/trunk/; revision=43790
| -rw-r--r-- | ui/gtk/main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index b3957d3c15..ca1d7e57e0 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -3573,7 +3573,7 @@ void main_widgets_rearrange(void) { if (second_pane_widget2 != NULL) gtk_paned_pack2(GTK_PANED(main_second_pane), second_pane_widget2, FALSE, FALSE); - gtk_container_add(GTK_CONTAINER(main_vbox), main_first_pane); + gtk_box_pack_start(GTK_BOX(main_vbox), main_first_pane, TRUE, TRUE, 0); /* welcome pane */ gtk_box_pack_start(GTK_BOX(main_vbox), welcome_pane, TRUE, TRUE, 0); @@ -3746,12 +3746,9 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p) G_CALLBACK(top_level_key_pressed_cb), NULL ); /* Vertical container for menu bar, toolbar(s), paned windows and progress/info box */ -#if BREAK_GTK3 main_vbox = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 1, FALSE); -#else - main_vbox = gtk_vbox_new(FALSE, 1); -#endif - gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 0); + + gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 0); gtk_container_add(GTK_CONTAINER(top_level), main_vbox); gtk_widget_show(main_vbox); |