evas_object_show(sd->end);
sd->view_state = MULTIBUTTONENTRY_VIEW_SHRINK;
- evas_object_smart_callback_call
- (obj, SIG_EXPAND_STATE_CHANGED, (void *)1);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED, (void *)1));
break;
}
}
}
sd->view_state = MULTIBUTTONENTRY_VIEW_NONE;
- evas_object_smart_callback_call
- (obj, SIG_EXPAND_STATE_CHANGED, (void *)(uintptr_t)sd->shrink);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_EXPAND_STATE_CHANGED,
+ (void *)(uintptr_t)sd->shrink));
}
if (sd->view_state != MULTIBUTTONENTRY_VIEW_SHRINK)
elm_entry_input_panel_show(sd->entry);
}
}
- evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_FOCUSED, NULL));
}
else
{
_view_update(sd);
elm_entry_input_panel_hide(sd->entry);
- evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_UNFOCUSED, NULL));
}
end:
sd->items = eina_list_remove(sd->items, eo_it);
elm_box_unpack(sd->box, VIEW(it));
- evas_object_smart_callback_call(obj, SIG_ITEM_DELETED, eo_it);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_DELETED, eo_it));
evas_object_del(VIEW(it));
{
case MULTIBUTTONENTRY_BUTTON_STATE_SELECTED:
elm_layout_signal_emit(VIEW(item), "elm,state,focused", "elm");
- evas_object_smart_callback_call(obj, SIG_ITEM_SELECTED, EO_OBJ(item));
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_SELECTED, EO_OBJ(item)));
break;
case MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT:
default:
_item_select(WIDGET(it), it);
if (sd->selected_it)
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_CLICKED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_CLICKED, eo_it));
}
static void
sd->longpress_timer = NULL;
- evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_LONGPRESSED, EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_LONGPRESSED, EO_OBJ(it)));
return ECORE_CALLBACK_CANCEL;
}
default:
break;
}
- evas_object_smart_callback_call(obj, SIG_ITEM_ADDED, eo_item);
+ eo_do(obj, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED, eo_item));
return eo_item;
}
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ eo_do(obj, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
}
static void
evas_object_geometry_get(sd->box, NULL, NULL, &w, &h);
if (sd->h_box < h)
- evas_object_smart_callback_call(sd->parent, SIG_EXPANDED, NULL);
+ eo_do(sd->parent, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_EXPANDED, NULL));
else if (sd->h_box > h)
- evas_object_smart_callback_call(sd->parent, SIG_CONTRACTED, NULL);
+ eo_do(sd->parent, eo_event_callback_call
+ (ELM_MULTIBUTTONENTRY_EVENT_CONTRACTED, NULL));
if (sd->items && sd->w_box != w)
{
elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE);
}
-static void
+static Eina_Bool
_entry_changed_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
- ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
+ ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
const char *str;
str = elm_object_text_get(sd->entry);
sd->n_str = str ? strlen(str) : 0;
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_entry_focus_in_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Elm_Multibuttonentry_Item_Data *item = NULL;
- ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
+ ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
if (sd->selected_it)
{
elm_object_focus_set(sd->entry, EINA_FALSE);
evas_object_focus_set(VIEW(item), EINA_TRUE);
}
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_entry_focus_out_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
- ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
+ ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
const char *str;
str = elm_object_text_get(sd->entry);
if (str && str[0])
_item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
+
+ return EINA_TRUE;
}
-static void
+static Eina_Bool
_entry_clicked_cb(void *data,
- Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
- ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
+ ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE);
_current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
elm_object_focus_set(sd->entry, EINA_TRUE);
+
+ return EINA_TRUE;
}
static void
(sd->entry, EVAS_CALLBACK_KEY_DOWN, _entry_key_down_cb, obj);
evas_object_event_callback_add
(sd->entry, EVAS_CALLBACK_RESIZE, _entry_resize_cb, obj);
- evas_object_smart_callback_add
- (sd->entry, "changed", _entry_changed_cb, obj);
- evas_object_smart_callback_add
- (sd->entry, "focused", _entry_focus_in_cb, obj);
- evas_object_smart_callback_add
- (sd->entry, "unfocused", _entry_focus_out_cb, obj);
- evas_object_smart_callback_add
- (sd->entry, "clicked", _entry_clicked_cb, obj);
+ eo_do(sd->entry, eo_event_callback_add
+ (ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb, obj));
+ eo_do(sd->entry, eo_event_callback_add
+ (ELM_MULTIBUTTONENTRY_EVENT_FOCUSED, _entry_focus_in_cb, obj));
+ eo_do(sd->entry, eo_event_callback_add
+ (ELM_MULTIBUTTONENTRY_EVENT_UNFOCUSED, _entry_focus_out_cb, obj));
+ eo_do(sd->entry, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _entry_clicked_cb, obj));
}
static void