forked from enlightenment/efl
parent
090417500a
commit
ea644c1552
|
@ -48,8 +48,9 @@ struct Elm_Gen_Item
|
||||||
} func;
|
} func;
|
||||||
|
|
||||||
Elm_Gen_Item_Tooltip tooltip;
|
Elm_Gen_Item_Tooltip tooltip;
|
||||||
Ecore_Cb del_cb, sel_cb, highlight_cb;
|
Ecore_Cb del_cb, unrealize_cb;
|
||||||
Ecore_Cb unsel_cb, unhighlight_cb, unrealize_cb;
|
Ecore_Cb sel_cb, unsel_cb;
|
||||||
|
Ecore_Cb highlight_cb, unhighlight_cb;
|
||||||
|
|
||||||
int position;
|
int position;
|
||||||
Elm_Object_Select_Mode select_mode;
|
Elm_Object_Select_Mode select_mode;
|
||||||
|
|
|
@ -2219,9 +2219,6 @@ _elm_gengrid_item_new(Elm_Gengrid_Smart_Data *sd,
|
||||||
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
|
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
|
||||||
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
|
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
|
||||||
|
|
||||||
/* TEMPORARY */
|
|
||||||
it->sel_cb = (Ecore_Cb)_item_select;
|
|
||||||
|
|
||||||
it->item = ELM_NEW(Elm_Gen_Item_Type);
|
it->item = ELM_NEW(Elm_Gen_Item_Type);
|
||||||
|
|
||||||
GG_IT(it)->wsd = sd;
|
GG_IT(it)->wsd = sd;
|
||||||
|
@ -2232,6 +2229,7 @@ _elm_gengrid_item_new(Elm_Gengrid_Smart_Data *sd,
|
||||||
|
|
||||||
it->del_cb = (Ecore_Cb)_item_del;
|
it->del_cb = (Ecore_Cb)_item_del;
|
||||||
it->highlight_cb = (Ecore_Cb)_item_highlight;
|
it->highlight_cb = (Ecore_Cb)_item_highlight;
|
||||||
|
it->sel_cb = (Ecore_Cb)_item_select;
|
||||||
it->unsel_cb = (Ecore_Cb)_item_unselect;
|
it->unsel_cb = (Ecore_Cb)_item_unselect;
|
||||||
it->unrealize_cb = (Ecore_Cb)_item_unrealize_cb;
|
it->unrealize_cb = (Ecore_Cb)_item_unrealize_cb;
|
||||||
|
|
||||||
|
|
|
@ -5063,19 +5063,18 @@ _elm_genlist_item_new(Elm_Genlist_Smart_Data *sd,
|
||||||
it->generation = sd->generation;
|
it->generation = sd->generation;
|
||||||
it->itc = itc;
|
it->itc = itc;
|
||||||
elm_genlist_item_class_ref((Elm_Genlist_Item_Class *)itc);
|
elm_genlist_item_class_ref((Elm_Genlist_Item_Class *)itc);
|
||||||
|
|
||||||
it->base.data = data;
|
it->base.data = data;
|
||||||
it->parent = parent;
|
it->parent = parent;
|
||||||
it->func.func = func;
|
it->func.func = func;
|
||||||
it->func.data = func_data;
|
it->func.data = func_data;
|
||||||
|
|
||||||
elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
|
elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
|
||||||
elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
|
elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
|
||||||
elm_widget_item_disable_hook_set(it, _item_disable_hook);
|
elm_widget_item_disable_hook_set(it, _item_disable_hook);
|
||||||
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
|
elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
|
||||||
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
|
elm_widget_item_signal_emit_hook_set(it, _item_signal_emit_hook);
|
||||||
|
|
||||||
/* TEMPORARY */
|
|
||||||
it->sel_cb = (Ecore_Cb)_item_select;
|
|
||||||
|
|
||||||
return it;
|
return it;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5102,8 +5101,9 @@ _item_new(Elm_Genlist_Smart_Data *sd,
|
||||||
|
|
||||||
it->del_cb = (Ecore_Cb)_item_del;
|
it->del_cb = (Ecore_Cb)_item_del;
|
||||||
it->highlight_cb = (Ecore_Cb)_item_highlight;
|
it->highlight_cb = (Ecore_Cb)_item_highlight;
|
||||||
it->unsel_cb = (Ecore_Cb)_item_unselect;
|
|
||||||
it->unhighlight_cb = (Ecore_Cb)_item_unhighlight;
|
it->unhighlight_cb = (Ecore_Cb)_item_unhighlight;
|
||||||
|
it->sel_cb = (Ecore_Cb)_item_select;
|
||||||
|
it->unsel_cb = (Ecore_Cb)_item_unselect;
|
||||||
it->unrealize_cb = (Ecore_Cb)_item_unrealize_cb;
|
it->unrealize_cb = (Ecore_Cb)_item_unrealize_cb;
|
||||||
|
|
||||||
if (it->parent)
|
if (it->parent)
|
||||||
|
|
Loading…
Reference in New Issue