X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_segment_control.c;h=cf5ecc887ce6619b03893ce58ffce9b2f74bbf91;hb=c28915f35fec86ac959e88da4acd3d7da8b4ad5f;hp=9f7dc2979b279877c64f98666c8db157057ca8d4;hpb=0ce00e36395442b5f61eb63a6445fa9b610c93da;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 9f7dc29..cf5ecc8 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -1,24 +1,8 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-/**
- * @defgroup SegmentControl SegmentControl
- *
- * SegmentControl Widget is a horizontal control made of multiple segment items,
- * each segment item functioning similar to discrete two state button. A segment
- * control groups the the items together and provides compact single button with
- * multiple equal size segments. Segment item size is determined by base widget
- * size and the number of items added.
- * Only one Segment item can be at selected state. A segment item can display
- * combination of Text and any Evas_Object like Images or other widget.
- *
- * Signals that you can add callbacks for are:
- *
- * "changed" -when the user clicks on a segment item which is not previously
- *            selected and get selected. The event_info parameter is the
- *            segment item index.
- */
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Segment_Item Elm_Segment_Item;
 
 struct _Widget_Data
 {
@@ -32,7 +16,7 @@ struct _Widget_Data
 
 struct _Elm_Segment_Item
 {
-   Elm_Widget_Item base;
+   ELM_WIDGET_ITEM;
    Evas_Object *icon;
    const char *label;
    int seg_index;
@@ -95,7 +79,11 @@ _del_hook(Evas_Object *obj)
    wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   EINA_LIST_FREE(wd->seg_items, it) _item_free(it);
+   EINA_LIST_FREE(wd->seg_items, it)
+     {
+        _item_free(it);
+        elm_widget_item_free(it);
+     }
 
    free(wd);
 }
@@ -122,11 +110,11 @@ _theme_hook(Evas_Object *obj)
 
    EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        _elm_theme_object_set(obj, it->base.view, "segment_control",
+        _elm_theme_object_set(obj, VIEW(it), "segment_control",
                               "item", elm_widget_style_get(obj));
-        edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.view)
+        edje_object_scale_set(VIEW(it), elm_widget_scale_get(VIEW(it))
                               *_elm_config->scale);
-        edje_object_mirrored_set(it->base.view, rtl);
+        edje_object_mirrored_set(VIEW(it), rtl);
      }
 
    _update_list(wd);
@@ -153,8 +141,8 @@ _elm_list_data_get(const Eina_List *list)
 
    if (it) return NULL;
 
-   edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
-   return it->base.view;
+   edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm");
+   return VIEW(it);
 }
 
 static Eina_Bool
@@ -196,12 +184,8 @@ _item_free(Elm_Segment_Item *it)
    if (wd->selected_item == it) wd->selected_item = NULL;
    if (wd->seg_items) wd->seg_items = eina_list_remove(wd->seg_items, it);
 
-   elm_widget_item_pre_notify_del(it);
-
    if (it->icon) evas_object_del(it->icon);
    if (it->label) eina_stringshare_del(it->label);
-
-   elm_widget_item_del(it);
 }
 
 static void
@@ -214,7 +198,7 @@ _segment_off(Elm_Segment_Item *it)
    wd = elm_widget_item_data_get(it);
    if (!wd) return;
 
-   edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,segment,normal", "elm");
 
    if (wd->selected_item == it) wd->selected_item = NULL;
 }
@@ -232,10 +216,10 @@ _segment_on(Elm_Segment_Item *it)
 
    if (wd->selected_item) _segment_off(wd->selected_item);
 
-   edje_object_signal_emit(it->base.view, "elm,state,segment,selected", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,segment,selected", "elm");
 
    wd->selected_item = it;
-   evas_object_smart_callback_call(wd->obj, SIG_CHANGED, (void*) it->seg_index);
+   evas_object_smart_callback_call(wd->obj, SIG_CHANGED, it);
 }
 
 static void
@@ -260,8 +244,8 @@ _position_items(Widget_Data *wd)
 
    EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        evas_object_move(it->base.view, pos, by);
-        evas_object_resize(it->base.view, wd->item_width, bh);
+        evas_object_move(VIEW(it), pos, by);
+        evas_object_resize(VIEW(it), wd->item_width, bh);
         if (rtl)
           pos -= wd->item_width;
         else
