From ccb4f9a4ae7f36560867af34a7eebd9cacca724a Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Thu, 30 Jun 2011 01:33:38 +0000 Subject: [PATCH] elm edje_externals: Applied button/toggle elm_xxx_label_get/set API changes. Use elm_object_text_get/set instead of elm_xxx_label_get/set. SVN revision: 60849 --- src/edje_externals/elm_button.c | 6 +++--- src/edje_externals/elm_toggle.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/edje_externals/elm_button.c b/src/edje_externals/elm_button.c index 9e2f5c2..f1b6f38 100644 --- a/src/edje_externals/elm_button.c +++ b/src/edje_externals/elm_button.c @@ -17,7 +17,7 @@ external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f else return; if (p->label) - elm_button_label_set(obj, p->label); + elm_object_text_set(obj, p->label); if (p->icon) elm_button_icon_set(obj, p->icon); } @@ -29,7 +29,7 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_button_label_set(obj, param->s); + elm_object_text_set(obj, param->s); return EINA_TRUE; } } @@ -57,7 +57,7 @@ external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_button_label_get(obj); + param->s = elm_object_text_get(obj); return EINA_TRUE; } } diff --git a/src/edje_externals/elm_toggle.c b/src/edje_externals/elm_toggle.c index 5b28058..99998bd 100644 --- a/src/edje_externals/elm_toggle.c +++ b/src/edje_externals/elm_toggle.c @@ -22,7 +22,7 @@ external_toggle_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f else return; if (p->label) - elm_toggle_label_set(obj, p->label); + elm_object_text_set(obj, p->label); if (p->icon) elm_toggle_icon_set(obj, p->icon); @@ -49,7 +49,7 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_toggle_label_set(obj, param->s); + elm_object_text_set(obj, param->s); return EINA_TRUE; } } @@ -105,7 +105,7 @@ external_toggle_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_toggle_label_get(obj); + param->s = elm_object_text_get(obj); return EINA_TRUE; } } -- 2.7.4