forked from enlightenment/efl
Elementary: Use pre-defined type Edje_Signal_Cb instead of describing all of its parameters.
SVN revision: 58283
This commit is contained in:
parent
5176a3f867
commit
8a108db5ab
|
@ -184,7 +184,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -194,7 +194,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data __UNUSED__)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data __UNUSED__)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
elm_object_signal_callback_del(wd->entry, emission, source, func_cb);
|
||||
|
|
|
@ -152,7 +152,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -160,7 +160,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(wd->btn, emission, source, func_cb,
|
||||
|
|
|
@ -471,7 +471,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -480,7 +480,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
|
|
@ -105,7 +105,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
int i;
|
||||
|
@ -120,7 +120,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
int i;
|
||||
|
|
|
@ -655,7 +655,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -663,7 +663,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(wd->ent, emission, source, func_cb,
|
||||
|
|
|
@ -168,7 +168,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd;
|
||||
|
||||
|
@ -180,7 +180,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd;
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -107,7 +107,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
|
|
@ -76,7 +76,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -84,7 +84,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(wd->base, emission, source, func_cb,
|
||||
|
|
|
@ -127,14 +127,14 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_add(wd->lay, emission, source, func_cb, data);
|
||||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(wd->lay, emission, source, func_cb,
|
||||
|
|
|
@ -519,7 +519,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scr),
|
||||
|
@ -527,7 +527,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(
|
||||
|
|
|
@ -123,7 +123,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -132,7 +132,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(
|
||||
|
|
|
@ -238,7 +238,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -247,7 +247,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(
|
||||
|
|
|
@ -98,7 +98,7 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
|
@ -107,7 +107,7 @@ _signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *so
|
|||
}
|
||||
|
||||
static void
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_signal_callback_del_full(wd->spinner, emission, source,
|
||||
|
|
|
@ -34,13 +34,9 @@ struct _Smart_Data
|
|||
void (*signal_func) (Evas_Object *obj, const char *emission,
|
||||
const char *source);
|
||||
void (*callback_add_func) (Evas_Object *obj, const char *emission,
|
||||
const char *source, void (*func) (void *data,
|
||||
Evas_Object *o, const char *emission,
|
||||
const char *source), void *data);
|
||||
const char *source, Edje_Signal_Cb func, void *data);
|
||||
void (*callback_del_func) (Evas_Object *obj, const char *emission,
|
||||
const char *source, void (*func) (void *data,
|
||||
Evas_Object *o, const char *emission,
|
||||
const char *source), void *data);
|
||||
const char *source, Edje_Signal_Cb func, void *data);
|
||||
void (*changed_func) (Evas_Object *obj);
|
||||
Eina_Bool (*focus_next_func) (const Evas_Object *obj, Elm_Focus_Direction dir,
|
||||
Evas_Object **next);
|
||||
|
@ -451,14 +447,14 @@ elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj
|
|||
}
|
||||
|
||||
EAPI void
|
||||
elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data))
|
||||
elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data))
|
||||
{
|
||||
API_ENTRY return;
|
||||
sd->callback_add_func = func;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data))
|
||||
elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data))
|
||||
{
|
||||
API_ENTRY return;
|
||||
sd->callback_del_func = func;
|
||||
|
@ -1439,7 +1435,7 @@ _edje_signal_callback(void *data, Evas_Object *obj __UNUSED__, const char *emiss
|
|||
}
|
||||
|
||||
EAPI void
|
||||
elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
|
||||
elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
|
||||
{
|
||||
Edje_Signal_Data *esd;
|
||||
API_ENTRY return;
|
||||
|
@ -1459,7 +1455,7 @@ elm_widget_signal_callback_add(Evas_Object *obj, const char *emission, const cha
|
|||
}
|
||||
|
||||
EAPI void *
|
||||
elm_widget_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source))
|
||||
elm_widget_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func)
|
||||
{
|
||||
Edje_Signal_Data *esd;
|
||||
Eina_List *l;
|
||||
|
|
|
@ -219,8 +219,8 @@ EAPI void elm_widget_theme_hook_set(Evas_Object *obj, void (*func) (
|
|||
EAPI void elm_widget_event_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Evas_Object *source, Evas_Callback_Type type, void *event_info));
|
||||
EAPI void elm_widget_changed_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj));
|
||||
EAPI void elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source));
|
||||
EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data));
|
||||
EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data));
|
||||
EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data));
|
||||
EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data));
|
||||
EAPI void elm_widget_theme(Evas_Object *obj);
|
||||
EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
|
||||
EAPI void elm_widget_focus_next_hook_set(Evas_Object *obj, Eina_Bool (*func) (const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next));
|
||||
|
|
Loading…
Reference in New Issue