Typedefs to help bindings, type less and make things easier to identify.

SVN revision: 47292

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index b507a35..b6329d6 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -595,7 +595,7 @@ extern "C" {
    EAPI void         elm_entry_selection_copy(Evas_Object *obj);
    EAPI void         elm_entry_selection_paste(Evas_Object *obj);
    EAPI void         elm_entry_context_menu_clear(Evas_Object *obj);
-   EAPI void         elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI void         elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
    EAPI void         elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
    EAPI Eina_Bool    elm_entry_context_menu_disabled_get(Evas_Object *obj);
    EAPI char        *elm_entry_markup_to_utf8(const char *s);
@@ -731,9 +731,9 @@ extern "C" {
    EAPI void         elm_hoversel_hover_end(Evas_Object *obj);
    EAPI void         elm_hoversel_clear(Evas_Object *obj);
    EAPI const Eina_List * elm_hoversel_items_get(Evas_Object *obj);
-   EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
    EAPI void         elm_hoversel_item_del(Elm_Hoversel_Item *item);
-   EAPI void         elm_hoversel_item_del_cb_set(Elm_Hoversel_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info));
+   EAPI void         elm_hoversel_item_del_cb_set(Elm_Hoversel_Item *it, Evas_Smart_Cb func);
    EAPI void        *elm_hoversel_item_data_get(Elm_Hoversel_Item *it);
    EAPI const char  *elm_hoversel_item_label_get(Elm_Hoversel_Item *it);
    EAPI void         elm_hoversel_item_icon_set(Elm_Hoversel_Item *it, const char *icon_file, const char *icon_group, Elm_Icon_Type icon_type);
@@ -748,12 +748,12 @@ extern "C" {
    EAPI Evas_Object      *elm_toolbar_add(Evas_Object *parent);
    EAPI void              elm_toolbar_icon_size_set(Evas_Object *obj, int icon_size);
    EAPI int               elm_toolbar_icon_size_get(Evas_Object *obj);
-   EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_Toolbar_Item *elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data);
    EAPI Evas_Object      *elm_toolbar_item_icon_get(Elm_Toolbar_Item *item);
    EAPI const char       *elm_toolbar_item_label_get(Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_label_set(Elm_Toolbar_Item *item, const char *label);
    EAPI void              elm_toolbar_item_del(Elm_Toolbar_Item *item);
-   EAPI void              elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info));
+   EAPI void              elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, Evas_Smart_Cb func);
    EAPI void              elm_toolbar_item_select(Elm_Toolbar_Item *item);
    EAPI Eina_Bool         elm_toolbar_item_disabled_get(Elm_Toolbar_Item *item);
    EAPI void              elm_toolbar_item_disabled_set(Elm_Toolbar_Item *item, Eina_Bool disabled);
@@ -775,14 +775,14 @@ extern "C" {
    EAPI void            elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
    EAPI void            elm_menu_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
    EAPI Evas_Object     *elm_menu_object_get(const Elm_Menu_Item *it);
-   EAPI Elm_Menu_Item   *elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_Menu_Item   *elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data);
    EAPI void            elm_menu_item_label_set(Elm_Menu_Item *item, const char *label);
    EAPI const char      *elm_menu_item_label_get(Elm_Menu_Item *item);
    EAPI void            elm_menu_item_icon_set(Elm_Menu_Item *item, Evas_Object *icon);
    EAPI void            elm_menu_item_disabled_set(Elm_Menu_Item *item, Eina_Bool disabled);
    EAPI Elm_Menu_Item   *elm_menu_item_separator_add(Evas_Object *obj, Elm_Menu_Item *parent);
    EAPI void            elm_menu_item_del(Elm_Menu_Item *item);
-   EAPI void            elm_menu_item_del_cb_set(Elm_Menu_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info));
+   EAPI void            elm_menu_item_del_cb_set(Elm_Menu_Item *it, Evas_Smart_Cb func);
    EAPI void           *elm_menu_item_data_get(const Elm_Menu_Item *it);
    EAPI void            elm_menu_item_data_set(Elm_Menu_Item *item, const void *data);
    EAPI const Eina_List *elm_menu_item_subitems_get(Elm_Menu_Item *item);
@@ -798,10 +798,10 @@ extern "C" {
      } Elm_List_Mode;
    typedef struct _Elm_List_Item Elm_List_Item;
    EAPI Evas_Object     *elm_list_add(Evas_Object *parent);
-   EAPI Elm_List_Item   *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
-   EAPI Elm_List_Item   *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
-   EAPI Elm_List_Item   *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
-   EAPI Elm_List_Item   *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_List_Item   *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_List_Item   *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_List_Item   *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
+   EAPI Elm_List_Item   *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data);
    EAPI void             elm_list_clear(Evas_Object *obj);
    EAPI void             elm_list_go(Evas_Object *obj);
    EAPI void             elm_list_multi_select_set(Evas_Object *obj, Eina_Bool multi);
