diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-08-20 17:03:15 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-08-20 17:04:14 -0400 |
| commit | 0244dc8017a2b3dbd53c051ea7206646ef1437a6 (patch) | |
| tree | 0e61952e8c206421ce4252464fa2d8b14ddee3ae /gtk/gtkmenutoolbutton.c | |
| parent | fb6d4c2f3dc018ba9af4457f9eb73d743d2e9ccd (diff) | |
| download | gtk+-0244dc8017a2b3dbd53c051ea7206646ef1437a6.tar.gz | |
GtkMenuButton: rename _set_menu() to _set_popup()
It's too close to the release so we'll keep _set_menu() around, but
deprecate it, pointing to the new API. It will be removed (and the name
reused) before the 3.6.0 release.
https://bugzilla.gnome.org/show_bug.cgi?id=682235
Diffstat (limited to 'gtk/gtkmenutoolbutton.c')
| -rw-r--r-- | gtk/gtkmenutoolbutton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index c7d014ca4d..c133f88a7b 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -221,7 +221,7 @@ gtk_menu_tool_button_get_property (GObject *object, switch (prop_id) { case PROP_MENU: - g_value_set_object (value, gtk_menu_button_get_menu (GTK_MENU_BUTTON (button->priv->arrow_button))); + g_value_set_object (value, gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button))); break; default: @@ -419,10 +419,10 @@ gtk_menu_tool_button_set_menu (GtkMenuToolButton *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"); } @@ -445,7 +445,7 @@ gtk_menu_tool_button_get_menu (GtkMenuToolButton *button) g_return_val_if_fail (GTK_IS_MENU_TOOL_BUTTON (button), NULL); - ret = gtk_menu_button_get_menu (GTK_MENU_BUTTON (button->priv->arrow_button)); + ret = gtk_menu_button_get_popup (GTK_MENU_BUTTON (button->priv->arrow_button)); if (!ret) return NULL; |