Elm: Fix a couple more deprecation warnings and use elm_object_text_set/get.

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@60809 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 0f11672..d520a2e 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -848,7 +848,7 @@ elm_fileselector_add(Evas_Object *parent)
    bt = elm_button_add(parent);
    elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
    elm_button_icon_set(bt, ic);
-   elm_button_label_set(bt, E_("Up"));
+   elm_object_text_set(bt, E_("Up"));
    evas_object_size_hint_align_set(bt, 0.0, 0.0);
 
    evas_object_smart_callback_add(bt, "clicked", _up, obj);
@@ -863,7 +863,7 @@ elm_fileselector_add(Evas_Object *parent)
    bt = elm_button_add(parent);
    elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
    elm_button_icon_set(bt, ic);
-   elm_button_label_set(bt, E_("Home"));
+   elm_object_text_set(bt, E_("Home"));
    evas_object_size_hint_align_set(bt, 0.0, 0.0);
 
    evas_object_smart_callback_add(bt, "clicked", _home, obj);
@@ -1051,7 +1051,7 @@ elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj,
         // cancel btn
         bt = elm_button_add(obj);
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
-        elm_button_label_set(bt, E_("Cancel"));
+        elm_object_text_set(bt, E_("Cancel"));
 
         evas_object_smart_callback_add(bt, "clicked", _canc, obj);
 
@@ -1061,7 +1061,7 @@ elm_fileselector_buttons_ok_cancel_set(Evas_Object *obj,
         // ok btn
         bt = elm_button_add(obj);
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
-        elm_button_label_set(bt, E_("OK"));
+        elm_object_text_set(bt, E_("OK"));
 
         evas_object_smart_callback_add(bt, "clicked", _ok, obj);
 

diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index c889647..28561d5 100644 (file)
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -319,7 +319,7 @@ elm_fileselector_button_label_set(Evas_Object *obj,
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_button_label_set(wd->btn, label);
+   elm_object_text_set(wd->btn, label);
 }
 
 /**
@@ -336,7 +336,7 @@ elm_fileselector_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_button_label_get(wd->btn);
+   return elm_object_text_get(wd->btn);
 }
 
 /**

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index f49a5e6..582dbb7 100644 (file)
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -210,7 +210,7 @@ _activate(Evas_Object *obj)
         elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
         elm_widget_mirrored_set(bt, elm_widget_mirrored_get(obj));
         elm_object_style_set(bt, buf);
-        elm_button_label_set(bt, item->label);
+        elm_object_text_set(bt, item->label);
         if (item->icon_file)
           {
              ic = elm_icon_add(obj);
@@ -363,7 +363,7 @@ elm_hoversel_hover_parent_get(const Evas_Object *obj)
  * Set the hoversel button label
  *
  * This sets the label of the button that is always visible (before it is
- * clicked and expanded). Also see elm_button_label_set().
+ * clicked and expanded). Also see elm_object_text_set().
  *
  * @param obj The hoversel object
  * @param label The label text.
@@ -376,7 +376,7 @@ elm_hoversel_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_button_label_set(wd->btn, label);
+   elm_object_text_set(wd->btn, label);
 }
 
 /**
@@ -393,7 +393,7 @@ elm_hoversel_label_get(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
    if ((!wd) || (!wd->btn)) return NULL;
-   return elm_button_label_get(wd->btn);
+   return elm_object_text_get(wd->btn);
 }
 
 /**