@@ -816,7 +816,7 @@ extern "C" {
    EAPI Eina_Bool        elm_list_item_selected_get(Elm_List_Item *item);
    EAPI void             elm_list_item_show(Elm_List_Item *item);
    EAPI void             elm_list_item_del(Elm_List_Item *item);
-   EAPI void             elm_list_item_del_cb_set(Elm_List_Item *item, void (*func)(void *data, Evas_Object *obj, void *event_info));
+   EAPI void             elm_list_item_del_cb_set(Elm_List_Item *item, Evas_Smart_Cb func);
    EAPI void            *elm_list_item_data_get(const Elm_List_Item *item);
    EAPI Evas_Object     *elm_list_item_icon_get(const Elm_List_Item *item);
    EAPI void             elm_list_item_icon_set(Elm_List_Item *item, Evas_Object *icon);
@@ -839,7 +839,7 @@ extern "C" {
    // FIXME: incomplete - carousel. don't use this until this comment is removed
    typedef struct _Elm_Carousel_Item Elm_Carousel_Item;
    EAPI Evas_Object       *elm_carousel_add(Evas_Object *parent);
-   EAPI Elm_Carousel_Item *elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_Carousel_Item *elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data);
    EAPI void               elm_carousel_item_del(Elm_Carousel_Item *item);
    EAPI void               elm_carousel_item_select(Elm_Carousel_Item *item);
    /* smart callbacks called:
@@ -887,10 +887,10 @@ extern "C" {
      };
 
    EAPI Evas_Object      *elm_genlist_add(Evas_Object *parent);
-   EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
-   EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
-   EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
-   EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, Evas_Smart_Cb func, const void *func_data);
    EAPI void              elm_genlist_clear(Evas_Object *obj);
    EAPI void              elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
    EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
@@ -1287,7 +1287,7 @@ extern "C" {
    EAPI void         elm_scrolled_entry_selection_copy(Evas_Object *obj);
    EAPI void         elm_scrolled_entry_selection_paste(Evas_Object *obj);
    EAPI void         elm_scrolled_entry_context_menu_clear(Evas_Object *obj);
-   EAPI void         elm_scrolled_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI void         elm_scrolled_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data);
    EAPI void         elm_scrolled_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
    EAPI Eina_Bool    elm_scrolled_entry_context_menu_disabled_get(Evas_Object *obj);
    EAPI void         elm_scrolled_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 19547d2..c632148 100644 (file)
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -36,8 +36,8 @@ struct _Elm_Hoversel_Item
    const char *icon_file;
    const char *icon_group;
    Elm_Icon_Type icon_type;
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
-   void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
+   Evas_Smart_Cb del_cb;
    void *data;
 };
 
@@ -472,7 +472,7 @@ elm_hoversel_items_get(Evas_Object *obj)
  * @ingroup Hoversel
  */
 EAPI Elm_Hoversel_Item *
-elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -523,7 +523,7 @@ elm_hoversel_item_del(Elm_Hoversel_Item *it)
  * @ingroup Hoversel
  */
 EAPI void
-elm_hoversel_item_del_cb_set(Elm_Hoversel_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info))
+elm_hoversel_item_del_cb_set(Elm_Hoversel_Item *it, Evas_Smart_Cb func)
 {
    if (!it) return;
    it->del_cb = func;

diff --git a/src/lib/elc_scrolled_entry.c b/src/lib/elc_scrolled_entry.c
index 99b08e5..ebcc5ab 100644 (file)
--- a/src/lib/elc_scrolled_entry.c
+++ b/src/lib/elc_scrolled_entry.c
@@ -443,7 +443,7 @@ elm_scrolled_entry_context_menu_clear(Evas_Object *obj)
 }
 
 EAPI void
-elm_scrolled_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_scrolled_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_carousel.c b/src/lib/elm_carousel.c
index 1ad9d89..92c72f2 100644 (file)
--- a/src/lib/elm_carousel.c
+++ b/src/lib/elm_carousel.c
@@ -16,7 +16,7 @@ struct _Elm_Carousel_Item
 {
    Evas_Object *obj, *base, *icon;
    const char *label;
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
    const void *data;
    Eina_Bool selected : 1;
 };
@@ -193,7 +193,7 @@ elm_carousel_add(Evas_Object *parent)
 }
 
 EAPI Elm_Carousel_Item *
-elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 8500a7a..8f3ad25 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -42,7 +42,7 @@ struct _Elm_Entry_Context_Menu_Item
    const char *icon_file;
    const char *icon_group;
    Elm_Icon_Type icon_type;
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
    void *data;
 };
 
@@ -1514,7 +1514,7 @@ elm_entry_context_menu_clear(Evas_Object *obj)
 }
 
 EAPI void
-elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 909b935..cf7975c 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -298,7 +298,7 @@ struct _Elm_Genlist_Item
    Elm_Genlist_Item_Flags flags;
    struct 
      {
-        void (*func) (void *data, Evas_Object *obj, void *event_info);
+        Evas_Smart_Cb func;
         const void *data;
      } func;
 