@@ -303,13 +287,13 @@ _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
    if (it == wd->selected_item) return;
 
    ev = event_info;
-   evas_object_geometry_get(it->base.view, &x, &y, &w, &h);
+   evas_object_geometry_get(VIEW(it), &x, &y, &w, &h);
 
-   if ((ev->output.x >= x) && (ev->output.x <= (x + w)) && (ev->output.y >= y)
-       && (ev->output.y <= (y + h)))
+   if ((ev->canvas.x >= x) && (ev->output.x <= (x + w)) && (ev->canvas.y >= y)
+       && (ev->canvas.y <= (y + h)))
      _segment_on(it);
    else
-     edje_object_signal_emit(it->base.view, "elm,state,segment,normal", "elm");
+     edje_object_signal_emit(VIEW(it), "elm,state,segment,normal", "elm");
 }
 
 static void
@@ -329,7 +313,7 @@ _mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
 
    if (it == wd->selected_item) return;
 
-   edje_object_signal_emit(it->base.view, "elm,state,segment,pressed", "elm");
+   edje_object_signal_emit(VIEW(it), "elm,state,segment,pressed", "elm");
 }
 
 static void
@@ -339,17 +323,20 @@ _swallow_item_objects(Elm_Segment_Item *it)
 
    if (it->icon)
      {
-        edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
-        edje_object_signal_emit(it->base.view, "elm,state,icon,visible", "elm");
+        edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon);
+        edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
      }
    else
-     edje_object_signal_emit(it->base.view, "elm,state,icon,hidden", "elm");
+     edje_object_signal_emit(VIEW(it), "elm,state,icon,hidden", "elm");
 
    if (it->label)
-     edje_object_signal_emit(it->base.view, "elm,state,text,visible", "elm");
+     {
+        edje_object_part_text_set(VIEW(it), "elm.text", it->label);
+        edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+     }
    else
-     edje_object_signal_emit(it->base.view, "elm,state,text,hidden", "elm");
-   edje_object_message_signal_process(it->base.view);
+     edje_object_signal_emit(VIEW(it), "elm,state,text,hidden", "elm");
+   edje_object_message_signal_process(VIEW(it));
 }
 
 static void
@@ -358,7 +345,7 @@ _update_list(Widget_Data *wd)
    Eina_List *l;
    Elm_Segment_Item *it;
    Eina_Bool rtl;
-   int index = 0;
+   int idx = 0;
 
    _position_items(wd);
 
@@ -368,19 +355,21 @@ _update_list(Widget_Data *wd)
         it->seg_index = 0;
 
         //Set the segment type
