--- a/gtk/gtkglwidget.c

+++ b/gtk/gtkglwidget.c

@@ -70,6 +70,7 @@ static void

 gtk_gl_widget_realize (GtkWidget       *widget,

                        GLWidgetPrivate *private)

 {

+  GdkWindow *window;

   GdkGLWindow *glwindow;

   GTK_GL_NOTE_FUNC_PRIVATE ();

@@ -79,9 +80,10 @@ gtk_gl_widget_realize (GtkWidget       *widget,

    * handlers.

    */

-  if (!gdk_window_is_gl_capable (widget->window))

+  window = gtk_widget_get_window (widget);

+  if (!gdk_window_is_gl_capable (window))

     {

-      glwindow = gdk_window_set_gl_capability (widget->window,

+      glwindow = gdk_window_set_gl_capability (window,

                                                private->glconfig,

                                                NULL);

       if (glwindow == NULL)

@@ -129,9 +131,9 @@ gtk_gl_widget_size_allocate (GtkWidget       *widget,

    * Synchronize OpenGL and window resizing request streams.

    */

-  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)

+  if (gtk_widget_get_realized (widget) && private->is_realized)

     {

-      gldrawable = gdk_window_get_gl_drawable (widget->window);

+      gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));

       gdk_gl_drawable_wait_gdk (gldrawable);

     }

 }

@@ -156,8 +158,8 @@ gtk_gl_widget_unrealize (GtkWidget       *widget,

    * Remove OpenGL-capability from widget->window.

    */

-  if (GTK_WIDGET_REALIZED (widget))

-    gdk_window_unset_gl_capability (widget->window);

+  if (gtk_widget_get_realized (widget))

+    gdk_window_unset_gl_capability (gtk_widget_get_window (widget));

   private->is_realized = FALSE;

 }

@@ -176,7 +178,7 @@ gtk_gl_widget_parent_set (GtkWidget   *widget,

    */

   toplevel = gtk_widget_get_toplevel (widget);

-  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))

+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))

     {

       GTK_GL_NOTE (MISC,

         g_message (" - Install colormap to the top-level window."));

@@ -190,23 +192,27 @@ gtk_gl_widget_style_set (GtkWidget *widget,

                          GtkStyle  *previous_style,

                          gpointer   user_data)

 {

+  GdkWindow *window;

+

   GTK_GL_NOTE_FUNC_PRIVATE ();

   /* 

    * Set a background of "None" on window to avoid AIX X server crash.

    */

-  if (GTK_WIDGET_REALIZED (widget))

+  if (gtk_widget_get_realized (widget))

     {

+      window = gtk_widget_get_window (widget);

+

       GTK_GL_NOTE (MISC,

         g_message (" - window->bg_pixmap = %p",

-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));

+                   ((GdkWindowObject *) window)->bg_pixmap));

-      gdk_window_set_back_pixmap (widget->window, NULL, FALSE);

+      gdk_window_set_back_pixmap (window, NULL, FALSE);

       GTK_GL_NOTE (MISC,

         g_message (" - window->bg_pixmap = %p",

-                   ((GdkWindowObject *) (widget->window))->bg_pixmap));

+                   ((GdkWindowObject *) window)->bg_pixmap));

     }

 }

@@ -252,8 +258,8 @@ gtk_widget_set_gl_capability (GtkWidget    *widget,

   GTK_GL_NOTE_FUNC ();

   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);

-  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);

-  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);

+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);

+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);

   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);

   /* 

@@ -434,9 +440,9 @@ gtk_widget_create_gl_context (GtkWidget    *widget,

   GTK_GL_NOTE_FUNC ();

   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);

-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);

+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);

-  gldrawable = gdk_window_get_gl_drawable (widget->window);

+  gldrawable = gdk_window_get_gl_drawable (gtk_widget_get_window (widget));

   if (gldrawable == NULL)

     return NULL;

@@ -476,7 +482,7 @@ gtk_widget_get_gl_context (GtkWidget *widget)

   GLWidgetPrivate *private;

   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);

-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);

+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);

   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);

   if (private == NULL)

@@ -503,7 +509,7 @@ GdkGLWindow *

 gtk_widget_get_gl_window (GtkWidget *widget)

 {

   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);

-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);

+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);

-  return gdk_window_get_gl_window (widget->window);

+  return gdk_window_get_gl_window (gtk_widget_get_window (widget));

 }