AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify GTK_STATE_FLAG_FOCUSED handling in state propagation.

Browse Source 
Just unsetting it before propagating to the children suffices.
This commit is contained in:
Carlos Garnacho 2011-01-23 18:37:14 +01:00
parent 0c7772f0cf
commit b3ba85a01c
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwidget.c
View File

@ -6972,14 +6972,6 @@ _gtk_widget_update_state_flags (GtkWidget *widget,
if (operation != STATE_CHANGE_REPLACE)
flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
/* Focused state is meant to be set only on the widget
* being changed itself, not on the children */
if ((flags & GTK_STATE_FLAG_FOCUSED) !=
(priv->state_flags & GTK_STATE_FLAG_FOCUSED))
priv->state_flags |= GTK_STATE_FLAG_FOCUSED;
flags &= ~(GTK_STATE_FLAG_FOCUSED);
if (flags != 0 ||
operation == STATE_CHANGE_REPLACE)
{
@ -11266,7 +11258,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
data->parent_sensitive = gtk_widget_is_sensitive (widget);
/* Do not propagate insensitive state further */
data->flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
data->flags &= ~(GTK_STATE_FLAG_INSENSITIVE | GTK_STATE_FLAG_FOCUSED);
if (data->use_forall)
gtk_container_forall (GTK_CONTAINER (widget),