Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_stack.c
Log Message:
fix stack queries! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_stack.c 18 Oct 2003 03:34:00 -0000 1.7
+++ evas_stack.c 16 Mar 2004 04:13:05 -0000 1.8
@@ -256,7 +256,8 @@
return NULL;
MAGIC_CHECK_END();
obj2 = evas_object_above_get_internal(obj);
- while ((obj2) && (obj2->smart.parent))
+ while (((obj2) && (obj2->smart.parent)) ||
+ ((obj2) && (obj2->delete_me)))
obj2 = evas_object_above_get_internal(obj2);
return obj2;
}
@@ -276,7 +277,8 @@
return NULL;
MAGIC_CHECK_END();
obj2 = evas_object_below_get_internal(obj);
- while ((obj2) && (obj2->smart.parent))
+ while (((obj2) && (obj2->smart.parent)) ||
+ ((obj2) && (obj2->delete_me)))
obj2 = evas_object_below_get_internal(obj2);
return obj2;
}
@@ -297,7 +299,8 @@
MAGIC_CHECK_END();
if (e->layers)
obj2 = e->layers->objects;
- while ((obj2) && (obj2->smart.parent))
+ while (((obj2) && (obj2->smart.parent)) ||
+ ((obj2) && (obj2->delete_me)))
obj2 = evas_object_above_get_internal(obj2);
return obj2;
}
@@ -316,9 +319,13 @@
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
- if (e->layers)
+ if ((e->layers) &&
+ (((Evas_Object_List *)(e->layers))->last) &&
+ (((Evas_Layer *)(((Evas_Object_List *)(e->layers))->last))->objects) &&
+ (Evas_Object *)(((Evas_List *)(((Evas_Layer *)(((Evas_Object_List
*)(e->layers))->last))->objects))->last))
obj2 = (Evas_Object *)(((Evas_List *)(((Evas_Layer *)(((Evas_Object_List
*)(e->layers))->last))->objects))->last);
- while ((obj2) && (obj2->smart.parent))
+ while (((obj2) && (obj2->smart.parent)) ||
+ ((obj2) && (obj2->delete_me)))
obj2 = evas_object_below_get_internal(obj2);
return obj2;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
