kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=684ad779dce9125dc8ca50f6dfb015075fb4338c
commit 684ad779dce9125dc8ca50f6dfb015075fb4338c Author: Kai Huuhko <kai.huu...@gmail.com> Date: Tue Feb 2 14:11:08 2016 +0200 Edje: Make ExternalParam_from_ptr a C only function --- efl/edje/efl.edje_edit.pyx | 2 +- efl/edje/efl.edje_edit_part_state.pxi | 2 +- efl/edje/efl.edje_external.pxi | 6 ++---- include/efl.edje.pxd | 5 ++++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/efl/edje/efl.edje_edit.pyx b/efl/edje/efl.edje_edit.pyx index d867f14..29187dc 100644 --- a/efl/edje/efl.edje_edit.pyx +++ b/efl/edje/efl.edje_edit.pyx @@ -23,7 +23,7 @@ from efl.utils.conversions cimport _touni, _ctouni, \ eina_list_strings_to_python_list from efl.eo cimport _register_decorated_callbacks from efl.evas cimport Canvas -from efl.edje cimport Edje_Part_Type, Edje +from efl.edje cimport Edje_Part_Type, Edje, ExternalParam_from_ptr from efl.edje import EDJE_PART_TYPE_EXTERNAL diff --git a/efl/edje/efl.edje_edit_part_state.pxi b/efl/edje/efl.edje_edit_part_state.pxi index 0515734..f2fac28 100644 --- a/efl/edje/efl.edje_edit_part_state.pxi +++ b/efl/edje/efl.edje_edit_part_state.pxi @@ -528,7 +528,7 @@ cdef class State: # lst = edje_edit_state_external_params_list_get(self.edje.obj, self.part, # self.name, self.value) # while lst: - # p = c_edje._ExternalParam_from_ptr(<uintptr_t>lst.data) + # p = ExternalParam_from_ptr(<uintptr_t>lst.data) # if p is not None: # ret.append(p) # lst = lst.next diff --git a/efl/edje/efl.edje_external.pxi b/efl/edje/efl.edje_external.pxi index 021c509..174f43d 100644 --- a/efl/edje/efl.edje_external.pxi +++ b/efl/edje/efl.edje_external.pxi @@ -78,10 +78,8 @@ cdef ExternalParam ExternalParam_from_ptr(Edje_External_Param *param): p.obj = param return p -# XXX: this should be C-only, but it would require edje_edit -# XXX: being able to use it. -def _ExternalParam_from_ptr(uintptr_t ptr): - return ExternalParam_from_ptr(<Edje_External_Param *>ptr) +#def _ExternalParam_from_ptr(uintptr_t ptr): +# return ExternalParam_from_ptr(<Edje_External_Param *>ptr) cdef class ExternalParamInfo: diff --git a/include/efl.edje.pxd b/include/efl.edje.pxd index 177f52c..c87de8b 100644 --- a/include/efl.edje.pxd +++ b/include/efl.edje.pxd @@ -26,7 +26,7 @@ cdef extern from "Edje.h": cdef int EDJE_EXTERNAL_INT_UNSET cdef double EDJE_EXTERNAL_DOUBLE_UNSET cdef unsigned int EDJE_EXTERNAL_TYPE_ABI_VERSION - + #################################################################### # Enums # @@ -567,3 +567,6 @@ cdef class Edje(Object): cdef void message_send_int_set(self, int id, data) cdef void message_send_float_set(self, int id, data) cdef message_send_set(self, int id, data) + + +cdef ExternalParam ExternalParam_from_ptr(Edje_External_Param *param) \ No newline at end of file --