* this probably isn't right way to fix it as functions like
elm_menu_item_label_set should probably be renamed too, but at least
it compiles now with latest efl
Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
---
.../elementary/elementary.c_elementary_menu.pxi | 10 ++++----
.../include/elementary/c_elementary.pxd | 26 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_menu.pxi
b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_menu.pxi
index 93b52aa..236d45e 100644
---
a/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_menu.pxi
+++
b/BINDINGS/python/python-elementary/elementary/elementary.c_elementary_menu.pxi
@@ -28,7 +28,7 @@ cdef void _menu_item_del_cb(void *data, c_evas.Evas_Object
*o, void *event_info)
it.__del_cb()
cdef class MenuItem:
- cdef Elm_Menu_Item *obj
+ cdef Elm_Object_Item *obj
cdef object cbt
def __del_cb(self):
@@ -38,7 +38,7 @@ cdef class MenuItem:
def __init__(self, c_evas.Object menu, MenuItem parent, label, icon,
callback, *args, **kargs):
- cdef Elm_Menu_Item *parent_obj = NULL
+ cdef Elm_Object_Item *parent_obj = NULL
cdef void* cbdata = NULL
cdef void (*cb) (void *, c_evas.Evas_Object *, void *)
cb = NULL
@@ -128,7 +128,7 @@ cdef class MenuItem:
lst = elm_menu_item_subitems_get(self.obj)
itr = lst
while itr:
- data = elm_menu_item_data_get(<Elm_Menu_Item *>itr.data)
+ data = elm_menu_item_data_get(<Elm_Object_Item *>itr.data)
if data != NULL:
(o, callback, it, a, ka) = <object>data
ret.append(it)
@@ -144,14 +144,14 @@ cdef void _menu_item_separator_del_cb(void *data,
c_evas.Evas_Object *o, void *e
it.__del_cb()
cdef class MenuItemSeparator:
- cdef Elm_Menu_Item *obj
+ cdef Elm_Object_Item *obj
def __del_cb(self):
self.obj = NULL
Py_DECREF(self)
def __init__(self, c_evas.Object menu, MenuItem parent):
- cdef Elm_Menu_Item *parent_obj = NULL
+ cdef Elm_Object_Item *parent_obj = NULL
if parent:
parent_obj = parent.obj
diff --git
a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd
b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd
index ae159f4..193b38d 100644
--- a/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd
+++ b/BINDINGS/python/python-elementary/include/elementary/c_elementary.pxd
@@ -204,7 +204,7 @@ cdef extern from "Elementary.h":
ctypedef evas.c_evas.Eina_Bool (*Elm_Event_Cb) (void *data,
evas.c_evas.Evas_Object *obj, evas.c_evas.Evas_Object *src,
evas.c_evas.Evas_Callback_Type t, void *event_info)
ctypedef struct Elm_Hoversel_Item
- ctypedef struct Elm_Menu_Item
+ ctypedef struct Elm_Object_Item
ctypedef struct Elm_Toolbar_Item
ctypedef struct Elm_List_Item
ctypedef struct Elm_Carousel_Item
@@ -912,18 +912,18 @@ cdef extern from "Elementary.h":
evas.c_evas.Evas_Object *elm_menu_add(evas.c_evas.Evas_Object *parent)
void elm_menu_move(evas.c_evas.Evas_Object *obj, evas.c_evas.Evas_Coord
x, evas.c_evas.Evas_Coord y)
void elm_menu_parent_set(evas.c_evas.Evas_Object *obj,
evas.c_evas.Evas_Object *parent)
- Elm_Menu_Item *elm_menu_item_add(evas.c_evas.Evas_Object *obj,
Elm_Menu_Item *parent, char *icon, char *label, void (*func) (void *data,
evas.c_evas.Evas_Object *obj, void *event_info), void *data)
- Elm_Menu_Item *elm_menu_item_separator_add(evas.c_evas.Evas_Object *obj,
Elm_Menu_Item *parent)
- void elm_menu_item_label_set(Elm_Menu_Item *item, char *label)
- char *elm_menu_item_label_get(Elm_Menu_Item *item)
- void elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, char *icon)
- void elm_menu_item_disabled_set(Elm_Menu_Item *item,
evas.c_evas.Eina_Bool disabled)
- void elm_menu_item_del(Elm_Menu_Item *item)
- void elm_menu_item_del_cb_set(Elm_Menu_Item *it, void (*func)(void *data,
evas.c_evas.Evas_Object *obj, void *event_info))
- void *elm_menu_item_data_get(Elm_Menu_Item *it)
- void elm_menu_item_data_set(Elm_Menu_Item *item, void *data)
- evas.c_evas.Evas_Object *elm_menu_object_get(Elm_Menu_Item *it)
- evas.c_evas.Eina_List *elm_menu_item_subitems_get(Elm_Menu_Item *item)
+ Elm_Object_Item *elm_menu_item_add(evas.c_evas.Evas_Object *obj,
Elm_Object_Item *parent, char *icon, char *label, void (*func) (void *data,
evas.c_evas.Evas_Object *obj, void *event_info), void *data)
+ Elm_Object_Item *elm_menu_item_separator_add(evas.c_evas.Evas_Object *obj,
Elm_Object_Item *parent)
+ void elm_menu_item_label_set(Elm_Object_Item *item, char *label)
+ char *elm_menu_item_label_get(Elm_Object_Item *item)
+ void elm_menu_item_object_icon_name_set(Elm_Object_Item *item, char *icon)
+ void elm_menu_item_disabled_set(Elm_Object_Item *item,
evas.c_evas.Eina_Bool disabled)
+ void elm_menu_item_del(Elm_Object_Item *item)
+ void elm_menu_item_del_cb_set(Elm_Object_Item *it, void (*func)(void
*data, evas.c_evas.Evas_Object *obj, void *event_info))
+ void *elm_menu_item_data_get(Elm_Object_Item *it)
+ void elm_menu_item_data_set(Elm_Object_Item *item, void *data)
+ evas.c_evas.Evas_Object *elm_menu_object_get(Elm_Object_Item *it)
+ evas.c_evas.Eina_List *elm_menu_item_subitems_get(Elm_Object_Item *item)
# Panel
evas.c_evas.Evas_Object *elm_panel_add(evas.c_evas.Evas_Object *parent)
--
1.7.8.rc4
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
