[gtk+/refactor: 22/23] gtk/gtkwidget.c: Use accessor functions to access GtkWindow

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

commit 8d2f52fee8b46355c2c1f360f1ae5c868cd26d77
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Aug 17 15:15:26 2010 +0200

    gtk/gtkwidget.c: Use accessor functions to access GtkWindow

 gtk/gtkwidget.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 7a4bff1..88653c4 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5318,7 +5318,7 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget)
       toplevel = gtk_widget_get_toplevel (focus_widget);
       if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
 	{
-	  widget = GTK_WINDOW (toplevel)->focus_widget;
+	  widget = gtk_window_get_focus (GTK_WINDOW (toplevel));
           priv = widget->priv;
 
 	  if (widget == focus_widget)
@@ -5551,7 +5551,7 @@ gtk_widget_is_focus (GtkWidget *widget)
   toplevel = gtk_widget_get_toplevel (widget);
   
   if (GTK_IS_WINDOW (toplevel))
-    return widget == GTK_WINDOW (toplevel)->focus_widget;
+    return widget == gtk_window_get_focus (GTK_WINDOW (toplevel));
   else
     return FALSE;
 }
@@ -7666,7 +7666,7 @@ gtk_widget_get_screen_unchecked (GtkWidget *widget)
   if (gtk_widget_is_toplevel (toplevel))
     {
       if (GTK_IS_WINDOW (toplevel))
-	return GTK_WINDOW (toplevel)->screen;
+	return gtk_window_get_screen (GTK_WINDOW (toplevel));
       else if (GTK_IS_INVISIBLE (toplevel))
 	return gtk_invisible_get_screen (GTK_INVISIBLE (widget));
     }