diff options
| author | raveit65 <[email protected]> | 2016-06-24 17:14:26 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-29 16:23:03 +0200 |
| commit | aa9a83b64ac38330991168ab799d482960e07437 (patch) | |
| tree | c2004fa518b41740fd221939c581470fa464c86d /libview | |
| parent | e3aaf39c9ca3fa3dc3d030caef68f28b8a27b086 (diff) | |
| download | atril-aa9a83b64ac38330991168ab799d482960e07437.tar.bz2 atril-aa9a83b64ac38330991168ab799d482960e07437.tar.xz | |
GTK+-3: Use ev_document_misc_get_pointer_position() instad of deprecated gtk_widget_get_pointer()
Diffstat (limited to 'libview')
| -rw-r--r-- | libview/ev-view-presentation.c | 8 | ||||
| -rw-r--r-- | libview/ev-view.c | 36 |
2 files changed, 42 insertions, 2 deletions
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index 01a49aac..08694cc1 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -528,7 +528,11 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview, if (pview->cursor != EV_VIEW_CURSOR_HIDDEN) { gint x, y; +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (pview), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (pview), &x, &y); +#endif ev_view_presentation_set_cursor_for_location (pview, x, y); } @@ -1219,7 +1223,11 @@ ev_view_presentation_key_press_event (GtkWidget *widget, ev_view_presentation_goto_window_create (pview); ev_view_presentation_goto_window_send_key_event (pview, (GdkEvent *)event); +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (pview), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (pview), &x, &y); +#endif gtk_window_move (GTK_WINDOW (pview->goto_window), x, y); gtk_widget_show (pview->goto_window); ev_view_presentation_goto_entry_grab_focus (pview); diff --git a/libview/ev-view.c b/libview/ev-view.c index 9ddf78d2..63e0979e 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -3040,7 +3040,11 @@ ev_view_cancel_add_annotation (EvView *view) return; view->adding_annot = FALSE; +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); +#endif ev_view_handle_cursor_over_xy (view, x, y); } @@ -3577,8 +3581,12 @@ static gboolean ev_view_popup_menu (GtkWidget *widget) { gint x, y; - + +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (widget, &x, &y); +#else gtk_widget_get_pointer (widget, &x, &y); +#endif return ev_view_do_popup_menu (EV_VIEW (widget), x, y); } @@ -3906,7 +3914,11 @@ selection_scroll_timeout_cb (EvView *view) GtkAllocation allocation; gtk_widget_get_allocation (widget, &allocation); +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (widget, &x, &y); +#else gtk_widget_get_pointer (widget, &x, &y); +#endif if (y > allocation.height) { shift = (y - allocation.height) / 2; @@ -4028,7 +4040,11 @@ ev_view_motion_notify_event (GtkWidget *widget, #endif if (event->is_hint || event->window != bin_window) { +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (widget, &x, &y); +#else gtk_widget_get_pointer (widget, &x, &y); +#endif } else { x = event->x; y = event->y; @@ -5091,7 +5107,11 @@ ev_view_change_page (EvView *view, hide_loading_window (view); +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); +#endif ev_view_handle_cursor_over_xy (view, x, y); gtk_widget_queue_resize (GTK_WIDGET (view)); @@ -5210,7 +5230,11 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, #endif } +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); +#endif ev_view_handle_cursor_over_xy (view, x, y); if (view->document) @@ -5347,8 +5371,12 @@ ev_view_autoscroll_start (EvView *view) view->scroll_info.timeout_id = g_timeout_add (20, (GSourceFunc)ev_view_autoscroll_cb, view); - + +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); +#endif ev_view_handle_cursor_over_xy (view, x, y); } @@ -5368,7 +5396,11 @@ ev_view_autoscroll_stop (EvView *view) view->scroll_info.timeout_id = 0; } +#if GTK_CHECK_VERSION(3, 0, 0) + ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y); +#else gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); +#endif ev_view_handle_cursor_over_xy (view, x, y); } |