diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h index 13e16ea30..16ff9cf45 100644 --- a/src/bin/e_menu.h +++ b/src/bin/e_menu.h @@ -21,6 +21,9 @@ typedef struct _E_Menu_Category_Callback E_Menu_Category_Callback; #define E_MENU_ITEM_TYPE 0xE0b0100a +typedef void (*E_Menu_Cb) (void *data, E_Menu *m, E_Menu_Item *mi); + + struct _E_Menu { E_Object e_obj_inherit; @@ -110,27 +113,27 @@ struct _E_Menu_Item struct { void *data; - void (*func) (void *data, E_Menu *m, E_Menu_Item *mi); + E_Menu_Cb func; } cb; /* Callback for menu item activation */ struct { void *data; - void (*func) (void *data, E_Menu *m, E_Menu_Item *mi); + E_Menu_Cb func; } realize_cb; /* Callback for menu item icon realization */ struct { void *data; - void (*func) (void *data, E_Menu *m, E_Menu_Item *mi); + E_Menu_Cb func; } submenu_pre_cb; struct { void *data; - void (*func) (void *data, E_Menu *m, E_Menu_Item *mi); + E_Menu_Cb func; } submenu_post_cb; struct { void *data; - void (*func) (void *data, E_Menu *m, E_Menu_Item *mi); + E_Menu_Cb func; } drag_cb; /* Callback for menu item dragging */ struct { @@ -194,11 +197,11 @@ EAPI void e_menu_item_radio_set(E_Menu_Item *mi, int rad); EAPI void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg); EAPI void e_menu_item_toggle_set(E_Menu_Item *mi, int tog); EAPI int e_menu_item_toggle_get(E_Menu_Item *mi); -EAPI void e_menu_item_callback_set(E_Menu_Item *mi, void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data); -EAPI void e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data); -EAPI void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data); -EAPI void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data); -EAPI void e_menu_item_drag_callback_set(E_Menu_Item *mi, void (*func) (void *data, E_Menu *m, E_Menu_Item *mi), void *data); +EAPI void e_menu_item_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +EAPI void e_menu_item_realize_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +EAPI void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +EAPI void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +EAPI void e_menu_item_drag_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); EAPI void e_menu_item_active_set(E_Menu_Item *mi, int active); EAPI void e_menu_item_disabled_set(E_Menu_Item *mi, int disable);