[genlist] apply r71140 with local enhancement

[framework/uifw/elementary.git] / src / lib / elm_radio.c

diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 128ada6..0f6c0f6 100644 (file)
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -117,7 +117,7 @@ _theme_hook(Evas_Object *obj)
      edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm");
    else
      edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
-   edje_object_part_text_set(wd->radio, "elm.text", wd->label);
+   edje_object_part_text_escaped_set(wd->radio, "elm.text", wd->label);
    if (elm_widget_disabled_get(obj))
      {
         edje_object_signal_emit(wd->radio, "elm,state,disabled", "elm");
@@ -263,7 +263,7 @@ _elm_radio_label_set(Evas_Object *obj, const char *item, const char *label)
         edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
         edje_object_message_signal_process(wd->radio);
      }
-   edje_object_part_text_set(wd->radio, "elm.text", label);
+   edje_object_part_text_escaped_set(wd->radio, "elm.text", label);
    _sizing_eval(obj);
 }
 
@@ -411,36 +411,6 @@ elm_radio_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_radio_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_radio_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_radio_label_get(const Evas_Object *obj)
-{
-   return _elm_radio_label_get(obj, NULL);
-}
-
-EAPI void
-elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon)
-{
-   _content_set_hook(obj, "icon", icon);
-}
-
-EAPI Evas_Object *
-elm_radio_icon_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, "icon");
-}
-
-EAPI Evas_Object *
-elm_radio_icon_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, "icon");
-}
-
-EAPI void
 elm_radio_group_add(Evas_Object *obj, Evas_Object *group)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
@@ -528,8 +498,6 @@ elm_radio_value_pointer_set(Evas_Object *obj, int *valuep)
         wd->group->valuep = NULL;
      }
 }
-<<<<<<< HEAD
-=======
 
 EAPI Evas_Object *
 elm_radio_selected_object_get(Evas_Object *obj)
@@ -550,4 +518,3 @@ elm_radio_selected_object_get(Evas_Object *obj)
      }
    return NULL;
 }
->>>>>>> remotes/origin/upstream