[Qemu-devel] [PATCH] gtk: Replace gdk_cursor_new()

[Qemu-devel] [PATCH] gtk: Replace gdk_cursor_new()

[Max Reitz]

gdk_cursor_new() has been deprecated in GTK 3.16, it is recommended to
use gdk_cursor_new_for_display() instead, so do that.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 ui/gtk.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index c58028f..b9abee1 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1875,6 +1875,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
 {
     GtkDisplayState *s = g_malloc0(sizeof(*s));
     char *filename;
+    GdkDisplay *window_display;
 
     gtk_init(NULL, NULL);
 
@@ -1893,7 +1894,9 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
     bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
     textdomain("qemu");
 
-    s->null_cursor = gdk_cursor_new(GDK_BLANK_CURSOR);
+    window_display = gtk_widget_get_display(s->window);
+    s->null_cursor = gdk_cursor_new_for_display(window_display,
+                                                GDK_BLANK_CURSOR);
 
     s->mouse_mode_notifier.notify = gd_mouse_mode_change;
     qemu_add_mouse_mode_change_notifier(&s->mouse_mode_notifier);
-- 
2.4.0

Re: [Qemu-devel] [PATCH] gtk: Replace gdk_cursor_new()

[Cole Robinson]

On 05/20/2015 09:35 AM, Max Reitz wrote:
> gdk_cursor_new() has been deprecated in GTK 3.16, it is recommended to
> use gdk_cursor_new_for_display() instead, so do that.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  ui/gtk.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/ui/gtk.c b/ui/gtk.c
> index c58028f..b9abee1 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -1875,6 +1875,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
>  {
>      GtkDisplayState *s = g_malloc0(sizeof(*s));
>      char *filename;
> +    GdkDisplay *window_display;
>  
>      gtk_init(NULL, NULL);
>  
> @@ -1893,7 +1894,9 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
>      bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
>      textdomain("qemu");
>  
> -    s->null_cursor = gdk_cursor_new(GDK_BLANK_CURSOR);
> +    window_display = gtk_widget_get_display(s->window);
> +    s->null_cursor = gdk_cursor_new_for_display(window_display,
> +                                                GDK_BLANK_CURSOR);
>  
>      s->mouse_mode_notifier.notify = gd_mouse_mode_change;
>      qemu_add_mouse_mode_change_notifier(&s->mouse_mode_notifier);
> 

Docs say gdk_cursor_new_for_display is around since gtk 2.2, so looks fine to
use unconditionally

Reviewed-by: Cole Robinson <crobinso@redhat.com>

- Cole