forked from enlightenment/efl
Don't use depreciated *style_set functions. Use elm_object_style_set
SVN revision: 43142
This commit is contained in:
parent
be8679fbd2
commit
551018cc0f
|
@ -35,6 +35,7 @@ static void
|
||||||
_del_pre_hook(Evas_Object *obj)
|
_del_pre_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
|
|
||||||
evas_object_event_callback_del(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
evas_object_event_callback_del(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||||
_changed_size_hints);
|
_changed_size_hints);
|
||||||
elm_anchorblock_hover_end(obj);
|
elm_anchorblock_hover_end(obj);
|
||||||
|
@ -45,6 +46,7 @@ static void
|
||||||
_del_hook(Evas_Object *obj)
|
_del_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(obj);
|
Widget_Data *wd = elm_widget_data_get(obj);
|
||||||
|
|
||||||
if (wd->hover_style) eina_stringshare_del(wd->hover_style);
|
if (wd->hover_style) eina_stringshare_del(wd->hover_style);
|
||||||
free(wd);
|
free(wd);
|
||||||
}
|
}
|
||||||
|
@ -70,6 +72,7 @@ static void
|
||||||
_hover_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_hover_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
Widget_Data *wd = elm_widget_data_get(data);
|
Widget_Data *wd = elm_widget_data_get(data);
|
||||||
|
|
||||||
wd->hover = NULL;
|
wd->hover = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +96,8 @@ _anchor_clicked(void *data, Evas_Object *obj, void *event_info)
|
||||||
evas_object_resize(wd->pop, info->w, info->h);
|
evas_object_resize(wd->pop, info->w, info->h);
|
||||||
|
|
||||||
wd->hover = elm_hover_add(obj);
|
wd->hover = elm_hover_add(obj);
|
||||||
if (wd->hover_style) elm_hover_style_set(wd->hover, wd->hover_style);
|
if (wd->hover_style)
|
||||||
|
elm_object_style_set(wd->hover, wd->hover_style);
|
||||||
hover_parent = wd->hover_parent;
|
hover_parent = wd->hover_parent;
|
||||||
if (!hover_parent) hover_parent = obj;
|
if (!hover_parent) hover_parent = obj;
|
||||||
elm_hover_parent_set(wd->hover, hover_parent);
|
elm_hover_parent_set(wd->hover, hover_parent);
|
||||||
|
|
|
@ -79,7 +79,8 @@ _anchor_clicked(void *data, Evas_Object *obj, void *event_info)
|
||||||
evas_object_resize(wd->pop, info->w, info->h);
|
evas_object_resize(wd->pop, info->w, info->h);
|
||||||
|
|
||||||
wd->hover = elm_hover_add(obj);
|
wd->hover = elm_hover_add(obj);
|
||||||
if (wd->hover_style) elm_hover_style_set(wd->hover, wd->hover_style);
|
if (wd->hover_style)
|
||||||
|
elm_object_style_set(wd->hover, wd->hover_style);
|
||||||
hover_parent = wd->hover_parent;
|
hover_parent = wd->hover_parent;
|
||||||
if (!hover_parent) hover_parent = obj;
|
if (!hover_parent) hover_parent = obj;
|
||||||
elm_hover_parent_set(wd->hover, hover_parent);
|
elm_hover_parent_set(wd->hover, hover_parent);
|
||||||
|
|
|
@ -79,7 +79,7 @@ _theme_hook(Evas_Object *obj)
|
||||||
|
|
||||||
if (!wd) return;
|
if (!wd) return;
|
||||||
snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj));
|
snprintf(buf, sizeof(buf), "hoversel_vertical/%s", elm_widget_style_get(obj));
|
||||||
elm_button_style_set(wd->btn, buf);
|
elm_object_style_set(wd->btn, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -156,7 +156,7 @@ _activate(Evas_Object *obj)
|
||||||
EINA_LIST_FOREACH(wd->items, l, it)
|
EINA_LIST_FOREACH(wd->items, l, it)
|
||||||
{
|
{
|
||||||
bt = elm_button_add(wd->hover);
|
bt = elm_button_add(wd->hover);
|
||||||
elm_button_style_set(bt, buf);
|
elm_object_style_set(bt, buf);
|
||||||
elm_button_label_set(bt, it->label);
|
elm_button_label_set(bt, it->label);
|
||||||
if (it->icon_file)
|
if (it->icon_file)
|
||||||
{
|
{
|
||||||
|
@ -227,7 +227,7 @@ elm_hoversel_add(Evas_Object *parent)
|
||||||
elm_widget_disable_hook_set(obj, _disable_hook);
|
elm_widget_disable_hook_set(obj, _disable_hook);
|
||||||
|
|
||||||
wd->btn = elm_button_add(parent);
|
wd->btn = elm_button_add(parent);
|
||||||
elm_button_style_set(wd->btn, "hoversel_vertical");
|
elm_object_style_set(wd->btn, "hoversel_vertical");
|
||||||
elm_widget_resize_object_set(obj, wd->btn);
|
elm_widget_resize_object_set(obj, wd->btn);
|
||||||
evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
evas_object_event_callback_add(wd->btn, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||||
_changed_size_hints, obj);
|
_changed_size_hints, obj);
|
||||||
|
|
Loading…
Reference in New Issue