@@ -1496,7 +1496,7 @@ static Elm_Genlist_Item *
 _item_new(Widget_Data *wd, const Elm_Genlist_Item_Class *itc,
          const void *data, Elm_Genlist_Item *parent,
          Elm_Genlist_Item_Flags flags,
-         void (*func) (void *data, Evas_Object *obj, void *event_info),
+         Evas_Smart_Cb func,
           const void *func_data)
 {
    Elm_Genlist_Item *it;
@@ -1730,7 +1730,7 @@ EAPI Elm_Genlist_Item *
 elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
                        const void *data, Elm_Genlist_Item *parent,
                        Elm_Genlist_Item_Flags flags,
-                       void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
+                       Evas_Smart_Cb func, const void *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1782,7 +1782,7 @@ EAPI Elm_Genlist_Item *
 elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
                         const void *data, Elm_Genlist_Item *parent,
                         Elm_Genlist_Item_Flags flags,
-                        void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
+                        Evas_Smart_Cb func, const void *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1822,7 +1822,7 @@ EAPI Elm_Genlist_Item *
 elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
                               const void *data, Elm_Genlist_Item *before,
                               Elm_Genlist_Item_Flags flags,
-                              void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
+                              Evas_Smart_Cb func, const void *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1864,7 +1864,7 @@ EAPI Elm_Genlist_Item *
 elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
                              const void *data, Elm_Genlist_Item *after,
                              Elm_Genlist_Item_Flags flags,
-                             void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
+                             Evas_Smart_Cb func, const void *func_data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 31fb862..73693b0 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -24,8 +24,8 @@ struct _Elm_List_Item
    Evas_Object *obj, *base;
    const char *label;
    Evas_Object *icon, *end;
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
-   void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
+   Evas_Smart_Cb del_cb;
    const void *data;
    Ecore_Timer *long_timer;
    Eina_Bool deleted : 1;
@@ -464,7 +464,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *
 }
 
 static Elm_List_Item *
-_item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+_item_new(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Elm_List_Item *it;
@@ -733,7 +733,7 @@ elm_list_add(Evas_Object *parent)
 }
 
 EAPI Elm_List_Item *
-elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -746,7 +746,7 @@ elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Eva
 }
 
 EAPI Elm_List_Item *
-elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -759,7 +759,7 @@ elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Ev
 }
 
 EAPI Elm_List_Item *
-elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data)
 {
    Widget_Data *wd;
    Elm_List_Item *it;
@@ -778,7 +778,7 @@ elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char
 }
 
 EAPI Elm_List_Item *
-elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, Evas_Smart_Cb func, const void *data)
 {
    Widget_Data *wd;
    Elm_List_Item *it;
@@ -1012,7 +1012,7 @@ elm_list_item_del(Elm_List_Item *it)
  * @ingroup List
  */
 EAPI void
-elm_list_item_del_cb_set(Elm_List_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info))
+elm_list_item_del_cb_set(Elm_List_Item *it, Evas_Smart_Cb func)
 {
    ELM_LIST_ITEM_CHECK_DELETED_RETURN(it);
    it->del_cb = func;

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 2fe33f1..5c1d3fe 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -27,8 +27,8 @@ struct _Menu_Item
    Evas_Object *icon;
    const char *label;
 
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
-   void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
+   Evas_Smart_Cb del_cb;
    const void *data;
 
    //if submenu
@@ -521,7 +521,7 @@ elm_menu_object_get(const Elm_Menu_Item *it)
  * @ingroup Menu
  */
 EAPI Elm_Menu_Item *
-elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_menu_item_add(Evas_Object *obj, Elm_Menu_Item *parent, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
    Elm_Menu_Item *subitem;
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
@@ -674,7 +674,7 @@ elm_menu_item_del(Elm_Menu_Item *item)
  * @ingroup Menu
  */
 EAPI void
-elm_menu_item_del_cb_set(Elm_Menu_Item *it, void (*func) (void *data, Evas_Object *obj, void *event_info))
+elm_menu_item_del_cb_set(Elm_Menu_Item *it, Evas_Smart_Cb func)
 {
    if (!it) return;
    it->del_cb = func;

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 22372df..efe60cc 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -23,8 +23,8 @@ struct _Elm_Toolbar_Item
    Evas_Object *base;
    const char *label;
    Evas_Object *icon;
-   void (*func) (void *data, Evas_Object *obj, void *event_info);
-   void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
+   Evas_Smart_Cb func;
+   Evas_Smart_Cb del_cb;
    const void *data;
    Eina_Bool selected : 1;
    Eina_Bool disabled : 1;
@@ -351,7 +351,7 @@ elm_toolbar_icon_size_get(Evas_Object *obj)
 }
 
 EAPI Elm_Toolbar_Item *
-elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
+elm_toolbar_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -454,7 +454,7 @@ elm_toolbar_item_del(Elm_Toolbar_Item *it)
  * @ingroup Toolbar
  */
 EAPI void
-elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, void (*func)(void *data, Evas_Object *obj, void *event_info))
+elm_toolbar_item_del_cb_set(Elm_Toolbar_Item *it, Evas_Smart_Cb func)
 {
    it->del_cb = func;
 }