raster pushed a commit to branch master.
commit 390964512aa5d20517a6e24f8584e9521d7f9103
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Apr 16 20:27:36 2013 +0900
move del handler to wrap.
---
src/bin/e_menu.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 1374cb7..ddeef23 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1396,12 +1396,9 @@ static void
_e_menu_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
E_Menu *m = data;
- Evas_Object *o;
- m->bg_object = NULL;
- o = m->bg_object_wrap;
m->bg_object_wrap = NULL;
- if (o) evas_object_del(o);
+ m->bg_object = NULL;
_e_menu_unrealize(m);
}
@@ -1709,7 +1706,6 @@ _e_menu_realize(E_Menu *m)
evas_event_freeze(m->evas);
o = edje_object_add(m->evas);
- evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_menu_del_cb, m);
m->bg_object = o;
e_theme_edje_object_set(o, "base/theme/menus",
"e/widgets/menu/default/background");
if (m->header.title)
@@ -1720,6 +1716,7 @@ _e_menu_realize(E_Menu *m)
}
o = e_zoomap_add(m->evas);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_menu_del_cb, m);
evas_object_name_set(o, "menu->bg_object_wrap");
evas_object_data_set(o, "e_menu", m);
evas_object_data_set(o, "eobj", m);
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
