From 5535dac92115fff7930f1e51c66ff45bd668ea9b Mon Sep 17 00:00:00 2001 From: barbieri Date: Mon, 27 Oct 2008 21:21:53 +0000 Subject: [PATCH] always copy all members from parent Evas_Smart_Class. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@37254 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_box.c | 13 +++++++++---- src/lib/canvas/evas_object_smart_clipped.c | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_object_box.c b/src/lib/canvas/evas_object_box.c index 56e2ab9..12f1289 100644 --- a/src/lib/canvas/evas_object_box.c +++ b/src/lib/canvas/evas_object_box.c @@ -443,15 +443,20 @@ evas_object_box_smart_set(Evas_Object_Box_Api *api) return; if (!_parent_sc.name) - { - evas_object_smart_clipped_smart_set(&api->base); - _parent_sc = api->base; - } + evas_object_smart_clipped_smart_set(&_parent_sc); api->base.add = _evas_object_box_smart_add; api->base.del = _evas_object_box_smart_del; + api->base.move = _parent_sc.move; api->base.resize = _evas_object_box_smart_resize; + api->base.show = _parent_sc.show; + api->base.hide = _parent_sc.hide; + api->base.color_set = _parent_sc.color_set; + api->base.clip_set = _parent_sc.clip_set; + api->base.clip_unset = _parent_sc.clip_unset; api->base.calculate = _evas_object_box_smart_calculate; + api->base.member_add = _parent_sc.member_add; + api->base.member_del = _parent_sc.member_del; api->append = _evas_object_box_append_default; api->prepend = _evas_object_box_prepend_default; diff --git a/src/lib/canvas/evas_object_smart_clipped.c b/src/lib/canvas/evas_object_smart_clipped.c index e9b0d47..392cd35 100644 --- a/src/lib/canvas/evas_object_smart_clipped.c +++ b/src/lib/canvas/evas_object_smart_clipped.c @@ -226,6 +226,7 @@ evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) sc->color_set = evas_object_smart_clipped_smart_color_set; sc->clip_set = evas_object_smart_clipped_smart_clip_set; sc->clip_unset = evas_object_smart_clipped_smart_clip_unset; + sc->calculate = NULL; sc->member_add = evas_object_smart_clipped_smart_member_add; sc->member_del = evas_object_smart_clipped_smart_member_del; } -- 2.7.4