-        edje_object_signal_emit(it->base.view,
+        edje_object_signal_emit(VIEW(it),
                                 "elm,type,segment,single", "elm");
 
         //Set the segment state
         if (wd->selected_item == it)
-          edje_object_signal_emit(it->base.view,
+          edje_object_signal_emit(VIEW(it),
                                   "elm,state,segment,selected", "elm");
         else
-          edje_object_signal_emit(it->base.view,
+          edje_object_signal_emit(VIEW(it),
                                   "elm,state,segment,normal", "elm");
 
         if (elm_widget_disabled_get(wd->obj))
-          edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+          edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
+        else
+          edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
 
         _swallow_item_objects(it);
         return;
@@ -389,49 +378,51 @@ _update_list(Widget_Data *wd)
    rtl = elm_widget_mirrored_get(wd->obj);
    EINA_LIST_FOREACH(wd->seg_items, l, it)
      {
-        it->seg_index = index;
+        it->seg_index = idx;
 
         //Set the segment type
-        if (index == 0)
+        if (idx == 0)
           {
              if (rtl)
-               edje_object_signal_emit(it->base.view,
+               edje_object_signal_emit(VIEW(it),
                                        "elm,type,segment,right", "elm");
              else
-               edje_object_signal_emit(it->base.view,
+               edje_object_signal_emit(VIEW(it),
                                        "elm,type,segment,left", "elm");
           }
-        else if (index == (wd->item_count - 1))
+        else if (idx == (wd->item_count - 1))
           {
              if (rtl)
-               edje_object_signal_emit(it->base.view,
+               edje_object_signal_emit(VIEW(it),
                                        "elm,type,segment,left", "elm");
              else
-               edje_object_signal_emit(it->base.view,
+               edje_object_signal_emit(VIEW(it),
                                        "elm,type,segment,right", "elm");
           }
         else
-          edje_object_signal_emit(it->base.view,
+          edje_object_signal_emit(VIEW(it),
                                   "elm,type,segment,middle", "elm");
 
         //Set the segment state
         if (wd->selected_item == it)
-          edje_object_signal_emit(it->base.view,
+          edje_object_signal_emit(VIEW(it),
                                   "elm,state,segment,selected", "elm");
         else
-          edje_object_signal_emit(it->base.view,
+          edje_object_signal_emit(VIEW(it),
                                   "elm,state,segment,normal", "elm");
 
         if (elm_widget_disabled_get(wd->obj))
-          edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+          edje_object_signal_emit(VIEW(it), "elm,state,disabled", "elm");
+        else
+          edje_object_signal_emit(VIEW(it), "elm,state,enabled", "elm");
 
         _swallow_item_objects(it);
-        index++;
+        idx++;
      }
 }
 
 static Elm_Segment_Item *
-_item_find(const Evas_Object *obj, int index)
+_item_find(const Evas_Object *obj, int idx)
 {
    Widget_Data *wd;
    Elm_Segment_Item *it;
@@ -439,10 +430,90 @@ _item_find(const Evas_Object *obj, int index)
    wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
 
-   it = eina_list_nth(wd->seg_items, index);
+   it = eina_list_nth(wd->seg_items, idx);
    return it;
 }
 
+static void
+_item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
+{
+   Widget_Data *wd;
+   Elm_Segment_Item *item;
+
+   if (part && strcmp(part, "default")) return;
+
+   item = (Elm_Segment_Item *)it;
+   wd = elm_widget_item_data_get(item);
+   if (!wd) return;
+
+   eina_stringshare_replace(&item->label, label);
+   if (item->label)
+     edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
+   else
+     edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
+   edje_object_message_signal_process(VIEW(item));
+   //label can be NULL also.
+   edje_object_part_text_set(VIEW(item), "elm.text", item->label);
+}
+
+static const char *
+_item_text_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "default")) return NULL;
+   return ((Elm_Segment_Item *)it)->label;
+}
+
+static void
+_item_content_set_hook(Elm_Object_Item *it,
+                       const char *part,
+                       Evas_Object *content)
+{
+   Elm_Segment_Item *item;
+
+   if (part && strcmp(part, "icon")) return;
+
+   item = (Elm_Segment_Item *)it;
+
+   //Remove the existing icon
+   if (item->icon)
+     {
+        edje_object_part_unswallow(VIEW(item), item->icon);
+        evas_object_del(item->icon);
+        item->icon = NULL;
+     }
+   item->icon = content;
+   if (item->icon)
+     {
+        elm_widget_sub_object_add(VIEW(item), item->icon);
+        edje_object_part_swallow(VIEW(item), "elm.swallow.icon", item->icon);
+        edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
+     }
+   else
+     edje_object_signal_emit(VIEW(item), "elm,state,icon,hidden", "elm");
+}
+
+static Evas_Object *
+_item_content_get_hook(const Elm_Object_Item *it, const char *part)
+{
+   if (part && strcmp(part, "icon")) return NULL;
+   return ((Elm_Segment_Item *)it)->icon;
+}
+
+static Eina_Bool
+_item_del_pre_hook(Elm_Object_Item *it)
+{
+   Widget_Data *wd;
+   Elm_Segment_Item *item = (Elm_Segment_Item *)it;
+
+   wd = elm_widget_item_data_get(item);
+   if (!wd) return EINA_FALSE;
+
+   _item_free(item);
+   _update_list(wd);
+
+   return EINA_TRUE;
+}
+
 static Elm_Segment_Item*
 _item_new(Evas_Object *obj, Evas_Object *icon, const char *label)
 {
@@ -455,44 +526,44 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label)
    it = elm_widget_item_new(obj, Elm_Segment_Item);
    if (!it) return NULL;
    elm_widget_item_data_set(it, wd);
-
-   it->base.view = edje_object_add(evas_object_evas_get(obj));
-   edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.view)
+   elm_widget_item_del_pre_hook_set(it, _item_del_pre_hook);
+   elm_widget_item_text_set_hook_set(it, _item_text_set_hook);
+   elm_widget_item_text_get_hook_set(it, _item_text_get_hook);
+   elm_widget_item_content_set_hook_set(it, _item_content_set_hook);
+   elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
+
+   VIEW(it) = edje_object_add(evas_object_evas_get(obj));
+   edje_object_scale_set(VIEW(it), elm_widget_scale_get(VIEW(it))
                          *_elm_config->scale);
-   evas_object_smart_member_add(it->base.view, obj);
-   elm_widget_sub_object_add(obj, it->base.view);
-   _elm_theme_object_set(obj, it->base.view, "segment_control", "item",
+   evas_object_smart_member_add(VIEW(it), obj);
+   elm_widget_sub_object_add(obj, VIEW(it));
+   evas_object_clip_set(VIEW(it), evas_object_clip_get(obj));
+
+   _elm_theme_object_set(obj, VIEW(it), "segment_control", "item",
                          elm_object_style_get(obj));
-   edje_object_mirrored_set(it->base.view,
-                            elm_widget_mirrored_get(it->base.widget));
+   edje_object_mirrored_set(VIEW(it),
+                            elm_widget_mirrored_get(WIDGET(it)));
 
    if (label)
      eina_stringshare_replace(&it->label, label);
    if (it->label)
-     edje_object_signal_emit(it->base.view, "elm,state,text,visible", "elm");
+     edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
    else
-     edje_object_signal_emit(it->base.view, "elm,state,text,hidden", "elm");
-   edje_object_message_signal_process(it->base.view);
-   edje_object_part_text_set(it->base.view, "elm.text", label);
+     edje_object_signal_emit(VIEW(it), "elm,state,text,hidden", "elm");
+   edje_object_message_signal_process(VIEW(it));
+   edje_object_part_text_set(VIEW(it), "elm.text", label);
 
    it->icon = icon;
-   if (it->icon) elm_widget_sub_object_add(it->base.view, it->icon);
-   evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_DOWN,
+   if (it->icon) elm_widget_sub_object_add(VIEW(it), it->icon);
+   evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_DOWN,
                                   _mouse_down, it);
-   evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_UP,
+   evas_object_event_callback_add(VIEW(it), EVAS_CALLBACK_MOUSE_UP,
                                   _mouse_up, it);
-   evas_object_show(it->base.view);
+   evas_object_show(VIEW(it));
 
    return it;
 }
 
-/**
- * Create new SegmentControl.
- * @param [in] parent The parent object
- * @return The new object or NULL if it cannot be created
- *
- * @ingroup SegmentControl
- */
 EAPI Evas_Object *
 elm_segment_control_add(Evas_Object *parent)
 {
@@ -533,17 +604,7 @@ elm_segment_control_add(Evas_Object *parent)
    return obj;
 }
 
-/**
- * Add new segment item to SegmentControl.
- * @param [in] obj The SegmentControl object
- * @param [in] icon Any Objects like icon, Label, layout etc
- * @param [in] label The label for added segment item.
- *             Note that, NULL is different from empty string "".
- * @return The new segment item or NULL if it cannot be created
- *
- * @ingroup SegmentControl
- */
-EAPI Elm_Segment_Item *
+EAPI Elm_Object_Item *
 elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon,
                              const char *label)
 {
@@ -560,24 +621,12 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon,
    wd->seg_items = eina_list_append(wd->seg_items, it);
    _update_list(wd);
 
-   return it;
+   return (Elm_Object_Item *)it;
 }
 
-/**
- * Insert a new segment item to SegmentControl.
- * @param [in] obj The SegmentControl object
- * @param [in] icon Any Objects like icon, Label, layout etc
- * @param [in] label The label for added segment item.
- *        Note that, NULL is different from empty string "".
- * @param [in] index Segment item location. Value should be between 0 and
- *        Existing total item count( @see elm_segment_control_item_count_get() )
- * @return The new segment item or NULL if it cannot be created
- *
- * @ingroup SegmentControl
- */
-EAPI Elm_Segment_Item *
+EAPI Elm_Object_Item *
 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_Segment_Item *it, *it_rel;
@@ -585,50 +634,29 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon,
 
    wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-   if (index < 0) index = 0;
+   if (idx < 0) idx = 0;
 
    it = _item_new(obj, icon, label);
    if (!it) return NULL;
 
-   it_rel = _item_find(obj, index);
+   it_rel = _item_find(obj, idx);
    if (it_rel)
      wd->seg_items = eina_list_prepend_relative(wd->seg_items, it, it_rel);
    else
      wd->seg_items = eina_list_append(wd->seg_items, it);
 
    _update_list(wd);
-   return it;
+   return (Elm_Object_Item *)it;
 }
 
-/**
- * Delete a segment item from SegmentControl
- * @param [in] obj The SegmentControl object
- * @param [in] it The segment item to be deleted
- *
- * @ingroup SegmentControl
- */
 EAPI void
-elm_segment_control_item_del(Elm_Segment_Item *it)
+elm_segment_control_item_del(Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   Widget_Data *wd;
-
-   wd = elm_widget_item_data_get(it);
-   if (!wd) return;
-
-   _item_free(it);
-   _update_list(wd);
+   elm_object_item_del(it);
 }
 
-/**
- * Delete a segment item of given index from SegmentControl
- * @param [in] obj The SegmentControl object
- * @param [in] index The position at which segment item to be deleted.
- *
- * @ingroup SegmentControl
- */
 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_Segment_Item *it;
@@ -637,116 +665,41 @@ elm_segment_control_item_del_at(Evas_Object *obj, int index)
    wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   it = _item_find(obj, index);
+   it = _item_find(obj, idx);
    if (!it) return;
-   _item_free(it);
-   _update_list(wd);
+   elm_object_item_del((Elm_Object_Item *)it);
 }
 
-/**
- * Get the label of a segment item.
- * @param [in] obj The SegmentControl object
- * @param [in] index The index of the segment item
- * @return The label of the segment item
- *
- * @ingroup SegmentControl
- */
 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_Segment_Item *it;
-
-   it = _item_find(obj, index);
+   Elm_Segment_Item *it = _item_find(obj, idx);
    if (it) return it->label;
-
    return NULL;
 }
 
