diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-04 19:20:39 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-04 19:20:39 +0000 |
| commit | 1fb0ac398336671348d254c416fb9439862517a7 (patch) | |
| tree | 5425373772f80f21993583a58d97653b31265078 /ui/gtk/main_welcome.c | |
| parent | 0efdddc61f4ff8bb9c35b654bb2134d3cab4de51 (diff) | |
| download | wireshark-1fb0ac398336671348d254c416fb9439862517a7.tar.gz | |
Fir Gtk 3.8 & newer: gtk_scrolled_window_add_with_viewport() ==> gtk_container_add().
svn path=/trunk/; revision=48065
Diffstat (limited to 'ui/gtk/main_welcome.c')
| -rw-r--r-- | ui/gtk/main_welcome.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index a4aced244d..cc76a1264b 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -185,8 +185,11 @@ scroll_box_dynamic_add(GtkWidget *parent_box) /* move child_box from parent_box into scrolled window */ g_object_ref(child_box); gtk_container_remove(GTK_CONTAINER(parent_box), child_box); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollw), - child_box); +#if ! GTK_CHECK_VERSION(3,8,0) + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollw), child_box); +#else + gtk_container_add(GTK_CONTAINER(scrollw), child_box); +#endif gtk_widget_show_all(scrollw); } @@ -1401,8 +1404,11 @@ welcome_new(void) /* the end */ gtk_widget_show_all(welcome_eb); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(welcome_scrollw), - welcome_eb); +#if ! GTK_CHECK_VERSION(3,8,0) + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(welcome_scrollw), welcome_eb); +#else + gtk_container_add(GTK_CONTAINER(welcome_scrollw), welcome_eb); +#endif gtk_widget_show_all(welcome_scrollw); #if GLIB_CHECK_VERSION(2,31,0) |