diff options
| author | Søren Sandmann <sandmann@redhat.com> | 2004-09-14 21:40:41 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-09-14 21:40:41 +0000 |
| commit | 59207896851a3bc0cb46761d1baab0f478a65edb (patch) | |
| tree | 270857b34ce9e7757ca1506b5353afb6e4a5eb6a /gtk/gtkaction.c | |
| parent | f67c09c994f3e4a75618fd357afeeb6a3a8b40a5 (diff) | |
| download | gtk+-59207896851a3bc0cb46761d1baab0f478a65edb.tar.gz | |
Call gtk_tool_item_rebuild_menu().
Tue Sep 14 23:20:56 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkaction.c (connect_proxy): Call
gtk_tool_item_rebuild_menu().
* gtk/gtktoolitem.c (gtk_tool_item_class_init): Update
documentation for GtkToolItem::create_menu_proxy.
* gtk/gtktoolitem.c (gtk_tool_item_rebuild_menu): New
API to make the toolbar update itself when the proxy menu item
for a tool item changes.
* gtk/gtktoolbutton.c (gtk_tool_button_construct_contents): Call
gtk_tool_item_rebuild_menu here()
* gtk/gtktoolbutton.c (gtk_tool_button_construct_contents):
Remove redundant check for need_label.
Diffstat (limited to 'gtk/gtkaction.c')
| -rw-r--r-- | gtk/gtkaction.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index c946f79b21..d154b9582d 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -869,9 +869,9 @@ connect_proxy (GtkAction *action, } if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)) == NULL) - g_signal_connect_object (proxy, "activate", - G_CALLBACK (gtk_action_activate), action, - G_CONNECT_SWAPPED); + g_signal_connect_object (proxy, "activate", + G_CALLBACK (gtk_action_activate), action, + G_CONNECT_SWAPPED); } else if (GTK_IS_TOOL_ITEM (proxy)) @@ -903,6 +903,8 @@ connect_proxy (GtkAction *action, G_CALLBACK (gtk_action_create_menu_proxy), action, 0); + gtk_tool_item_rebuild_menu (GTK_TOOL_ITEM (proxy)); + /* toolbar button specific synchronisers ... */ if (GTK_IS_TOOL_BUTTON (proxy)) { @@ -920,10 +922,10 @@ connect_proxy (GtkAction *action, g_signal_connect_object (action, "notify::stock-id", G_CALLBACK (gtk_action_sync_property), proxy, 0); - g_signal_connect_object (proxy, "clicked", - G_CALLBACK (gtk_action_activate), action, - G_CONNECT_SWAPPED); - } + g_signal_connect_object (proxy, "clicked", + G_CALLBACK (gtk_action_activate), action, + G_CONNECT_SWAPPED); + } } else if (GTK_IS_BUTTON (proxy)) { |