davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=30c9c60b5d20b546bfc00ec7a2f5d5a29d9a76a6
commit 30c9c60b5d20b546bfc00ec7a2f5d5a29d9a76a6 Author: Dave Andreoli <[email protected]> Date: Sat Mar 24 08:42:31 2018 +0100 Fix warnings spotted by cython 0.28 Those are all simbols redeclared in different places --- efl/elementary/box_cdef.pxi | 2 -- efl/elementary/cnp_callbacks.pxi | 8 -------- efl/elementary/elementary_cdef.pxi | 11 ++++++++++- efl/elementary/entry_cdef.pxi | 9 --------- efl/elementary/layout_cdef.pxi | 2 -- efl/elementary/object_cdef.pxi | 21 --------------------- efl/elementary/object_item_cdef.pxi | 3 --- include/efl.ecore_x.pxd | 6 ------ include/efl.elementary.enums.pxd | 17 ----------------- 9 files changed, 10 insertions(+), 69 deletions(-) diff --git a/efl/elementary/box_cdef.pxi b/efl/elementary/box_cdef.pxi index b56c24b..40feec5 100644 --- a/efl/elementary/box_cdef.pxi +++ b/efl/elementary/box_cdef.pxi @@ -1,5 +1,3 @@ -cdef extern from "Ecore.h": - ctypedef void (*Ecore_Cb)(void *data) cdef extern from "Evas.h": ctypedef void *Evas_Object_Box_Data diff --git a/efl/elementary/cnp_callbacks.pxi b/efl/elementary/cnp_callbacks.pxi index 8e6b7e4..8b29de1 100644 --- a/efl/elementary/cnp_callbacks.pxi +++ b/efl/elementary/cnp_callbacks.pxi @@ -1,14 +1,6 @@ from efl.utils.conversions cimport python_list_objects_to_eina_list cdef extern from "Elementary.h": - struct _Elm_Selection_Data: - Evas_Coord x, y - Elm_Sel_Format format - void *data - size_t len - Elm_Xdnd_Action action - - ctypedef _Elm_Selection_Data Elm_Selection_Data ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev) ctypedef Elm_Object_Item *(*Elm_Xy_Item_Get_Cb) (Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *xposret, int *yposret) diff --git a/efl/elementary/elementary_cdef.pxi b/efl/elementary/elementary_cdef.pxi index a9751e4..7b21958 100644 --- a/efl/elementary/elementary_cdef.pxi +++ b/efl/elementary/elementary_cdef.pxi @@ -11,7 +11,8 @@ from efl.evas.enums cimport EVAS_EVENT_FLAG_NONE, EVAS_CALLBACK_KEY_DOWN, \ from efl.ecore cimport Ecore_Pos_Map from efl.elementary.enums cimport Elm_Process_State, Elm_Sys_Notify_Urgency, \ - Elm_Policy, Elm_Policy_Quit, Elm_Policy_Exit, Elm_Policy_Throttle + Elm_Policy, Elm_Policy_Quit, Elm_Policy_Exit, Elm_Policy_Throttle, \ + Elm_Sel_Format, Elm_Xdnd_Action cdef extern from "time.h": @@ -47,6 +48,14 @@ cdef extern from "Elementary.h": const char *palette_name Eina_List *color_list + #selection + ctypedef struct Elm_Selection_Data: + Evas_Coord x, y + Elm_Sel_Format format + void *data + size_t len + Elm_Xdnd_Action action + #event ctypedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type t, void *event_info) diff --git a/efl/elementary/entry_cdef.pxi b/efl/elementary/entry_cdef.pxi index 8e95e6d..7cda8be 100644 --- a/efl/elementary/entry_cdef.pxi +++ b/efl/elementary/entry_cdef.pxi @@ -21,20 +21,11 @@ cdef extern from "Elementary.h": Eina_Bool hover_top Eina_Bool hover_bottom - ctypedef struct Elm_Selection_Data: - Evas_Coord x, y - Elm_Sel_Format format - void *data - size_t len - Elm_Xdnd_Action action - ctypedef struct Elm_Entry_Context_Menu_Item: pass ctypedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text) - ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev) - # Data for the elm_entry_filter_limit_size() entry filter. ctypedef struct Elm_Entry_Filter_Limit_Size: int max_char_count # The maximum number of characters allowed. diff --git a/efl/elementary/layout_cdef.pxi b/efl/elementary/layout_cdef.pxi index 7405d5e..8a830ef 100644 --- a/efl/elementary/layout_cdef.pxi +++ b/efl/elementary/layout_cdef.pxi @@ -1,5 +1,3 @@ -cdef extern from "Edje.h": - ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source) cdef extern from "Elementary.h": Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content) diff --git a/efl/elementary/object_cdef.pxi b/efl/elementary/object_cdef.pxi index 06bc567..88265d0 100644 --- a/efl/elementary/object_cdef.pxi +++ b/efl/elementary/object_cdef.pxi @@ -18,33 +18,12 @@ from efl.elementary.enums cimport Elm_Sel_Type, Elm_Focus_Direction, \ Elm_Focus_Region_Show_Mode, Elm_Tooltip_Orient -cdef extern from "Edje.h": - ctypedef void (*Edje_Signal_Cb)(void *data, Evas_Object *obj, const char *emission, const char *source) - cdef extern from "Elementary.h": ctypedef struct Elm_Theme ctypedef struct Elm_Object_Item - ctypedef struct Elm_Selection_Data: - Evas_Coord x, y - Elm_Sel_Format format - void *data - size_t len - Elm_Xdnd_Action action - - ctypedef Eina_Bool (*Elm_Event_Cb) (void *data, Evas_Object *obj, Evas_Object *src, Evas_Callback_Type t, void *event_info) - ctypedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip) - ctypedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item) - - ctypedef Eina_Bool (*Elm_Drop_Cb) (void *data, Evas_Object *obj, Elm_Selection_Data *ev) - ctypedef void (*Elm_Selection_Loss_Cb) (void *data, Elm_Sel_Type selection) - ctypedef Evas_Object *(*Elm_Drag_Icon_Create_Cb) (void *data, Evas_Object *win, Evas_Coord *xoff, Evas_Coord *yoff) - ctypedef void (*Elm_Drag_State) (void *data, Evas_Object *obj) - ctypedef void (*Elm_Drag_Accept) (void *data, Evas_Object *obj, Eina_Bool doaccept) - ctypedef void (*Elm_Drag_Pos) (void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Action action) - # Object handling (py3: DONE) void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label) void elm_object_text_set(Evas_Object *obj, const char *label) diff --git a/efl/elementary/object_item_cdef.pxi b/efl/elementary/object_item_cdef.pxi index 490f40d..401993c 100644 --- a/efl/elementary/object_item_cdef.pxi +++ b/efl/elementary/object_item_cdef.pxi @@ -2,9 +2,6 @@ cdef extern from "Elementary.h": ctypedef struct Elm_Object_Item - ctypedef Evas_Object *(*Elm_Tooltip_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip) - ctypedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb) (void *data, Evas_Object *obj, Evas_Object *tooltip, void *item) - Evas_Object * elm_object_item_widget_get(const Elm_Object_Item *it) void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object* content) void elm_object_item_content_set(Elm_Object_Item *it, Evas_Object* content) diff --git a/include/efl.ecore_x.pxd b/include/efl.ecore_x.pxd index 2e69be8..5489481 100644 --- a/include/efl.ecore_x.pxd +++ b/include/efl.ecore_x.pxd @@ -800,12 +800,6 @@ cdef extern from "Ecore_X.h": ECORE_X_REGION_BOUNDING ECORE_X_REGION_CLIP - ctypedef Ecore_X_ID Ecore_X_Picture - ctypedef Ecore_X_ID Ecore_X_Region - ctypedef enum Ecore_X_Region_Type: - ECORE_X_REGION_BOUNDING - ECORE_X_REGION_CLIP - ctypedef Ecore_X_ID Ecore_X_Damage ctypedef enum Ecore_X_Damage_Report_Level: diff --git a/include/efl.elementary.enums.pxd b/include/efl.elementary.enums.pxd index 0dae58f..75b9120 100644 --- a/include/efl.elementary.enums.pxd +++ b/include/efl.elementary.enums.pxd @@ -21,7 +21,6 @@ cdef extern from "Elementary.h": ELM_EVENT_PROCESS_FOREGROUND ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED - ELM_EVENT_SYSTRAY_READY #enums ctypedef enum Elm_Focus_Direction: @@ -119,11 +118,6 @@ cdef extern from "Elementary.h": ELM_PROCESS_STATE_FOREGROUND ELM_PROCESS_STATE_BACKGROUND - ctypedef enum Elm_Sys_Notify_Urgency: - ELM_SYS_NOTIFY_URGENCY_LOW - ELM_SYS_NOTIFY_URGENCY_NORMAL - ELM_SYS_NOTIFY_URGENCY_CRITICAL - # actionslider ctypedef enum Elm_Actionslider_Pos: ELM_ACTIONSLIDER_NONE @@ -202,12 +196,6 @@ cdef extern from "Elementary.h": ELM_SOFTCURSOR_MODE_ON ELM_SOFTCURSOR_MODE_OFF - ctypedef enum Elm_Slider_Indicator_Visible_Mode: - ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT - ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS - ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS - ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE - # ctxpopup ctypedef enum Elm_Ctxpopup_Direction: ELM_CTXPOPUP_DIRECTION_DOWN @@ -438,11 +426,6 @@ cdef extern from "Elementary.h": ELM_IMAGE_FLIP_TRANSVERSE # label - ctypedef enum Elm_Wrap_Type: - ELM_WRAP_NONE - ELM_WRAP_CHAR - ELM_WRAP_WORD - ELM_WRAP_MIXED ctypedef enum Elm_Label_Slide_Mode: ELM_LABEL_SLIDE_MODE_NONE --
