summaryrefslogtreecommitdiff
path: root/gtk/gtkmenuitem.h
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2007-06-13 15:21:10 +0000
committerMichael Natterer <mitch@src.gnome.org>2007-06-13 15:21:10 +0000
commitece25ff10cd1b23e95b56498b523ed55c8441589 (patch)
tree5523d147638fee5b7d606be933f290ffd9a26d60 /gtk/gtkmenuitem.h
parent5c48e783d463b07fb3dfe2d8a16d3ab3b6180763 (diff)
downloadgtk+-ece25ff10cd1b23e95b56498b523ed55c8441589.tar.gz
add "submenu" property. Fix gtk_menu_item_set_submenu() to accept NULL
2007-06-13 Michael Natterer <mitch@imendio.com> * gtk/gtkmenuitem.[ch]: add "submenu" property. Fix gtk_menu_item_set_submenu() to accept NULL submenus and deprecate gtk_menu_item_remove_submenu() because we have a properly working setter now (bug #447065). * gtk/gtk.symbols: deprecate gtk_menu_item_remove_submenu(). * gtk/gtkcombobox.c: use gtk_menu_item_set_submenu() instead of gtk_menu_item_remove_submenu(). svn path=/trunk/; revision=18125
Diffstat (limited to 'gtk/gtkmenuitem.h')
-rw-r--r--gtk/gtkmenuitem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 84e9f43d2e..4da800edbb 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -99,7 +99,6 @@ GtkWidget* gtk_menu_item_new_with_mnemonic (const gchar *label);
void gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
GtkWidget *submenu);
GtkWidget* gtk_menu_item_get_submenu (GtkMenuItem *menu_item);
-void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item);
void gtk_menu_item_select (GtkMenuItem *menu_item);
void gtk_menu_item_deselect (GtkMenuItem *menu_item);
void gtk_menu_item_activate (GtkMenuItem *menu_item);
@@ -124,6 +123,7 @@ void _gtk_menu_item_popup_submenu (GtkWidget *menu_item,
void _gtk_menu_item_popdown_submenu (GtkWidget *menu_item);
#ifndef GTK_DISABLE_DEPRECATED
+void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item);
#define gtk_menu_item_right_justify(menu_item) gtk_menu_item_set_right_justified ((menu_item), TRUE)
#endif /* GTK_DISABLE_DEPRECATED */