diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 1997-12-18 02:17:14 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1997-12-18 02:17:14 +0000 |
| commit | d5d01a5af9aaa11762d7ba86760796df00af3786 (patch) | |
| tree | c12bb7c7980b3177456cab8987755a976297b205 /gtk/gtkmenufactory.c | |
| parent | 65e63db01e93820093c2eb5169d5f8c0be3fe4e5 (diff) | |
| download | gtk+-d5d01a5af9aaa11762d7ba86760796df00af3786.tar.gz | |
It's all in the changelog. Well, almost all.
-owt
Diffstat (limited to 'gtk/gtkmenufactory.c')
| -rw-r--r-- | gtk/gtkmenufactory.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gtk/gtkmenufactory.c b/gtk/gtkmenufactory.c index d6e9ea6841..eef5c8a373 100644 --- a/gtk/gtkmenufactory.c +++ b/gtk/gtkmenufactory.c @@ -85,6 +85,9 @@ gtk_menu_factory_destroy (GtkMenuFactory *factory) gtk_menu_factory_destroy (subfactory); } + + if (factory->table) + gtk_accelerator_table_unref (factory->table); } void @@ -237,11 +240,8 @@ gtk_menu_factory_create (GtkMenuFactory *factory, &accelerator_key, &accelerator_mods); if (!factory->table) - { - factory->table = gtk_accelerator_table_new (); - gtk_accelerator_table_ref (factory->table); - } - + factory->table = gtk_accelerator_table_new (); + gtk_widget_install_accelerator (menu_path->widget, factory->table, "activate", @@ -291,10 +291,7 @@ gtk_menu_factory_create (GtkMenuFactory *factory, gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_path->widget), menu); if (!factory->table) - { - factory->table = gtk_accelerator_table_new (); - gtk_accelerator_table_ref (factory->table); - } + factory->table = gtk_accelerator_table_new (); gtk_menu_set_accelerator_table (GTK_MENU (menu), factory->table); } @@ -369,10 +366,7 @@ gtk_menu_factory_make_widget (GtkMenuFactory *factory) widget = gtk_menu_new (); if (!factory->table) - { - factory->table = gtk_accelerator_table_new (); - gtk_accelerator_table_ref (factory->table); - } + factory->table = gtk_accelerator_table_new (); gtk_menu_set_accelerator_table (GTK_MENU (widget), factory->table); return widget; case GTK_MENU_FACTORY_MENU_BAR: |