forked from enlightenment/efl
Eobj: Renamed EOBJ_SIG_CALLBACK_* to EOBJ_EV_CALLBACK_*.
SVN revision: 70230
This commit is contained in:
parent
94efb39c34
commit
18258b9002
|
@ -67,8 +67,8 @@ _constructor(Eobj *obj, void *class_data __UNUSED__)
|
||||||
{
|
{
|
||||||
eobj_constructor_super(obj);
|
eobj_constructor_super(obj);
|
||||||
|
|
||||||
eobj_event_callback_add(obj, EOBJ_SIG_CALLBACK_ADD, _cb_added, NULL);
|
eobj_event_callback_add(obj, EOBJ_EV_CALLBACK_ADD, _cb_added, NULL);
|
||||||
eobj_event_callback_add(obj, EOBJ_SIG_CALLBACK_DEL, _cb_deled, NULL);
|
eobj_event_callback_add(obj, EOBJ_EV_CALLBACK_DEL, _cb_deled, NULL);
|
||||||
|
|
||||||
eobj_generic_data_set(obj, "cb_count", (intptr_t) 0);
|
eobj_generic_data_set(obj, "cb_count", (intptr_t) 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -613,30 +613,30 @@ EAPI void *eobj_event_callback_del_full(Eobj *obj, const Eobj_Event_Description
|
||||||
EAPI Eina_Bool eobj_event_callback_call(Eobj *obj, const Eobj_Event_Description *desc, const void *event_info);
|
EAPI Eina_Bool eobj_event_callback_call(Eobj *obj, const Eobj_Event_Description *desc, const void *event_info);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var _EOBJ_SIG_CALLBACK_ADD
|
* @var _EOBJ_EV_CALLBACK_ADD
|
||||||
* see EOBJ_SIG_CALLBACK_ADD
|
* see EOBJ_EV_CALLBACK_ADD
|
||||||
*/
|
*/
|
||||||
EAPI extern const Eobj_Event_Description _EOBJ_SIG_CALLBACK_ADD;
|
EAPI extern const Eobj_Event_Description _EOBJ_EV_CALLBACK_ADD;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @def EOBJ_SIG_CALLBACK_ADD
|
* @def EOBJ_EV_CALLBACK_ADD
|
||||||
* The event description (of type #Eobj_Event_Description) for
|
* The event description (of type #Eobj_Event_Description) for
|
||||||
* The "Callback listener added" event.
|
* The "Callback listener added" event.
|
||||||
*/
|
*/
|
||||||
#define EOBJ_SIG_CALLBACK_ADD (&(_EOBJ_SIG_CALLBACK_ADD))
|
#define EOBJ_EV_CALLBACK_ADD (&(_EOBJ_EV_CALLBACK_ADD))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var _EOBJ_SIG_CALLBACK_DEL
|
* @var _EOBJ_EV_CALLBACK_DEL
|
||||||
* see EOBJ_SIG_CALLBACK_DEL
|
* see EOBJ_EV_CALLBACK_DEL
|
||||||
*/
|
*/
|
||||||
EAPI extern const Eobj_Event_Description _EOBJ_SIG_CALLBACK_DEL;
|
EAPI extern const Eobj_Event_Description _EOBJ_EV_CALLBACK_DEL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @def EOBJ_SIG_CALLBACK_DEL
|
* @def EOBJ_EV_CALLBACK_DEL
|
||||||
* The event description (of type #Eobj_Event_Description) for
|
* The event description (of type #Eobj_Event_Description) for
|
||||||
* The "Callback listener deleted" event.
|
* The "Callback listener deleted" event.
|
||||||
*/
|
*/
|
||||||
#define EOBJ_SIG_CALLBACK_DEL (&(_EOBJ_SIG_CALLBACK_DEL))
|
#define EOBJ_EV_CALLBACK_DEL (&(_EOBJ_EV_CALLBACK_DEL))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @}
|
* @}
|
||||||
|
|
|
@ -1137,7 +1137,7 @@ eobj_event_callback_priority_add(Eobj *obj,
|
||||||
obj->callbacks = eina_inlist_sorted_insert(obj->callbacks,
|
obj->callbacks = eina_inlist_sorted_insert(obj->callbacks,
|
||||||
EINA_INLIST_GET(cb), _callback_priority_cmp);
|
EINA_INLIST_GET(cb), _callback_priority_cmp);
|
||||||
|
|
||||||
eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_ADD, desc);
|
eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_ADD, desc);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -1164,7 +1164,7 @@ eobj_event_callback_del(Eobj *obj, const Eobj_Event_Description *desc, Eobj_Even
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
found:
|
found:
|
||||||
eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_DEL, desc);
|
eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_DEL, desc);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1191,7 +1191,7 @@ eobj_event_callback_del_full(Eobj *obj, const Eobj_Event_Description *desc, Eobj
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
found:
|
found:
|
||||||
eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_DEL, desc);
|
eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_DEL, desc);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1253,9 +1253,9 @@ eobj_event_callback_forwarder_del(Eobj *obj, const Eobj_Event_Description *desc,
|
||||||
static Eobj_Class *_my_class = NULL;
|
static Eobj_Class *_my_class = NULL;
|
||||||
|
|
||||||
/* FIXME: Set proper type descriptions. */
|
/* FIXME: Set proper type descriptions. */
|
||||||
EAPI const Eobj_Event_Description _EOBJ_SIG_CALLBACK_ADD =
|
EAPI const Eobj_Event_Description _EOBJ_EV_CALLBACK_ADD =
|
||||||
EOBJ_EVENT_DESCRIPTION("callback,add", "?", "Called when a callback was added.");
|
EOBJ_EVENT_DESCRIPTION("callback,add", "?", "Called when a callback was added.");
|
||||||
EAPI const Eobj_Event_Description _EOBJ_SIG_CALLBACK_DEL =
|
EAPI const Eobj_Event_Description _EOBJ_EV_CALLBACK_DEL =
|
||||||
EOBJ_EVENT_DESCRIPTION("callback,del", "?", "Called when a callback was deleted.");
|
EOBJ_EVENT_DESCRIPTION("callback,del", "?", "Called when a callback was deleted.");
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1276,8 +1276,8 @@ eobj_base_class_get(void)
|
||||||
if (_my_class) return _my_class;
|
if (_my_class) return _my_class;
|
||||||
|
|
||||||
static const Eobj_Event_Description *event_desc[] = {
|
static const Eobj_Event_Description *event_desc[] = {
|
||||||
EOBJ_SIG_CALLBACK_ADD,
|
EOBJ_EV_CALLBACK_ADD,
|
||||||
EOBJ_SIG_CALLBACK_DEL,
|
EOBJ_EV_CALLBACK_DEL,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue