From: Tom Hacohen Date: Mon, 4 Jul 2011 10:14:02 +0000 (+0000) Subject: Elm fileselector_btn: Fix code to use the new elm_object_text_set/get API. X-Git-Tag: v1.0.0~2657 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07fd5701d6087136a3492dab454a8eacce2aea20;p=platform%2Fupstream%2Felementary.git Elm fileselector_btn: Fix code to use the new elm_object_text_set/get API. SVN revision: 60992 --- diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c index fa66266..3124b05 100644 --- a/src/bin/test_eio.c +++ b/src/bin/test_eio.c @@ -152,7 +152,7 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ elm_icon_standard_set(ic, "file"); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); fs_bt = elm_fileselector_button_add(win); - elm_fileselector_button_label_set(fs_bt, "Select a dir"); + elm_object_text_set(fs_bt, "Select a dir"); elm_fileselector_button_icon_set(fs_bt, ic); elm_fileselector_button_inwin_mode_set(fs_bt, EINA_TRUE); elm_fileselector_button_folder_only_set(fs_bt, EINA_TRUE); diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c index e48013b..5850dae 100644 --- a/src/bin/test_fileselector_button.c +++ b/src/bin/test_fileselector_button.c @@ -91,7 +91,7 @@ test_fileselector_button(void *data __UNUSED__, elm_icon_standard_set(ic, "file"); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); fs_bt = elm_fileselector_button_add(win); - elm_fileselector_button_label_set(fs_bt, "Select a file"); + elm_object_text_set(fs_bt, "Select a file"); elm_fileselector_button_icon_set(fs_bt, ic); elm_box_pack_end(vbox, fs_bt); diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c index 7117e24..4548d1b 100644 --- a/src/bin/test_photocam.c +++ b/src/bin/test_photocam.c @@ -279,7 +279,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in evas_object_show(bt); bt = elm_fileselector_button_add(win); - elm_fileselector_button_label_set(bt, "Select Photo"); + elm_object_text_set(bt, "Select Photo"); evas_object_smart_callback_add(bt, "file,chosen", my_bt_open, ph); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bt, 0.5, 0.1); diff --git a/src/edje_externals/elm_fileselector_button.c b/src/edje_externals/elm_fileselector_button.c index 6782b54..87e22c7 100644 --- a/src/edje_externals/elm_fileselector_button.c +++ b/src/edje_externals/elm_fileselector_button.c @@ -29,7 +29,7 @@ external_fileselector_button_state_set(void *data __UNUSED__, Evas_Object *obj, else return; if (p->label) - elm_fileselector_button_label_set(obj, p->label); + elm_object_text_set(obj, p->label); if (p->icon) elm_fileselector_button_icon_set(obj, p->icon); if (p->fs.path) elm_fileselector_button_path_set(obj, p->fs.path); if (p->fs.is_save_set) @@ -49,7 +49,7 @@ external_fileselector_button_param_set(void *data __UNUSED__, Evas_Object *obj, { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_fileselector_button_label_set(obj, param->s); + elm_object_text_set(obj, param->s); return EINA_TRUE; } } @@ -117,7 +117,7 @@ external_fileselector_button_param_get(void *data __UNUSED__, const Evas_Object { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_fileselector_button_label_get(obj); + param->s = elm_object_text_get(obj); return EINA_TRUE; } } diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index c8e85ea..19f150a 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -310,7 +310,7 @@ elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - elm_fileselector_button_label_set(wd->button, label); + elm_object_text_set(wd->button, label); } EAPI const char * @@ -319,7 +319,7 @@ elm_fileselector_entry_button_label_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return NULL; - return elm_fileselector_button_label_get(wd->button); + return elm_object_text_get(wd->button); } /**