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

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

Browse Source
This commit is contained in:
Javier Jardón
2010-08-17 15:14:58 +02:00
parent 97cbe801c1
commit 31d22d3083
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtksocket.c
View File

@ -653,7 +653,7 @@ socket_update_focus_in (GtkSocket *socket)
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
if (gtk_widget_is_toplevel (toplevel) && if (gtk_widget_is_toplevel (toplevel) &&
GTK_WINDOW (toplevel)->has_toplevel_focus && gtk_window_has_toplevel_focus (GTK_WINDOW (toplevel)) &&
gtk_widget_is_focus (GTK_WIDGET (socket))) gtk_widget_is_focus (GTK_WIDGET (socket)))
focus_in = TRUE; focus_in = TRUE;
} }
@ -676,7 +676,7 @@ socket_update_active (GtkSocket *socket)
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
if (gtk_widget_is_toplevel (toplevel) && if (gtk_widget_is_toplevel (toplevel) &&
GTK_WINDOW (toplevel)->is_active) gtk_window_is_active (GTK_WINDOW (toplevel)))
active = TRUE; active = TRUE;
} }
@ -997,6 +997,7 @@ _gtk_socket_advance_toplevel_focus (GtkSocket *socket,
GtkWindow *window; GtkWindow *window;
GtkContainer *container; GtkContainer *container;
GtkWidget *child; GtkWidget *child;
GtkWidget *focus_widget;
GtkWidget *toplevel; GtkWidget *toplevel;
GtkWidget *old_focus_child; GtkWidget *old_focus_child;
GtkWidget *parent; GtkWidget *parent;
@ -1034,10 +1035,11 @@ _gtk_socket_advance_toplevel_focus (GtkSocket *socket,
_gtk_socket_windowing_embed_set_focus_wrapped (); _gtk_socket_windowing_embed_set_focus_wrapped ();
} }
if (window->focus_widget) focus_widget = gtk_window_get_focus (window);
if (window)
{ {
/* Wrapped off the end, clear the focus setting for the toplevel */ /* Wrapped off the end, clear the focus setting for the toplevel */
parent = gtk_widget_get_parent (window->focus_widget); parent = gtk_widget_get_parent (focus_widget);
while (parent) while (parent)
{ {
gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL); gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL);