callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: Stop using _gdk_display global in device code

Browse Source 
Use gdk_device_get_display() instead.
This commit is contained in:
Benjamin Otte
2016-02-06 05:46:09 +01:00
committed by Benjamin Otte
parent ccbfa64d67
commit 76e56c5038
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/inspector/general.c
View File

@ -118,7 +118,7 @@ init_version (GtkInspectorGeneral *gen)
gtk_label_set_text (GTK_LABEL (gen->priv->gdk_backend), backend);
}
static void
static G_GNUC_UNUSED void
append_extension_row (GtkInspectorGeneral *gen,
const gchar *ext,
gboolean have_ext)
@ -169,16 +169,13 @@ append_egl_extension_row (GtkInspectorGeneral *gen,
static void
init_gl (GtkInspectorGeneral *gen)
{
GdkDisplay *display;
gchar *version;
display = gdk_display_get_default ();
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
{
GdkDisplay *display = gdk_display_get_default ();
Display *dpy = GDK_DISPLAY_XDISPLAY (display);
int error_base, event_base;
gchar *version;
if (!glXQueryExtension (dpy, &error_base, &event_base))
return;
@ -202,8 +199,10 @@ init_gl (GtkInspectorGeneral *gen)
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (display))
{
GdkDisplay *display = gdk_display_get_default ();
EGLDisplay *dpy;
EGLint major, minor;
gchar *version;
dpy = eglGetDisplay ((EGLNativeDisplayType)gdk_wayland_display_get_wl_display (display));