summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2015-05-18 17:15:09 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-05-18 17:15:09 +0900
commit1082c66e39af7ae33759941d1cbee19c9c6c30b6 (patch)
treef59d520e9a8e9f65a2588e6356052d4d2817d18d
parentbad260ad7bacd4c6a1a3c94c40c2b7fbbfa6fcee (diff)
widget: more fix wrt item data.
widget item data is no more used. use eo item data instead. @fix.
-rw-r--r--src/lib/elm_widget.c6
-rw-r--r--src/lib/elm_widget.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index e4deaf6f1..2ec72ca29 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -4218,7 +4218,7 @@ _eo_del_cb(void *data EINA_UNUSED, Eo *eo_item, const Eo_Event_Description *desc
4218 Elm_Widget_Item_Data *item = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 4218 Elm_Widget_Item_Data *item = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
4219 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE); 4219 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_TRUE);
4220 if (item->del_func) 4220 if (item->del_func)
4221 item->del_func((void *) WIDGET_ITEM_DATA_GET(item->eo_obj), item->widget, item->eo_obj); 4221 item->del_func((void *) WIDGET_ITEM_DATA_GET(eo_item), item->widget, item->eo_obj);
4222 return EINA_TRUE; 4222 return EINA_TRUE;
4223} 4223}
4224 4224
@@ -4358,11 +4358,11 @@ _elm_widget_item_del_pre(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item EIN
4358 * @ingroup Widget 4358 * @ingroup Widget
4359 */ 4359 */
4360EOLIAN static void 4360EOLIAN static void
4361_elm_widget_item_pre_notify_del(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item) 4361_elm_widget_item_pre_notify_del(Eo *eo_item, Elm_Widget_Item_Data *item)
4362{ 4362{
4363 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); 4363 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
4364 if (!item->del_func) return; 4364 if (!item->del_func) return;
4365 item->del_func((void *)item->data, item->widget, item->eo_obj); 4365 item->del_func((void *)WIDGET_ITEM_DATA_GET(eo_item), item->widget, item->eo_obj);
4366 item->del_func = NULL; 4366 item->del_func = NULL;
4367} 4367}
4368 4368
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index a0189a80f..d8c8ea90b 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -606,8 +606,6 @@ struct _Elm_Widget_Item_Data
606 Eo *eo_obj; 606 Eo *eo_obj;
607 /**< the base view object */ 607 /**< the base view object */
608 Evas_Object *view; 608 Evas_Object *view;
609 /**< item specific data. used for del callback */
610 const void *data;
611 /**< user delete callback function */ 609 /**< user delete callback function */
612 Evas_Smart_Cb del_func; 610 Evas_Smart_Cb del_func;
613 /**< widget delete callback function. don't expose this callback call */ 611 /**< widget delete callback function. don't expose this callback call */