AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

testgtk: Make cursor demo work with wayland

Browse Source 
We have the wayland apis to do this.
This commit is contained in:
Matthias Clasen 2014-09-02 09:53:15 -04:00
parent e742c0447e
commit 41fe530795
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/testgtk.c
View File

@ -4889,6 +4889,10 @@ cursor_event (GtkWidget *widget,
#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
#endif
#ifdef GDK_WINDOWING_WAYLAND
#include "wayland/gdkwayland.h"
#endif
static void
change_cursor_theme (GtkWidget *widget,
@ -4897,6 +4901,7 @@ change_cursor_theme (GtkWidget *widget,
const gchar *theme;
gint size;
GList *children;
GdkDisplay *display;
children = gtk_container_get_children (GTK_CONTAINER (data));
@ -4905,10 +4910,16 @@ change_cursor_theme (GtkWidget *widget,
g_list_free (children);
gdk_x11_display_set_cursor_theme (gtk_widget_get_display (widget),
theme, size);
}
display = gtk_widget_get_display (widget);
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
gdk_x11_display_set_cursor_theme (display, theme, size);
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (display))
gdk_wayland_display_set_cursor_theme (display, theme, size);
#endif
}
static void
@ -4956,8 +4967,7 @@ create_cursors (GtkWidget *widget)
"GtkWidget::visible", TRUE,
NULL);
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (vbox)))
if (1 || GDK_IS_X11_DISPLAY (gtk_widget_get_display (vbox)))
{
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
@ -4981,7 +4991,6 @@ create_cursors (GtkWidget *widget)
g_signal_connect (size, "changed",
G_CALLBACK (change_cursor_theme), hbox);
}
#endif
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);