Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_floater.c ewl_overlay.c ewl_overlay.h
Log Message:
- prepend the callback and make sure it's the right function
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_floater.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_floater.c 24 Oct 2005 00:11:23 -0000 1.7
+++ ewl_floater.c 25 Oct 2005 00:50:18 -0000 1.8
@@ -88,8 +88,8 @@
if (p) {
ewl_callback_append(p, EWL_CALLBACK_CONFIGURE,
ewl_floater_follow_configure_cb, f);
- ewl_callback_append(p, EWL_CALLBACK_DESTROY,
- ewl_floater_follow_configure_cb, f);
+ ewl_callback_prepend(p, EWL_CALLBACK_DESTROY,
+ ewl_floater_follow_destroy_cb, f);
}
f->follows = p;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_overlay.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_overlay.c 3 Oct 2005 06:43:07 -0000 1.7
+++ ewl_overlay.c 25 Oct 2005 00:50:18 -0000 1.8
@@ -7,7 +7,8 @@
* @return Returns a new overlay container on success, or NULL on failure.
* @brief Allocate and initialize a new overlay container
*/
-Ewl_Widget *ewl_overlay_new()
+Ewl_Widget *
+ewl_overlay_new(void)
{
Ewl_Overlay *w;
@@ -32,7 +33,8 @@
*
* Sets the values and callbacks of a overlay @a w to their defaults.
*/
-int ewl_overlay_init(Ewl_Overlay *w)
+int
+ewl_overlay_init(Ewl_Overlay *w)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, FALSE);
@@ -62,13 +64,16 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
-void ewl_overlay_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+void
+ewl_overlay_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
Ewl_Object *o;
Ewl_Object *child;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("w", w, "widget");
o = EWL_OBJECT(w);
@@ -94,11 +99,16 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_overlay_child_show_cb(Ewl_Container * o, Ewl_Widget * child)
+void
+ewl_overlay_child_show_cb(Ewl_Container *o, Ewl_Widget *child)
{
int size;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("o", o);
+ DCHECK_PARAM_PTR("child", child);
+ DCHECK_TYPE("o", o, "container");
+ DCHECK_TYPE("child", child, "widget");
size = ewl_object_current_x_get(EWL_OBJECT(child));
size += ewl_object_preferred_w_get(EWL_OBJECT(child));
@@ -114,21 +124,26 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void ewl_overlay_child_resize_cb(Ewl_Container *c, Ewl_Widget *w,
- int size __UNUSED__, Ewl_Orientation o __UNUSED__)
+void
+ewl_overlay_child_resize_cb(Ewl_Container *c, Ewl_Widget *w,
+ int size __UNUSED__, Ewl_Orientation o __UNUSED__)
{
- int maxw = 0, maxh = 0;
- Ewl_Overlay *overlay;
- Ewl_Object *child;
+ int maxw = 0, maxh = 0;
+ Ewl_Overlay *overlay;
+ Ewl_Object *child;
DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("c", c);
+ DCHECK_PARAM_PTR("w", w);
+ DCHECK_TYPE("c", c, "container");
+ DCHECK_TYPE("w", w, "widget");
child = EWL_OBJECT(w);
overlay = EWL_OVERLAY(c);
ecore_list_goto_first(EWL_CONTAINER(overlay)->children);
while ((child = ecore_list_next(EWL_CONTAINER(overlay)->children))) {
- int cs;
+ int cs;
/*
* FIXME: Do we really want to do this?
@@ -166,3 +181,4 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_overlay.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_overlay.h 9 Feb 2005 20:44:12 -0000 1.2
+++ ewl_overlay.h 25 Oct 2005 00:50:18 -0000 1.3
@@ -38,14 +38,14 @@
};
Ewl_Widget *ewl_overlay_new(void);
-int ewl_overlay_init(Ewl_Overlay * win);
+int ewl_overlay_init(Ewl_Overlay *win);
/*
* Internally used callbacks, override at your own risk.
*/
void ewl_overlay_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data);
-void ewl_overlay_child_show_cb(Ewl_Container * emb, Ewl_Widget * child);
+void ewl_overlay_child_show_cb(Ewl_Container *emb, Ewl_Widget *child);
void ewl_overlay_child_resize_cb(Ewl_Container *c, Ewl_Widget *w, int size,
Ewl_Orientation o);
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
