From 3122424b75f05c522586bb7ced6a6bb638c5deb5 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 30 Jul 2016 14:30:54 +0200 Subject: GTK+-3 print-preview: avoid deprecated gtk_layout_get_{h/v}adjustment replace it with gtk_scrollable_get_{h/v}adjustment --- pluma/pluma-print-preview.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pluma/pluma-print-preview.c b/pluma/pluma-print-preview.c index 5a54e7fc..909fea81 100644 --- a/pluma/pluma-print-preview.c +++ b/pluma/pluma-print-preview.c @@ -262,10 +262,18 @@ set_zoom_fit_to_size (PlumaPrintPreview *preview) priv = preview->priv; +#if GTK_CHECK_VERSION (3, 0, 0) + g_object_get (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (priv->layout)), +#else g_object_get (gtk_layout_get_hadjustment (GTK_LAYOUT (priv->layout)), +#endif "page-size", &width, NULL); +#if GTK_CHECK_VERSION (3, 0, 0) + g_object_get (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->layout)), +#else g_object_get (gtk_layout_get_vadjustment (GTK_LAYOUT (priv->layout)), +#endif "page-size", &height, NULL); @@ -733,8 +741,13 @@ get_page_at_coords (PlumaPrintPreview *preview, if (priv->tile_h <= 0 || priv->tile_h <= 0) return -1; +#if GTK_CHECK_VERSION (3, 0, 0) + hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (priv->layout)); + vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->layout)); +#else hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (priv->layout)); vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (priv->layout)); +#endif x += gtk_adjustment_get_value (hadj); y += gtk_adjustment_get_value (vadj); @@ -795,8 +808,13 @@ preview_layout_key_press (GtkWidget *widget, priv = preview->priv; +#if GTK_CHECK_VERSION (3, 0, 0) + hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (priv->layout)); + vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (priv->layout)); +#else hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (priv->layout)); vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (priv->layout)); +#endif x = gtk_adjustment_get_value (hadj); y = gtk_adjustment_get_value (vadj); -- cgit v1.2.1