elm fileselector_button: add the elm_object_text_set/get hooks.

deprecate: elm_fileselector_button_indicator_label_set/get.

SVN revision: 60991
This commit is contained in:
Tom Hacohen 2011-07-04 10:13:59 +00:00
parent c344fb3ed4
commit 4fb9185cf3
2 changed files with 29 additions and 10 deletions

View File

@ -2523,8 +2523,8 @@ extern "C" {
/* fileselector */
EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1);
EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label) EINA_ARG_NONNULL(1);
EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI void elm_fileselector_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
EAPI Evas_Object *elm_fileselector_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
EAPI Evas_Object *elm_fileselector_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);

View File

@ -254,6 +254,27 @@ _selection_done(void *data,
(void *)wd->fsd.path);
}
static void
_elm_fileselector_button_label_set(Evas_Object *obj, const char *item,
const char *label)
{
ELM_CHECK_WIDTYPE(obj, widtype);
if (item) return;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
elm_object_text_set(wd->btn, label);
}
static const char *
_elm_fileselector_button_label_get(const Evas_Object *obj, const char *item)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (item) return NULL;
if (!wd) return NULL;
return elm_object_text_get(wd->btn);
}
/**
* Add a new file selector button into the parent object.
*
@ -281,6 +302,8 @@ elm_fileselector_button_add(Evas_Object *parent)
elm_widget_disable_hook_set(obj, _disable_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_activate_hook_set(obj, _activate_hook);
elm_widget_text_set_hook_set(obj, _elm_fileselector_button_label_set);
elm_widget_text_get_hook_set(obj, _elm_fileselector_button_label_get);
wd->self = obj;
wd->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
@ -311,15 +334,13 @@ elm_fileselector_button_add(Evas_Object *parent)
* @param label The text label text to be displayed on the button
*
* @ingroup File_Selector_Button
* @deprecated use elm_object_text_set() instead.
*/
EAPI void
elm_fileselector_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_object_text_set(wd->btn, label);
_elm_fileselector_button_label_set(obj, NULL, label);
}
/**
@ -329,14 +350,12 @@ elm_fileselector_button_label_set(Evas_Object *obj,
* @return The button label
*
* @ingroup File_Selector_Button
* @deprecated use elm_object_text_set() instead.
*/
EAPI const char *
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_object_text_get(wd->btn);
return _elm_fileselector_button_label_get(obj, NULL);
}
/**