From acf4bad9d022d9d4c69e7d05877194157f3fd31c Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 22 Apr 2002 21:46:59 +0000 Subject: Bumped version number to 0.19.99.14. 2002-04-22 Christopher James Lahey * configure.in: Bumped version number to 0.19.99.14. * gal/widgets/e-popup-menu.c, gal/widgets/e-popup-menu.h (e_popup_menu_copy_1, e_popup_menu_free_1, e_popup_menu_copy, e_popup_menu_free): Added these functions From gal/e-table/ChangeLog: 2002-04-22 Christopher James Lahey * e-table-memory-store.c, e-table-memory-store.h: Renamed the insert functions in this class to make a bit more sense. From gal/menus/ChangeLog: 2002-04-22 Christopher James Lahey * gal-view-instance.c, gal-view-instance.h (gal_view_instance_get_popup_menu, gal_view_instance_free_popup_menu): Added these functions. Used to add a current view menu to your popup menus. From gal/shortcut-bar/ChangeLog: 2002-04-22 Christopher James Lahey * e-icon-bar.c (e_icon_bar_drag_motion): Removed an unused variable. svn path=/trunk/; revision=16559 --- widgets/misc/e-popup-menu.h | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'widgets/misc/e-popup-menu.h') diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 095c1a42d7..50fb7c23e5 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -74,7 +74,7 @@ typedef struct _EPopupMenu EPopupMenu; struct _EPopupMenu { char *name; - const gchar *pixmap; + gchar *pixname; void (*fn) (GtkWidget *widget, void *closure); EPopupMenu *submenu; guint32 disable_mask; @@ -91,16 +91,24 @@ struct _EPopupMenu { }; -GtkMenu *e_popup_menu_create (EPopupMenu *menu_list, - guint32 disable_mask, - guint32 hide_mask, - void *default_closure); - -void e_popup_menu_run (EPopupMenu *menu_list, - GdkEvent *event, - guint32 disable_mask, - guint32 hide_mask, - void *default_closure); +GtkMenu *e_popup_menu_create (EPopupMenu *menu_list, + guint32 disable_mask, + guint32 hide_mask, + void *default_closure); +void e_popup_menu_run (EPopupMenu *menu_list, + GdkEvent *event, + guint32 disable_mask, + guint32 hide_mask, + void *default_closure); + +/* Doesn't copy or free the memory. Just the contents. */ +void e_popup_menu_copy_1 (EPopupMenu *destination, + const EPopupMenu *menu_item); +void e_popup_menu_free_1 (EPopupMenu *menu_item); + +/* Copies or frees the entire structure. */ +EPopupMenu *e_popup_menu_copy (const EPopupMenu *menu_item); +void e_popup_menu_free (EPopupMenu *menu_item); END_GNOME_DECLS -- cgit v1.2.3