X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcsstypes.c;h=e67dceac56e5f9ca6edc4a640fd2b638a597e9f6;hb=658e7c45353d625dc30852f49fb92a1959f615fa;hp=b69b0feccafb591fdb0bc30be7098400f2b2b270;hpb=a2408088240d25157f56f85dd0dcdef6fc063682;p=~andy%2Fgtk

diff --git a/gtk/gtkcsstypes.c b/gtk/gtkcsstypes.c
index b69b0fecc..e67dceac5 100644
--- a/gtk/gtkcsstypes.c
+++ b/gtk/gtkcsstypes.c
@@ -82,3 +82,11 @@ _gtk_css_change_for_child (GtkCssChange match)
   return gtk_css_change_translate (match, table, G_N_ELEMENTS (table)); 
 }
 
+GtkCssDependencies
+_gtk_css_dependencies_union (GtkCssDependencies first,
+                             GtkCssDependencies second)
+{
+  return (first  & ~GTK_CSS_EQUALS_PARENT) | ((first  & GTK_CSS_EQUALS_PARENT) ? GTK_CSS_DEPENDS_ON_PARENT : 0)
+       | (second & ~GTK_CSS_EQUALS_PARENT) | ((second & GTK_CSS_EQUALS_PARENT) ? GTK_CSS_DEPENDS_ON_PARENT : 0);
+}
+