aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1749

Browse Source 
Problem:    When using GTK 3.20 there are a few warnings.
Solution:   Use new functions when available. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2016-04-17 20:49:53 +02:00
parent f9660b59b2
commit 30e12d259e
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui_beval.c
View File

@@ -557,8 +557,13 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{ {
GdkWindow * const win = gtk_widget_get_window(widget); GdkWindow * const win = gtk_widget_get_window(widget);
GdkDisplay * const dpy = gdk_window_get_display(win); 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); GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy);
GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr); GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr);
# endif
gdk_window_get_device_position(win, dev , &x, &y, &state); gdk_window_get_device_position(win, dev , &x, &y, &state);
} }
# else # else

5
src/gui_gtk_x11.c
View File

@@ -1842,8 +1842,13 @@ gui_gtk_get_pointer_device(GtkWidget *widget)
{ {
GdkWindow * const win = gtk_widget_get_window(widget); GdkWindow * const win = gtk_widget_get_window(widget);
GdkDisplay * const dpy = gdk_window_get_display(win); 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); GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy);
return gdk_device_manager_get_client_pointer(mngr); return gdk_device_manager_get_client_pointer(mngr);
# endif
} }
static GdkWindow * static GdkWindow *

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1749,
/**/ /**/
1748, 1748,
/**/ /**/