[gtk+/gtk-style-context: 5/206] gtkstyleset.h: Add declaration for gtk_style_set_merge().

[Carlos Garnacho <carlosg src gnome org>]

commit 90e1b2de316c99d235d86ea96727d7a2792fabb2
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Mar 4 22:58:28 2010 +0100

    gtkstyleset.h: Add declaration for gtk_style_set_merge().

 gtk/gtkstyleset.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkstyleset.h b/gtk/gtkstyleset.h
index 48b3c3b..2853d4c 100644
--- a/gtk/gtkstyleset.h
+++ b/gtk/gtkstyleset.h
@@ -65,6 +65,10 @@ void     gtk_style_set_unset_property (GtkStyleSet  *set,
 
 void     gtk_style_set_clear          (GtkStyleSet  *set);
 
+void     gtk_style_set_merge          (GtkStyleSet       *set,
+                                       const GtkStyleSet *set_to_merge,
+                                       gboolean           replace);
+
 G_END_DECLS
 
 #endif /* __GTK_STYLE_PROPERTY_SET_H__ */