-/**
- * Set the label of a segment item.
- * @param [in] it The SegmentControl Item
- * @param [in] label New label text.
- *
- * @ingroup SegmentControl
- */
 EAPI void
-elm_segment_control_item_label_set(Elm_Segment_Item* it, const char* label)
+elm_segment_control_item_label_set(Elm_Object_Item* it, const char* label)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-   Widget_Data *wd;
-
-   wd = elm_widget_item_data_get(it);
-   if (!wd) return;
-
-   eina_stringshare_replace(&it->label, label);
-   if (it->label)
-     edje_object_signal_emit(it->base.view, "elm,state,text,visible", "elm");
-   else
-     edje_object_signal_emit(it->base.view, "elm,state,text,hidden", "elm");
-   edje_object_message_signal_process(it->base.view);
-   //label can be NULL also.
-   edje_object_part_text_set(it->base.view, "elm.text", it->label);
+   _item_text_set_hook(it, NULL, label);
 }
 
-/**
- * Get the icon of a segment item of SegmentControl
- * @param [in] obj The SegmentControl object
- * @param [in] index The index of the segment item
- * @return The icon object.
- *
- * @ingroup SegmentControl
- */
 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_Segment_Item *it;
-
-   it = _item_find(obj, index);
+   Elm_Segment_Item *it = _item_find(obj, idx);
    if (it) return it->icon;
