Merge branch 'master' into broadway2

[~andy/gtk] / gtk / gtkmenutoolbutton.c

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index f657805d70ab02a681ea661b6164d0cfb4c5a823..e63d795317b33271018c345b4ca86fb097de4f3e 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -30,6 +30,7 @@
 #include "gtkmenu.h"
 #include "gtkmain.h"
 #include "gtksizerequest.h"
+#include "gtkbuildable.h"
 
 #include "gtkprivate.h"
 #include "gtkintl.h"
@@ -49,6 +50,12 @@ static void gtk_menu_tool_button_destroy    (GtkWidget              *widget);
 static int  menu_deactivate_cb              (GtkMenuShell           *menu_shell,
                                             GtkMenuToolButton      *button);
 
+static void gtk_menu_tool_button_buildable_interface_init (GtkBuildableIface   *iface);
+static void gtk_menu_tool_button_buildable_add_child      (GtkBuildable        *buildable,
+                                                          GtkBuilder          *builder,
+                                                          GObject             *child,
+                                                          const gchar         *type);
+
 enum
 {
   SHOW_MENU,
@@ -63,7 +70,11 @@ enum
 
 static gint signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (GtkMenuToolButton, gtk_menu_tool_button, GTK_TYPE_TOOL_BUTTON)
+static GtkBuildableIface *parent_buildable_iface;
+
+G_DEFINE_TYPE_WITH_CODE (GtkMenuToolButton, gtk_menu_tool_button, GTK_TYPE_TOOL_BUTTON,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                gtk_menu_tool_button_buildable_interface_init))
 
 static void
 gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
@@ -453,6 +464,26 @@ gtk_menu_tool_button_destroy (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_menu_tool_button_parent_class)->destroy (widget);
 }
 
+static void
+gtk_menu_tool_button_buildable_add_child (GtkBuildable *buildable,
+                                         GtkBuilder   *builder,
+                                         GObject      *child,
+                                         const gchar  *type)
+{
+  if (type && strcmp (type, "menu") == 0)
+    gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (buildable),
+                                   GTK_WIDGET (child));
+  else
+    parent_buildable_iface->add_child (buildable, builder, child, type);
+}
+
+static void
+gtk_menu_tool_button_buildable_interface_init (GtkBuildableIface *iface)
+{
+  parent_buildable_iface = g_type_interface_peek_parent (iface);
+  iface->add_child = gtk_menu_tool_button_buildable_add_child;
+}
+
 /**
  * gtk_menu_tool_button_new:
  * @icon_widget: (allow-none): a widget that will be used as icon widget, or %NULL