From 066b7b5e9f417376dde95f7220ba94bdd11070a0 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Sat, 16 Mar 2002 02:17:13 +0000 Subject: Allow for per-item closures and also instead of taking a const char 2002-03-15 Jeffrey Stedfast * gal/gal/widgets/e-popup-menu.c: Allow for per-item closures and also instead of taking a const char *pixname, take a GtkWidget *pixmap instead. * gal/widgets/e-categories.c: Update to sync up with changes made to the EPopupMenu Api. svn path=/trunk/; revision=16182 --- widgets/misc/e-popup-menu.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 e621279345..66435b9ecf 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -32,15 +32,16 @@ BEGIN_GNOME_DECLS -#define E_POPUP_SEPARATOR { "", NULL, (NULL), NULL, 0 } -#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 } +#define E_POPUP_SEPARATOR { "", NULL, (NULL), NULL, NULL, 0 } +#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, NULL, 0 } typedef struct _EPopupMenu EPopupMenu; struct _EPopupMenu { char *name; - char *pixname; + GtkWidget *pixmap; void (*fn) (GtkWidget *widget, void *closure); + void *closure; EPopupMenu *submenu; guint32 disable_mask; }; @@ -48,13 +49,13 @@ struct _EPopupMenu { GtkMenu *e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_mask, - void *closure); + void *default_closure); void e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, - void *closure); + void *default_closure); END_GNOME_DECLS -- cgit v1.2.3