summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-07-03 12:40:03 +0200
committerraveit65 <[email protected]>2016-07-03 13:01:21 +0200
commit3bee2df64cfd3335640b34c5b87fcd290c01b7b4 (patch)
tree53ef97a4c2c8c93518414b38583de1cf55c88fc0
parent3ce8baf1ea9a7d7467811436c778b4446302829c (diff)
downloadatril-3bee2df64cfd3335640b34c5b87fcd290c01b7b4.tar.bz2
atril-3bee2df64cfd3335640b34c5b87fcd290c01b7b4.tar.xz
GTK+-3 libview: Fix compiler warnings
Add dummy handling of the GDK_SCROLL_SMOOTH direction. taken from: https://git.gnome.org/browse/evince/commit/?id=231445d
-rw-r--r--libview/ev-view-presentation.c4
-rw-r--r--libview/ev-view.c9
2 files changed, 13 insertions, 0 deletions
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 9c14aff6..dadd0c6b 100644
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -1413,6 +1413,10 @@ ev_view_presentation_scroll_event (GtkWidget *widget,
case GDK_SCROLL_LEFT:
ev_view_presentation_change_page (pview, GTK_SCROLL_PAGE_BACKWARD);
break;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ case GDK_SCROLL_SMOOTH:
+ return FALSE;
+#endif
}
return TRUE;
diff --git a/libview/ev-view.c b/libview/ev-view.c
index ccafff7b..bd14de6f 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -3471,6 +3471,11 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
EvView *view = EV_VIEW (widget);
guint state;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ if (event->direction == GDK_SCROLL_SMOOTH)
+ return FALSE;
+#endif
+
state = event->state & gtk_accelerator_get_default_mod_mask ();
if (state == GDK_CONTROL_MASK) {
@@ -3516,6 +3521,10 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
case GDK_SCROLL_LEFT:
ev_view_previous_page (view);
break;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ case GDK_SCROLL_SMOOTH:
+ g_assert_not_reached ();
+#endif
}
return TRUE;