diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2002-01-21 18:44:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2002-01-21 18:44:20 +0000 |
| commit | 236118bf89484ed0d34b73dc3b5d4ea66d8da634 (patch) | |
| tree | 9a4a0a9d8638721e55cef39ff7d48f2630b7d016 /gtk/gtkitemfactory.c | |
| parent | 19c5e80ce770d164afc3b2682f02e69e0899cceb (diff) | |
| download | gtk+-236118bf89484ed0d34b73dc3b5d4ea66d8da634.tar.gz | |
Document allowed values for ifactory.
* gtk/gtkitemfactory.c (gtk_item_factory_popup,
gtk_item_factory_popup_with_data): Document allowed values
for ifactory.
* gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make
it work for paths with underline accelerators.
Diffstat (limited to 'gtk/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 780d2d7b1c..af4299761f 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -1326,10 +1326,24 @@ void gtk_item_factory_delete_entry (GtkItemFactory *ifactory, GtkItemFactoryEntry *entry) { + gchar *path; + gchar *parent_path; + gchar *name; + g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory)); g_return_if_fail (entry != NULL); + g_return_if_fail (entry->path != NULL); + g_return_if_fail (entry->path[0] == '/'); + + if (!gtk_item_factory_parse_path (ifactory, entry->path, + &path, &parent_path, &name)) + return; + + gtk_item_factory_delete_item (ifactory, path); - gtk_item_factory_delete_item (ifactory, entry->path); + g_free (path); + g_free (parent_path); + g_free (name); } /** @@ -1429,7 +1443,7 @@ ifactory_delete_popup_data (GtkObject *object, /** * gtk_item_factory_popup: - * @ifactory: a #GtkItemFactory + * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new()) * @x: the x position * @y: the y position * @mouse_button: the mouse button which was pressed to initiate this action @@ -1449,7 +1463,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory, /** * gtk_item_factory_popup_with_data: - * @ifactory: a #GtkItemFactory + * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new()) * @popup_data: data available for callbacks while the menu is posted * @destroy: a #GtkDestroyNotify function to be called on @popup_data when * the menu is unposted |