diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-12-04 13:33:28 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-04 13:33:28 +0100 |
| commit | a70138c5c168eb87e579feb315b4935f502a82d1 (patch) | |
| tree | 29de6fc09175bf0c70551aa44b6fbd05d9759f86 /src/terminal-screen-container.c | |
| parent | 1e8eef25c7fa7ce17cd978ccc246fbfd40eb38f6 (diff) | |
| parent | 5ecc6d7c26e7d721245bc06ba0d699d7f072c052 (diff) | |
| download | mate-terminal-a70138c5c168eb87e579feb315b4935f502a82d1.tar.bz2 mate-terminal-a70138c5c168eb87e579feb315b4935f502a82d1.tar.xz | |
Merge branch 'vte291' into 1.12
Diffstat (limited to 'src/terminal-screen-container.c')
| -rw-r--r-- | src/terminal-screen-container.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/terminal-screen-container.c b/src/terminal-screen-container.c index 1681c6d..8c82c63 100644 --- a/src/terminal-screen-container.c +++ b/src/terminal-screen-container.c @@ -143,7 +143,11 @@ terminal_screen_container_constructor (GType type, g_assert (priv->screen != NULL); #ifdef USE_SCROLLED_WINDOW +#if VTE_CHECK_VERSION (0, 38, 0) + priv->scrolled_window = gtk_scrolled_window_new (NULL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); +#else priv->scrolled_window = gtk_scrolled_window_new (NULL, vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen))); +#endif gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), priv->hscrollbar_policy, @@ -163,7 +167,11 @@ terminal_screen_container_constructor (GType type, priv->hbox = gtk_hbox_new (FALSE, 0); +#if VTE_CHECK_VERSION (0, 38, 0) + priv->vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->screen))); +#else priv->vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (priv->screen))); +#endif gtk_box_pack_start (GTK_BOX (priv->hbox), GTK_WIDGET (priv->screen), TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (priv->hbox), priv->vscrollbar, FALSE, FALSE, 0); |