Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / src / lib / elm_button.c

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index cdd5330..451b6dd 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -468,6 +468,40 @@ elm_button_add(Evas_Object *parent)
 }
 
 EAPI void
+<<<<<<< HEAD
+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);
+}
+
+EAPI Evas_Object *
+elm_button_icon_get(const Evas_Object *obj)
+{
+   return _content_get_hook(obj, "icon");
+}
+
+EAPI Evas_Object *
+elm_button_icon_unset(Evas_Object *obj)
+{
+   return _content_unset_hook(obj, "icon");
+}
+
+EAPI void
+=======
+>>>>>>> remotes/origin/upstream
 elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);