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

widget: Propagate the right states to the widget when setting the parent

Browse Source
This commit is contained in:
Benjamin Otte 2011-03-30 16:38:45 +02:00
parent 1e43965350
commit 0bfc95faa3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkwidget.c
View File

@ -299,6 +299,13 @@
* </refsect2>
*/
/* Add flags here that should not be propagated to children. By default,
* all flags will be set on children (think prelight or active), but we
* might want to not do this for some.
*/
#define GTK_STATE_FLAGS_DONT_PROPAGATE (GTK_STATE_FLAG_FOCUSED)
#define GTK_STATE_FLAGS_DO_PROPAGATE (~GTK_STATE_FLAGS_DONT_PROPAGATE)
#define WIDGET_CLASS(w) GTK_WIDGET_GET_CLASS (w)
#define INIT_PATH_SIZE (512)
@ -7698,9 +7705,8 @@ gtk_widget_set_parent (GtkWidget *widget,
parent_flags = gtk_widget_get_state_flags (parent);
/* Merge both old state and current parent state,
* We don't want the insensitive flag to propagate
* to the new child though */
data.flags = parent_flags & ~GTK_STATE_FLAG_INSENSITIVE;
* making sure to only propagate the right states */
data.flags = parent_flags & GTK_STATE_FLAGS_DO_PROPAGATE;
data.flags |= priv->state_flags;
data.operation = STATE_CHANGE_REPLACE;
@ -11240,8 +11246,8 @@ gtk_widget_propagate_state (GtkWidget *widget,
{
GtkStateData child_data = *data;
/* Do not propagate focused state further */
child_data.flags &= ~GTK_STATE_FLAG_FOCUSED;
/* Make sure to only propate the right states further */
child_data.flags &= GTK_STATE_FLAGS_DO_PROPAGATE;
if (child_data.use_forall)
gtk_container_forall (GTK_CONTAINER (widget),