diff options
author | Unit 193 <unit193@ubuntu.com> | 2017-07-04 22:37:44 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2017-07-04 22:37:44 -0400 |
commit | 941f1092f86b6b52f27881e24bfd1395c4d4c070 (patch) | |
tree | 015c5ebb3c0c5839c39103e27defa917b6a4b6ac /src/gnome2/parallel_tab.c | |
parent | b46786d2013adf438a981f1fe895dc36f15996fd (diff) |
New upstream version 4.0.5+dfsg1
Diffstat (limited to 'src/gnome2/parallel_tab.c')
-rw-r--r-- | src/gnome2/parallel_tab.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gnome2/parallel_tab.c b/src/gnome2/parallel_tab.c index 7ca2368..ae46dec 100644 --- a/src/gnome2/parallel_tab.c +++ b/src/gnome2/parallel_tab.c @@ -2,7 +2,7 @@ * Xiphos Bible Study Tool * parallel_dialog.c - dialog for parallel in a tab * - * Copyright (C) 2000-2015 Xiphos Developer Team + * Copyright (C) 2000-2016 Xiphos Developer Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -239,7 +239,9 @@ GtkWidget *_create_parallel_tab(void) { GtkWidget *toolbar29; GtkWidget *box_parallel_labels; +#ifndef USE_WEBKIT2 GtkWidget *scrolled_window; +#endif gtk_notebook_set_show_tabs(GTK_NOTEBOOK(widgets.notebook_bible_parallel), FALSE); @@ -290,6 +292,7 @@ GtkWidget *_create_parallel_tab(void) } #endif /* 0 */ +#ifndef USE_WEBKIT2 scrolled_window = gtk_scrolled_window_new(NULL, NULL); gtk_widget_show(scrolled_window); gtk_box_pack_start(GTK_BOX(parallel_vbox), scrolled_window, TRUE, @@ -300,13 +303,17 @@ GtkWidget *_create_parallel_tab(void) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *) scrolled_window, settings.shadow_type); +#endif widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE)); gtk_widget_show(widgets.html_parallel_dialog); - +#ifdef USE_WEBKIT2 + gtk_box_pack_start(GTK_BOX(parallel_vbox), widgets.html_parallel_dialog, TRUE, TRUE, 0); +#else gtk_container_add(GTK_CONTAINER(scrolled_window), widgets.html_parallel_dialog); +#endif g_signal_connect((gpointer)widgets.html_parallel_dialog, "popupmenu_requested", |