Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_callback.c ewl_callback.h ewl_container.c ewl_container.h
Log Message:
- use unsigned int instead of Ewl_Callback_Type in function signatures
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_callback.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_callback.c 24 May 2006 02:55:15 -0000 1.18
+++ ewl_callback.c 11 Jul 2006 21:05:55 -0000 1.19
@@ -18,9 +18,9 @@
static Ewl_Callback *ewl_callback_register(Ewl_Callback * cb);
static void ewl_callback_unregister(Ewl_Callback * cb);
-static void ewl_callback_rm(Ewl_Widget *w, Ewl_Callback_Type t,
+static void ewl_callback_rm(Ewl_Widget *w, unsigned int t,
unsigned int pos);
-static int ewl_callback_insert(Ewl_Widget *w, Ewl_Callback_Type t,
+static int ewl_callback_insert(Ewl_Widget *w, unsigned int t,
Ewl_Callback *cb, unsigned int pos);
static int callback_id = 0;
@@ -131,7 +131,7 @@
}
static void
-ewl_callback_rm(Ewl_Widget *w, Ewl_Callback_Type t, unsigned int pos)
+ewl_callback_rm(Ewl_Widget *w, unsigned int t, unsigned int pos)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -181,7 +181,7 @@
}
static int
-ewl_callback_insert(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_insert(Ewl_Widget *w, unsigned int t,
Ewl_Callback *cb, unsigned int pos)
{
Ewl_Callback *old = NULL;
@@ -192,7 +192,8 @@
DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
if (EWL_CALLBACK_LEN(w, t) == 255) {
- DERROR("Maximum number of callbacks of one type exceeded on a
widget\n");
+ DERROR("Maximum number of callbacks of one type "
+ "exceeded on a widget\n");
DRETURN_INT(0, DLEVEL_STABLE);
}
@@ -258,7 +259,7 @@
* placed at the end of the callback chain.
*/
int
-ewl_callback_append(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_append(Ewl_Widget *w, unsigned int t,
Ewl_Callback_Function f, void *user_data)
{
Ewl_Callback cb;
@@ -293,7 +294,7 @@
* beginning of the callback chain.
*/
int
-ewl_callback_prepend(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_prepend(Ewl_Widget *w, unsigned int t,
Ewl_Callback_Function f, void *user_data)
{
Ewl_Callback cb;
@@ -330,7 +331,7 @@
* the specified callback on the callback chain.
*/
int
-ewl_callback_insert_after(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_insert_after(Ewl_Widget *w, unsigned int t,
Ewl_Callback_Function f, void *user_data,
Ewl_Callback_Function after, void *after_data)
{
@@ -377,7 +378,7 @@
* Executes the callback chain for the specified widget @a w, with event @a t.
*/
void
-ewl_callback_call(Ewl_Widget *w, Ewl_Callback_Type t)
+ewl_callback_call(Ewl_Widget *w, unsigned int t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -399,7 +400,7 @@
* ev_data.
*/
void
-ewl_callback_call_with_event_data(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_call_with_event_data(Ewl_Widget *w, unsigned int t,
void *ev_data)
{
Ewl_Callback *cb, *oldcb;
@@ -472,7 +473,7 @@
* Delete all callbacks of type @a t from widget @a w.
*/
void
-ewl_callback_del_type(Ewl_Widget *w, Ewl_Callback_Type t)
+ewl_callback_del_type(Ewl_Widget *w, unsigned int t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -499,7 +500,7 @@
* Delete the specified callback id from the widget @a w.
*/
void
-ewl_callback_del_cb_id(Ewl_Widget *w, Ewl_Callback_Type t, int cb_id)
+ewl_callback_del_cb_id(Ewl_Widget *w, unsigned int t, int cb_id)
{
Ewl_Callback *cb;
int i;
@@ -558,7 +559,7 @@
* to widget @a w.
*/
void
-ewl_callback_del(Ewl_Widget *w, Ewl_Callback_Type t, Ewl_Callback_Function f)
+ewl_callback_del(Ewl_Widget *w, unsigned int t, Ewl_Callback_Function f)
{
Ewl_Callback *cb;
int i;
@@ -594,7 +595,7 @@
* to widget @a w.
*/
void
-ewl_callback_del_with_data(Ewl_Widget *w, Ewl_Callback_Type t,
+ewl_callback_del_with_data(Ewl_Widget *w, unsigned int t,
Ewl_Callback_Function f, void *d)
{
Ewl_Callback *cb;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_callback.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_callback.h 14 Mar 2006 06:00:43 -0000 1.9
+++ ewl_callback.h 11 Jul 2006 21:05:55 -0000 1.10
@@ -114,27 +114,27 @@
int ewl_callbacks_init(void);
void ewl_callbacks_shutdown(void);
-int ewl_callback_append(Ewl_Widget * widget, Ewl_Callback_Type
type,
+int ewl_callback_append(Ewl_Widget * widget, unsigned int type,
Ewl_Callback_Function func,
void *user_data);
int ewl_callback_prepend(Ewl_Widget * widget,
- Ewl_Callback_Type type,
+ unsigned int type,
Ewl_Callback_Function func,
void *user_data);
-int ewl_callback_insert_after(Ewl_Widget * w, Ewl_Callback_Type t,
+int ewl_callback_insert_after(Ewl_Widget * w, unsigned int t,
Ewl_Callback_Function f,
void *user_data,
Ewl_Callback_Function after,
void *after_data);
void ewl_callback_clear(Ewl_Widget * widget);
-void ewl_callback_call(Ewl_Widget * widget, Ewl_Callback_Type type);
+void ewl_callback_call(Ewl_Widget * widget, unsigned int type);
void ewl_callback_call_with_event_data(Ewl_Widget * widget,
- Ewl_Callback_Type type,
+ unsigned int type,
void *event_data);
-void ewl_callback_del_type(Ewl_Widget * w, Ewl_Callback_Type t);
-void ewl_callback_del(Ewl_Widget * w, Ewl_Callback_Type t,
+void ewl_callback_del_type(Ewl_Widget * w, unsigned int t);
+void ewl_callback_del(Ewl_Widget * w, unsigned int t,
Ewl_Callback_Function f);
-void ewl_callback_del_with_data(Ewl_Widget * w, Ewl_Callback_Type t,
+void ewl_callback_del_with_data(Ewl_Widget * w, unsigned int t,
Ewl_Callback_Function f, void *data);
/**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_container.c 27 May 2006 17:43:59 -0000 1.43
+++ ewl_container.c 11 Jul 2006 21:05:55 -0000 1.44
@@ -892,7 +892,7 @@
* triggered on the container @a c, and not propagated to the receiving child.
*/
void
-ewl_container_callback_intercept(Ewl_Container *c, Ewl_Callback_Type t)
+ewl_container_callback_intercept(Ewl_Container *c, unsigned int t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
@@ -913,7 +913,7 @@
* propagated to the receiving child.
*/
void
-ewl_container_callback_nointercept(Ewl_Container *c, Ewl_Callback_Type t)
+ewl_container_callback_nointercept(Ewl_Container *c, unsigned int t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
@@ -934,7 +934,7 @@
* triggered on the container @a c, and propagated to the receiving child.
*/
void
-ewl_container_callback_notify(Ewl_Container *c, Ewl_Callback_Type t)
+ewl_container_callback_notify(Ewl_Container *c, unsigned int t)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("c", c);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_container.h 15 Mar 2006 04:03:48 -0000 1.21
+++ ewl_container.h 11 Jul 2006 21:05:55 -0000 1.22
@@ -135,11 +135,11 @@
void ewl_container_destroy(Ewl_Container *c);
void ewl_container_reset(Ewl_Container *c);
void ewl_container_callback_notify(Ewl_Container *c,
- Ewl_Callback_Type t);
+ unsigned int t);
void ewl_container_callback_intercept(Ewl_Container *c,
- Ewl_Callback_Type t);
+ unsigned int t);
void ewl_container_callback_nointercept(Ewl_Container *c,
- Ewl_Callback_Type t);
+ unsigned int t);
Ewl_Widget *ewl_container_child_at_get(Ewl_Container *widget, int x,
int y);
Ewl_Widget *ewl_container_child_at_recursive_get(Ewl_Container *widget,
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