-
    return NULL;
 }
 
-/**
- * Set the Icon to the segment item
- * @param [in] it The SegmentControl Item
- * @param [in] icon Objects like Layout, Icon, Label etc...
- *
- * @ingroup SegmentControl
- */
 EAPI void
-elm_segment_control_item_icon_set(Elm_Segment_Item *it, Evas_Object *icon)
+elm_segment_control_item_icon_set(Elm_Object_Item *it, Evas_Object *icon)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
-
-   //Remove the existing icon
-   if (it->icon)
-     {
-        edje_object_part_unswallow(it->base.view, it->icon);
-        evas_object_del(it->icon);
-        it->icon = NULL;
-     }
-
-   it->icon = icon;
-   if (it->icon)
-     {
-        elm_widget_sub_object_add(it->base.view, it->icon);
-        edje_object_part_swallow(it->base.view, "elm.swallow.icon", it->icon);
-        edje_object_signal_emit(it->base.view, "elm,state,icon,visible", "elm");
-     }
-   else
-     edje_object_signal_emit(it->base.view, "elm,state,icon,hidden", "elm");
+   _item_content_set_hook(it, NULL, icon);
 }
 
-/**
- * Get the Segment items count from SegmentControl
- * @param [in] obj The SegmentControl object
- * @return Segment items count.
- *
- * @ingroup SegmentControl
- */
 EAPI int
 elm_segment_control_item_count_get(const Evas_Object *obj)
 {
@@ -759,101 +712,56 @@ elm_segment_control_item_count_get(const Evas_Object *obj)
    return eina_list_count(wd->seg_items);
 }
 
