bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elm segment_control: Fixed shadow declaration warnings. 

SVN revision: 60166
This commit is contained in:
Daniel Juyung Seo 2011-06-10 05:12:28 +00:00
parent b01978ac93
commit db0e362691
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -358,7 +358,7 @@ _update_list(Widget_Data *wd)
Eina_List *l; Eina_List *l;
Elm_Segment_Item *it; Elm_Segment_Item *it;
Eina_Bool rtl; Eina_Bool rtl;
int index = 0; int idx = 0;
_position_items(wd); _position_items(wd);
@ -389,10 +389,10 @@ _update_list(Widget_Data *wd)
rtl = elm_widget_mirrored_get(wd->obj); rtl = elm_widget_mirrored_get(wd->obj);
EINA_LIST_FOREACH(wd->seg_items, l, it) EINA_LIST_FOREACH(wd->seg_items, l, it)
{ {
it->seg_index = index; it->seg_index = idx;
//Set the segment type //Set the segment type
if (index == 0) if (idx == 0)
{ {
if (rtl) if (rtl)
edje_object_signal_emit(it->base.view, edje_object_signal_emit(it->base.view,
@ -401,7 +401,7 @@ _update_list(Widget_Data *wd)
edje_object_signal_emit(it->base.view, edje_object_signal_emit(it->base.view,
"elm,type,segment,left", "elm"); "elm,type,segment,left", "elm");
} }
else if (index == (wd->item_count - 1)) else if (idx == (wd->item_count - 1))
{ {
if (rtl) if (rtl)
edje_object_signal_emit(it->base.view, edje_object_signal_emit(it->base.view,
@ -426,12 +426,12 @@ _update_list(Widget_Data *wd)
edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm"); edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
_swallow_item_objects(it); _swallow_item_objects(it);
index++; idx++;
} }
} }
static Elm_Segment_Item * static Elm_Segment_Item *
_item_find(const Evas_Object *obj, int index) _item_find(const Evas_Object *obj, int idx)
{ {
Widget_Data *wd; Widget_Data *wd;
Elm_Segment_Item *it; Elm_Segment_Item *it;
@ -439,7 +439,7 @@ _item_find(const Evas_Object *obj, int index)
wd = elm_widget_data_get(obj); wd = elm_widget_data_get(obj);
if (!wd) return NULL; if (!wd) return NULL;
it = eina_list_nth(wd->seg_items, index); it = eina_list_nth(wd->seg_items, idx);
return it; return it;
} }
@ -577,7 +577,7 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon,
*/ */
EAPI Elm_Segment_Item * EAPI Elm_Segment_Item *
elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon,
const char *label, int index) const char *label, int idx)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Elm_Segment_Item *it, *it_rel; Elm_Segment_Item *it, *it_rel;
@ -585,12 +585,12 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon,
wd = elm_widget_data_get(obj); wd = elm_widget_data_get(obj);
if (!wd) return NULL; if (!wd) return NULL;
if (index < 0) index = 0; if (idx < 0) idx = 0;
it = _item_new(obj, icon, label); it = _item_new(obj, icon, label);
if (!it) return NULL; if (!it) return NULL;
it_rel = _item_find(obj, index); it_rel = _item_find(obj, idx);
if (it_rel) if (it_rel)
wd->seg_items = eina_list_prepend_relative(wd->seg_items, it, it_rel); wd->seg_items = eina_list_prepend_relative(wd->seg_items, it, it_rel);
else else
@ -628,7 +628,7 @@ elm_segment_control_item_del(Elm_Segment_Item *it)
* @ingroup SegmentControl * @ingroup SegmentControl
*/ */
EAPI void EAPI void
elm_segment_control_item_del_at(Evas_Object *obj, int index) elm_segment_control_item_del_at(Evas_Object *obj, int idx)
{ {
ELM_CHECK_WIDTYPE(obj, widtype); ELM_CHECK_WIDTYPE(obj, widtype);
Elm_Segment_Item *it; Elm_Segment_Item *it;
@ -637,7 +637,7 @@ elm_segment_control_item_del_at(Evas_Object *obj, int index)
wd = elm_widget_data_get(obj); wd = elm_widget_data_get(obj);
if (!wd) return; if (!wd) return;
it = _item_find(obj, index); it = _item_find(obj, idx);
if (!it) return; if (!it) return;
_item_free(it); _item_free(it);
_update_list(wd); _update_list(wd);
@ -652,12 +652,12 @@ elm_segment_control_item_del_at(Evas_Object *obj, int index)
* @ingroup SegmentControl * @ingroup SegmentControl
*/ */
EAPI const char* EAPI const char*
elm_segment_control_item_label_get(const Evas_Object *obj, int index) elm_segment_control_item_label_get(const Evas_Object *obj, int idx)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Elm_Segment_Item *it; Elm_Segment_Item *it;
it = _item_find(obj, index); it = _item_find(obj, idx);
if (it) return it->label; if (it) return it->label;
return NULL; return NULL;
@ -698,12 +698,12 @@ elm_segment_control_item_label_set(Elm_Segment_Item* it, const char* label)
* @ingroup SegmentControl * @ingroup SegmentControl
*/ */
EAPI Evas_Object * EAPI Evas_Object *
elm_segment_control_item_icon_get(const Evas_Object *obj, int index) elm_segment_control_item_icon_get(const Evas_Object *obj, int idx)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Elm_Segment_Item *it; Elm_Segment_Item *it;
it = _item_find(obj, index); it = _item_find(obj, idx);
if (it) return it->icon; if (it) return it->icon;
return NULL; return NULL;
@ -802,7 +802,7 @@ elm_segment_control_item_selected_get(const Evas_Object *obj)
* @ingroup SegmentControl * @ingroup SegmentControl
*/ */
EAPI void EAPI void
elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select) elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool selected)
{ {
ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it); ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
Widget_Data *wd; Widget_Data *wd;
@ -813,12 +813,12 @@ elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select)
if (it == wd->selected_item) if (it == wd->selected_item)
{ {
//already in selected state. //already in selected state.
if (select) return; if (selected) return;
//unselect case //unselect case
_segment_off(it); _segment_off(it);
} }
else if (select) else if (selected)
_segment_on(it); _segment_on(it);
return; return;
@ -833,12 +833,12 @@ elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select)
* @ingroup SegmentControl * @ingroup SegmentControl
*/ */
EAPI Elm_Segment_Item * EAPI Elm_Segment_Item *
elm_segment_control_item_get(const Evas_Object *obj, int index) elm_segment_control_item_get(const Evas_Object *obj, int idx)
{ {
ELM_CHECK_WIDTYPE(obj, widtype) NULL; ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Elm_Segment_Item *it; Elm_Segment_Item *it;
it = _item_find(obj, index); it = _item_find(obj, idx);
return it; return it;
} }