callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename get_submenu() to create_menu(); rename gtk_action_get_submenu() to

Browse Source 
2007-03-16  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkaction.h:
	* gtk/gtkaction.c: Rename get_submenu() to create_menu();
	rename gtk_action_get_submenu() to gtk_action_create_menu().

	* gtk/gtkrecentaction.c: Update for GtkAction change.

	* gtk/gtkuimanager.c (update_node): Update for GtkAction change;
	also, use the menu from the GtkAction for both menuitem and
	toolitem nodes.

svn path=/trunk/; revision=17535
This commit is contained in:
Emmanuele Bassi
2007-03-16 20:04:57 +00:00
committed by Emmanuele Bassi
parent bd05c44046
commit 2c1a285f1b
5 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkrecentaction.c
View File

@ -386,7 +386,7 @@ gtk_recent_action_disconnect_proxy (GtkAction *action,
}
static GtkWidget *
gtk_recent_action_get_submenu (GtkAction *action)
gtk_recent_action_create_menu (GtkAction *action)
{
GtkRecentAction *recent_action = GTK_RECENT_ACTION (action);
GtkRecentActionPrivate *priv = recent_action->priv;
@ -430,7 +430,7 @@ gtk_recent_action_create_menu_item (GtkAction *action)
GtkWidget *menu;
GtkWidget *menuitem;
menu = gtk_recent_action_get_submenu (action);
menu = gtk_recent_action_create_menu (action);
menuitem = g_object_new (GTK_TYPE_IMAGE_MENU_ITEM, NULL);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
gtk_widget_show (menu);
@ -444,7 +444,7 @@ gtk_recent_action_create_tool_item (GtkAction *action)
GtkWidget *menu;
GtkWidget *toolitem;
menu = gtk_recent_action_get_submenu (action);
menu = gtk_recent_action_create_menu (action);
toolitem = g_object_new (GTK_TYPE_MENU_TOOL_BUTTON, NULL);
gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (toolitem), menu);
gtk_widget_show (menu);
@ -652,7 +652,7 @@ gtk_recent_action_class_init (GtkRecentActionClass *klass)
action_class->disconnect_proxy = gtk_recent_action_disconnect_proxy;
action_class->create_menu_item = gtk_recent_action_create_menu_item;
action_class->create_tool_item = gtk_recent_action_create_tool_item;
action_class->get_submenu = gtk_recent_action_get_submenu;
action_class->create_menu = gtk_recent_action_create_menu;
action_class->menu_item_type = GTK_TYPE_IMAGE_MENU_ITEM;
action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;