diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-17 20:49:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-17 20:49:53 +0200 |
| commit | 30e12d259ee78272359f9da2655d0593a4f6a626 (patch) | |
| tree | 3fa3feb87510ef1ab8fce795ca654af45bbf854e | |
| parent | f9660b59b2bdaa3ec2e7b31ab52186ad8b99f047 (diff) | |
| download | vim-git-7.4.1749.tar.gz | |
patch 7.4.1749v7.4.1749
Problem: When using GTK 3.20 there are a few warnings.
Solution: Use new functions when available. (Kazunobu Kuriyama)
| -rw-r--r-- | src/gui_beval.c | 5 | ||||
| -rw-r--r-- | src/gui_gtk_x11.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c index 258ba8aeb..9a945bc8a 100644 --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -557,8 +557,13 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); +# if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + GdkDevice * const dev = gdk_seat_get_pointer(seat); +# else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr); +# endif gdk_window_get_device_position(win, dev , &x, &y, &state); } # else diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 00196ebe8..77e84c1be 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1842,8 +1842,13 @@ gui_gtk_get_pointer_device(GtkWidget *widget) { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); +# if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + return gdk_seat_get_pointer(seat); +# else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); return gdk_device_manager_get_client_pointer(mngr); +# endif } static GdkWindow * diff --git a/src/version.c b/src/version.c index d26268e1e..fa0958548 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1749, +/**/ 1748, /**/ 1747, |