Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_box.c e_gadman.c e_layout.c e_menu.c e_table.c
Log Message:
fix evas object warnings - and fix dropwshadow bug
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_box.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_box.c 25 Apr 2005 08:29:53 -0000 1.7
+++ e_box.c 6 May 2005 06:22:13 -0000 1.8
@@ -351,7 +351,7 @@
bi->max.h = 0;
evas_object_clip_set(obj, sd->clip);
evas_object_stack_above(obj, sd->obj);
- evas_object_smart_member_add(bi->sd->obj, obj);
+ evas_object_smart_member_add(obj, bi->sd->obj);
evas_object_data_set(obj, "e_box_data", bi);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_box_smart_item_del_hook, NULL);
@@ -641,7 +641,7 @@
sd->w = 0;
sd->h = 0;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_smart_member_add(obj, sd->clip);
+ evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadman.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_gadman.c 24 Apr 2005 21:11:44 -0000 1.33
+++ e_gadman.c 6 May 2005 06:22:14 -0000 1.34
@@ -976,10 +976,16 @@
static void
_e_gadman_client_geometry_apply(E_Gadman_Client *gmc)
{
- evas_object_move(gmc->event_object, gmc->x, gmc->y);
- evas_object_resize(gmc->event_object, gmc->w, gmc->h);
- evas_object_move(gmc->control_object, gmc->x, gmc->y);
- evas_object_resize(gmc->control_object, gmc->w, gmc->h);
+ if (gmc->event_object)
+ {
+ evas_object_move(gmc->event_object, gmc->x, gmc->y);
+ evas_object_resize(gmc->event_object, gmc->w, gmc->h);
+ }
+ if (gmc->control_object)
+ {
+ evas_object_move(gmc->control_object, gmc->x, gmc->y);
+ evas_object_resize(gmc->control_object, gmc->w, gmc->h);
+ }
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_layout.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_layout.c 19 Mar 2005 14:51:35 -0000 1.4
+++ e_layout.c 6 May 2005 06:22:21 -0000 1.5
@@ -231,7 +231,7 @@
li->w = 0;
li->h = 0;
evas_object_clip_set(obj, sd->clip);
- evas_object_smart_member_add(li->sd->obj, obj);
+ evas_object_smart_member_add(obj, li->sd->obj);
evas_object_data_set(obj, "e_layout_data", li);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_layout_smart_item_del_hook, NULL);
@@ -343,7 +343,7 @@
sd->vw = 1;
sd->vh = 1;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_smart_member_add(obj, sd->clip);
+ evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_menu.c 3 May 2005 08:29:26 -0000 1.25
+++ e_menu.c 6 May 2005 06:22:21 -0000 1.26
@@ -449,7 +449,8 @@
edje_object_signal_emit(mi->submenu_object, "toggle_on", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_on", "");
- edje_object_signal_emit(mi->menu->bg_object, "toggle_on", "");
+ if (mi->menu->bg_object)
+ edje_object_signal_emit(mi->menu->bg_object, "toggle_on", "");
}
else
{
@@ -464,7 +465,8 @@
edje_object_signal_emit(mi->submenu_object, "toggle_off", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_off", "");
- edje_object_signal_emit(mi->menu->bg_object, "toggle_off", "");
+ if (mi->menu->bg_object)
+ edje_object_signal_emit(mi->menu->bg_object, "toggle_off", "");
}
if (tog)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_table.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_table.c 13 Mar 2005 11:17:27 -0000 1.3
+++ e_table.c 6 May 2005 06:22:21 -0000 1.4
@@ -252,7 +252,7 @@
ti->max.h = 0;
evas_object_clip_set(obj, sd->clip);
evas_object_stack_above(obj, sd->obj);
- evas_object_smart_member_add(ti->sd->obj, obj);
+ evas_object_smart_member_add(obj, ti->sd->obj);
evas_object_data_set(obj, "e_table_data", ti);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_table_smart_item_del_hook, NULL);
@@ -451,7 +451,7 @@
sd->w = 0;
sd->h = 0;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_smart_member_add(obj, sd->clip);
+ evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