-/**
- * Get the base object of segment item.
- * @param [in] it The Segment item
- * @return obj The base object of the segment item.
- *
- * @ingroup SegmentControl
- */
 EAPI Evas_Object*
-elm_segment_control_item_object_get(const Elm_Segment_Item *it)
+elm_segment_control_item_object_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, NULL);
-
-   return it->base.view;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL);
+   return VIEW(it);
 }
 
-/**
- * Get the selected segment item in the SegmentControl
- * @param [in] obj The SegmentControl object
- * @return Selected Segment Item. NULL if none of segment item is selected.
- *
- * @ingroup SegmentControl
- */
-EAPI Elm_Segment_Item*
+EAPI Elm_Object_Item*
 elm_segment_control_item_selected_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd;
-
-   wd = elm_widget_data_get(obj);
+   Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-
-   return wd->selected_item;
+   return (Elm_Object_Item *) wd->selected_item;
 }
 
-/**
- * Select/unselect a particular segment item of SegmentControl
- * @param [in] it The Segment item that is to be selected or unselected.
- * @param [in] select Passing EINA_TRUE will select the segment item and
- *             EINA_FALSE will unselect.
- *
- * @ingroup SegmentControl
- */
 EAPI void
-elm_segment_control_item_selected_set(Elm_Segment_Item *it, Eina_Bool select)
+elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool selected)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it);
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
    Widget_Data *wd;
+   Elm_Segment_Item *item = (Elm_Segment_Item *)it;
 
-   wd = elm_widget_item_data_get(it);
+   wd = elm_widget_item_data_get(item);
    if (!wd) return;
 
-   if (it == wd->selected_item)
+   if (item == wd->selected_item)
      {
         //already in selected state.
-        if (select) return;
+        if (selected) return;
 
         //unselect case
-        _segment_off(it);
+        _segment_off(item);
      }
-   else if (select)
-     _segment_on(it);
+   else if (selected)
+     _segment_on(item);
 
    return;
 }
 
-/**
- * Get the Segment Item from the specified Index.
- * @param [in] obj The Segment Control object.
- * @param [in] index The index of the segment item.
- * @return The Segment item.
- *
- * @ingroup SegmentControl
- */
-EAPI Elm_Segment_Item *
-elm_segment_control_item_get(const Evas_Object *obj, int index)
+EAPI Elm_Object_Item *
+elm_segment_control_item_get(const Evas_Object *obj, int idx)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Elm_Segment_Item *it;
-
-   it = _item_find(obj, index);
-
-   return it;
+   return (Elm_Object_Item *) _item_find(obj, idx);
 }
 
-/**
- * Get the index of a Segment item in the SegmentControl
- * @param [in] it The Segment Item.
- * @return Segment Item index.
- *
- * @ingroup SegmentControl
- */
 EAPI int
-elm_segment_control_item_index_get(const Elm_Segment_Item *it)
+elm_segment_control_item_index_get(const Elm_Object_Item *it)
 {
-   ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, -1);
-
-   return it->seg_index;
+   ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1);
+   return ((Elm_Segment_Item *)it)->seg_index;
 }