From 217ce17fff3e4eb3670a03c3d48771a03bf3f9d9 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Mon, 8 Feb 2016 17:56:28 +0100 Subject: do not use deprecated gdk_cursor_new, use gdk_cursor_new_for_display for both GTK versions --- mate-panel/panel-toplevel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mate-panel/panel-toplevel.c') diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index f740d0c8..fa1b757c 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -438,8 +438,8 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp GdkWindow *window; GdkCursorType cursor_type; GdkCursor *cursor; - GdkDisplay *display; #if GTK_CHECK_VERSION (3, 0, 0) + GdkDisplay *display; GdkDevice *pointer; GdkDevice *keyboard; GdkDeviceManager *device_manager; @@ -496,9 +496,11 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp cursor_type = panel_toplevel_grab_op_cursor ( toplevel, toplevel->priv->grab_op); - display = gdk_window_get_display (window); - cursor = gdk_cursor_new_for_display (display, cursor_type); + + cursor = gdk_cursor_new_for_display (gdk_display_get_default (), + cursor_type); #if GTK_CHECK_VERSION (3, 0, 0) + display = gdk_window_get_display (window); device_manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (device_manager); keyboard = gdk_device_get_associated_device (pointer); -- cgit v1.2.1