switch (prop_id)
{
case PROP_MENU:
- g_object_get_property (G_OBJECT (button->priv->arrow_button), "menu", value);
+ g_value_set_object (value, gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button)));
break;
default:
gtk_widget_show_all (box);
gtk_container_add (GTK_CONTAINER (button), box);
- gtk_menu_button_set_parent (GTK_MENU_BUTTON (arrow_button),
- GTK_WIDGET (button));
+ gtk_menu_button_set_align_widget (GTK_MENU_BUTTON (arrow_button),
+ GTK_WIDGET (button));
button->priv->button = real_button;
button->priv->arrow_button = arrow_button;
priv = button->priv;
- _gtk_menu_button_set_menu_with_func (GTK_MENU_BUTTON (priv->arrow_button),
- menu,
- _show_menu_emit,
- button);
+ _gtk_menu_button_set_popup_with_func (GTK_MENU_BUTTON (priv->arrow_button),
+ menu,
+ _show_menu_emit,
+ button);
g_object_notify (G_OBJECT (button), "menu");
}
GtkWidget *
gtk_menu_tool_button_get_menu (GtkMenuToolButton *button)
{
- GtkWidget *ret;
+ GtkMenu *ret;
g_return_val_if_fail (GTK_IS_MENU_TOOL_BUTTON (button), NULL);
- g_object_get (button->priv->arrow_button, "menu", &ret, NULL);
+ ret = gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button));
+ if (!ret)
+ return NULL;
- return ret;
+ return GTK_WIDGET (ret);
}
/**