Elm radio: Fix the tests to use the new elm_object_text_set/get API.

SVN revision: 60987

diff --git a/src/bin/config.c b/src/bin/config.c
index ffde281..5a500df 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1215,7 +1215,7 @@ _sample_theme_new(Evas_Object *win)
    rd = elm_radio_add(win);
    evas_object_size_hint_weight_set(rd, 1.0, 0.0);
    elm_radio_state_value_set(rd, 0);
-   elm_radio_label_set(rd, "Radio 1");
+   elm_object_text_set(rd, "Radio 1");
    elm_table_pack(base, rd, 1, 0, 1, 1);
    evas_object_show(rd);
    rdg = rd;
@@ -1223,7 +1223,7 @@ _sample_theme_new(Evas_Object *win)
    rd = elm_radio_add(win);
    evas_object_size_hint_weight_set(rd, 1.0, 0.0);
    elm_radio_state_value_set(rd, 1);
-   elm_radio_label_set(rd, "Radio 2");
+   elm_object_text_set(rd, "Radio 2");
    elm_radio_group_add(rd, rdg);
    elm_table_pack(base, rd, 1, 1, 1, 1);
    evas_object_show(rd);

diff --git a/src/bin/test_bg.c b/src/bin/test_bg.c
index 0b03126..4e27965 100644 (file)
--- a/src/bin/test_bg.c
+++ b/src/bin/test_bg.c
@@ -139,7 +139,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
 
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, ELM_BG_OPTION_CENTER);
-   elm_radio_label_set(rd, "Center");
+   elm_object_text_set(rd, "Center");
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
    evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg);
    elm_box_pack_end(hbox, rd);
@@ -149,7 +149,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, ELM_BG_OPTION_SCALE);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Scale");
+   elm_object_text_set(rd, "Scale");
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
    evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg);
    elm_box_pack_end(hbox, rd);
@@ -158,7 +158,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, ELM_BG_OPTION_STRETCH);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Stretch");
+   elm_object_text_set(rd, "Stretch");
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
    evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg);
    elm_box_pack_end(hbox, rd);
@@ -167,7 +167,7 @@ test_bg_options(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, ELM_BG_OPTION_TILE);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Tile");
+   elm_object_text_set(rd, "Tile");
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
    evas_object_smart_callback_add(rd, "changed", _cb_radio_changed, o_bg);
    elm_box_pack_end(hbox, rd);

diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index 26ff69e..92556d4 100644 (file)
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -580,7 +580,7 @@ test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
    elm_radio_state_value_set(rd, ELM_FLIP_INTERACTION_NONE);
-   elm_radio_label_set(rd, "None");
+   elm_object_text_set(rd, "None");
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
    evas_object_smart_callback_add(rd, "changed", my_fl_ch, win);
@@ -591,7 +591,7 @@ test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
    elm_radio_state_value_set(rd, ELM_FLIP_INTERACTION_ROTATE);
-   elm_radio_label_set(rd, "Rotate");
+   elm_object_text_set(rd, "Rotate");
    elm_radio_group_add(rd, rdg);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
@@ -601,7 +601,7 @@ test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
    elm_radio_state_value_set(rd, ELM_FLIP_INTERACTION_CUBE);
-   elm_radio_label_set(rd, "Cube");
+   elm_object_text_set(rd, "Cube");
    elm_radio_group_add(rd, rdg);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
@@ -611,7 +611,7 @@ test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
    elm_radio_state_value_set(rd, ELM_FLIP_INTERACTION_PAGE);
-   elm_radio_label_set(rd, "Page");
+   elm_object_text_set(rd, "Page");
    elm_radio_group_add(rd, rdg);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 7f8be43..1f12acb 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -1740,7 +1740,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    rd = elm_radio_add(win);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_radio_state_value_set(rd, 0);
-   elm_radio_label_set(rd, "Slide  ");
+   elm_object_text_set(rd, "Slide  ");
    evas_object_show(rd);
    elm_box_pack_end(bx3, rd);
    rdg = rd;
@@ -1748,7 +1748,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    rd = elm_radio_add(win);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_radio_state_value_set(rd, 1);
-   elm_radio_label_set(rd, "Rotate");
+   elm_object_text_set(rd, "Rotate");
    elm_radio_group_add(rd, rdg);
    evas_object_show(rd);
    elm_box_pack_end(bx3, rd);

diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c
index 8b923d0..a858456 100644 (file)
--- a/src/bin/test_pager.c
+++ b/src/bin/test_pager.c
@@ -118,7 +118,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    for (i = 0; i < (sizeof(styles) / sizeof(struct style_tuple)); i++)
      {
         rd = elm_radio_add(win);
-        elm_radio_label_set(rd, styles[i].label);
+        elm_object_text_set(rd, styles[i].label);
         elm_radio_state_value_set(rd, i);
         if (rdg)
           elm_radio_group_add(rd, rdg);

diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c
index a2e765c..944bf5b 100644 (file)
--- a/src/bin/test_radio.c
+++ b/src/bin/test_radio.c
@@ -32,7 +32,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_radio_state_value_set(rd, 0);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5);
-   elm_radio_label_set(rd, "Icon sized to radio");
+   elm_object_text_set(rd, "Icon sized to radio");
    elm_radio_icon_set(rd, ic);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
@@ -47,7 +47,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 1);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Icon no scale");
+   elm_object_text_set(rd, "Icon no scale");
    elm_radio_icon_set(rd, ic);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
@@ -56,14 +56,14 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 2);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Label Only");
+   elm_object_text_set(rd, "Label Only");
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);
 
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 3);
    elm_radio_group_add(rd, rdg);
-   elm_radio_label_set(rd, "Disabled");
+   elm_object_text_set(rd, "Disabled");
    elm_object_disabled_set(rd, 1);
    elm_box_pack_end(bx, rd);
    evas_object_show(rd);

diff --git a/src/edje_externals/elm_radio.c b/src/edje_externals/elm_radio.c
index 1345122..7f4c600 100644 (file)
--- a/src/edje_externals/elm_radio.c
+++ b/src/edje_externals/elm_radio.c
@@ -20,7 +20,7 @@ external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
    else return;
 
    if (p->label)
-     elm_radio_label_set(obj, p->label);
+     elm_object_text_set(obj, p->label);
    if (p->icon)
      elm_radio_icon_set(obj, p->icon);
    if (p->value_exists)
@@ -40,7 +40,7 @@ external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            elm_radio_label_set(obj, param->s);
+            elm_object_text_set(obj, param->s);
             return EINA_TRUE;
          }
      }
@@ -86,7 +86,7 @@ external_radio_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            param->s = elm_radio_label_get(obj);
+            param->s = elm_object_text_get(obj);
             return EINA_TRUE;
          }
      }