[gtkglarea] gtkgl/*: Use accessor funstions instead direct access

[Javier Jardón <jjardon src gnome org>]

commit ecf7dc900b2bffb41c03cac437ac662f02c85cd4
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Mar 19 23:08:14 2014 +0000

    gtkgl/*: Use accessor funstions instead direct access

 gtkgl/gdkgl.c     |    4 +++-
 gtkgl/gtkglarea.c |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtkgl/gdkgl.c b/gtkgl/gdkgl.c
index 3d908ee..a6fa41e 100644
--- a/gtkgl/gdkgl.c
+++ b/gtkgl/gdkgl.c
@@ -455,7 +455,9 @@ void gdk_gl_swap_buffers(GdkDrawable *drawable)
   SwapBuffers (hdc);
   ReleaseDC (hwnd, hdc);
 #elif defined GDK_WINDOWING_X11
-  glXSwapBuffers(GDK_WINDOW_XDISPLAY(drawable), GDK_WINDOW_XWINDOW(drawable));
+  GdkDisplay *gdkdisplay = gdk_window_get_display (GDK_WINDOW (drawable));
+  glXSwapBuffers(gdk_x11_display_get_xdisplay (gdkdisplay),
+                 GDK_WINDOW_XID (GDK_WINDOW (drawable)));
 #else
   g_warning ("gdk_gl_swap_buffers not implemented on " PLATFORM);
 #endif
diff --git a/gtkgl/gtkglarea.c b/gtkgl/gtkglarea.c
index 9bd5b28..cde9f47 100644
--- a/gtkgl/gtkglarea.c
+++ b/gtkgl/gtkglarea.c
@@ -180,7 +180,7 @@ gint gtk_gl_area_make_current(GtkGLArea *gl_area)
   g_return_val_if_fail(GTK_IS_GL_AREA (gl_area), FALSE);
   g_return_val_if_fail(GTK_WIDGET_REALIZED(gl_area), FALSE);
 
-  return gdk_gl_make_current(GTK_WIDGET(gl_area)->window, gl_area->glcontext);
+  return gdk_gl_make_current(gtk_widget_get_window (GTK_WIDGET(gl_area)), gl_area->glcontext);
 }
 
 void gtk_gl_area_swap_buffers(GtkGLArea *gl_area)
@@ -189,5 +189,5 @@ void gtk_gl_area_swap_buffers(GtkGLArea *gl_area)
   g_return_if_fail(GTK_IS_GL_AREA(gl_area));
   g_return_if_fail(GTK_WIDGET_REALIZED(gl_area));
 
-  gdk_gl_swap_buffers(GTK_WIDGET(gl_area)->window);
+  gdk_gl_swap_buffers(gtk_widget_get_window (GTK_WIDGET(gl_area)));
 }