remove deprecated code related with elm_button_label_get/set

SVN revision: 68786

diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c
index 6d1a4fc..06440c5 100644 (file)
--- a/src/examples/anchorblock_example_01.c
+++ b/src/examples/anchorblock_example_01.c
@@ -118,7 +118,7 @@ _anchorview_clicked_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info
 static void
 _btn_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   const char *lbl = elm_button_label_get(obj);
+   const char *lbl = elm_object_text_get(obj);
    printf("%s: %s\n", lbl, (char *)data);
    eina_stringshare_del(data);
 }

diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c
index d1c6247..b49eafe 100644 (file)
--- a/src/examples/button_example_01.c
+++ b/src/examples/button_example_01.c
@@ -77,7 +77,7 @@ _btn_options_cb(void *data, Evas_Object *btn, void *ev __UNUSED__)
    char *ptr;
    double t;
    App_Data *app = data;
-   const char *lbl = elm_button_label_get(btn);
+   const char *lbl = elm_object_text_get(btn);
 
    ptr = strchr(lbl, ':');
    ptr += 2;

diff --git a/src/examples/theme_example_01.c b/src/examples/theme_example_01.c
index e48a369..327edac 100644 (file)
--- a/src/examples/theme_example_01.c
+++ b/src/examples/theme_example_01.c
@@ -11,7 +11,7 @@
 static void
 btn_extension_click_cb(void *data __UNUSED__, Evas_Object *btn, void *ev __UNUSED__)
 {
-   const char *lbl = elm_button_label_get(btn);
+   const char *lbl = elm_object_text_get(btn);
 
    if (!strncmp(lbl, "Load", 4))
      {

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 1b1750a..8998f83 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -468,19 +468,6 @@ elm_button_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_button_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_button_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_button_label_get(const Evas_Object *obj)
-{
-   return _elm_button_label_get(obj, NULL);
-}
-
-
-EAPI void
 elm_button_icon_set(Evas_Object *obj, Evas_Object *icon)
 {
    _content_set_hook(obj, "icon", icon);

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 59dbff8..239a4c9 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -542,7 +542,7 @@ elm_quicklaunch_seed(void)
         elm_win_resize_object_add(win, bg);
         evas_object_show(bg);
         bt = elm_button_add(win);
-        elm_button_label_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?");
+        elm_object_text_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?");
         elm_win_resize_object_add(win, bt);
         ecore_main_loop_iterate();
         evas_object_del(win);