Skip to content

Commit 30e12d2

Browse files
committed
patch 7.4.1749
Problem: When using GTK 3.20 there are a few warnings. Solution: Use new functions when available. (Kazunobu Kuriyama)
1 parent f9660b5 commit 30e12d2

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

src/gui_beval.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,13 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
557557
{
558558
GdkWindow * const win = gtk_widget_get_window(widget);
559559
GdkDisplay * const dpy = gdk_window_get_display(win);
560+
# if GTK_CHECK_VERSION(3,20,0)
561+
GdkSeat * const seat = gdk_display_get_default_seat(dpy);
562+
GdkDevice * const dev = gdk_seat_get_pointer(seat);
563+
# else
560564
GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy);
561565
GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr);
566+
# endif
562567
gdk_window_get_device_position(win, dev , &x, &y, &state);
563568
}
564569
# else

src/gui_gtk_x11.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,8 +1842,13 @@ gui_gtk_get_pointer_device(GtkWidget *widget)
18421842
{
18431843
GdkWindow * const win = gtk_widget_get_window(widget);
18441844
GdkDisplay * const dpy = gdk_window_get_display(win);
1845+
# if GTK_CHECK_VERSION(3,20,0)
1846+
GdkSeat * const seat = gdk_display_get_default_seat(dpy);
1847+
return gdk_seat_get_pointer(seat);
1848+
# else
18451849
GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy);
18461850
return gdk_device_manager_get_client_pointer(mngr);
1851+
# endif
18471852
}
18481853

18491854
static GdkWindow *

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,8 @@ static char *(features[]) =
748748

749749
static int included_patches[] =
750750
{ /* Add new patch number below this line */
751+
/**/
752+
1749,
751753
/**/
752754
1748,
753755
/**/

0 commit comments

Comments
 (0)