From fd1f67375e8caa30af52dc27e509ae632bdecf89 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 28 Aug 2012 10:54:58 +0000 Subject: [PATCH] add missing consts SVN revision: 75777 --- src/bin/e_menu.c | 8 ++++---- src/bin/e_menu.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 84e70f385..eb0270ae9 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -898,23 +898,23 @@ e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Men } 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) +e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data) { E_OBJECT_CHECK(mi); E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE); mi->submenu_pre_cb.func = func; - mi->submenu_pre_cb.data = data; + mi->submenu_pre_cb.data = (void*)data; if (!mi->submenu_post_cb.func) mi->submenu_post_cb.func = _e_menu_cb_item_submenu_post_default; } 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) +e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data) { E_OBJECT_CHECK(mi); E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE); mi->submenu_post_cb.func = func; - mi->submenu_post_cb.data = data; + mi->submenu_post_cb.data = (void*)data; } EAPI void diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h index b50e0a1ca..454a92e24 100644 --- a/src/bin/e_menu.h +++ b/src/bin/e_menu.h @@ -199,8 +199,8 @@ 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, E_Menu_Cb func, const 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_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); +EAPI void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const 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);