summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2016-02-02 14:11:08 +0200
committerKai Huuhko <kai.huuhko@gmail.com>2016-02-02 14:11:08 +0200
commit684ad779dce9125dc8ca50f6dfb015075fb4338c (patch)
treeaa0b93551d3341e5457bc263b5e81c4d6909017e
parent625500bffcd2076d7ffc6a88d1c8b4be1eddaa2e (diff)
Edje: Make ExternalParam_from_ptr a C only function
-rw-r--r--efl/edje/efl.edje_edit.pyx2
-rw-r--r--efl/edje/efl.edje_edit_part_state.pxi2
-rw-r--r--efl/edje/efl.edje_external.pxi6
-rw-r--r--include/efl.edje.pxd5
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, \
23 eina_list_strings_to_python_list 23 eina_list_strings_to_python_list
24from efl.eo cimport _register_decorated_callbacks 24from efl.eo cimport _register_decorated_callbacks
25from efl.evas cimport Canvas 25from efl.evas cimport Canvas
26from efl.edje cimport Edje_Part_Type, Edje 26from efl.edje cimport Edje_Part_Type, Edje, ExternalParam_from_ptr
27from efl.edje import EDJE_PART_TYPE_EXTERNAL 27from efl.edje import EDJE_PART_TYPE_EXTERNAL
28 28
29 29
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:
528 # lst = edje_edit_state_external_params_list_get(self.edje.obj, self.part, 528 # lst = edje_edit_state_external_params_list_get(self.edje.obj, self.part,
529 # self.name, self.value) 529 # self.name, self.value)
530 # while lst: 530 # while lst:
531 # p = c_edje._ExternalParam_from_ptr(<uintptr_t>lst.data) 531 # p = ExternalParam_from_ptr(<uintptr_t>lst.data)
532 # if p is not None: 532 # if p is not None:
533 # ret.append(p) 533 # ret.append(p)
534 # lst = lst.next 534 # 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):
78 p.obj = param 78 p.obj = param
79 return p 79 return p
80 80
81# XXX: this should be C-only, but it would require edje_edit 81#def _ExternalParam_from_ptr(uintptr_t ptr):
82# XXX: being able to use it. 82# return ExternalParam_from_ptr(<Edje_External_Param *>ptr)
83def _ExternalParam_from_ptr(uintptr_t ptr):
84 return ExternalParam_from_ptr(<Edje_External_Param *>ptr)
85 83
86 84
87cdef class ExternalParamInfo: 85cdef 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":
26 cdef int EDJE_EXTERNAL_INT_UNSET 26 cdef int EDJE_EXTERNAL_INT_UNSET
27 cdef double EDJE_EXTERNAL_DOUBLE_UNSET 27 cdef double EDJE_EXTERNAL_DOUBLE_UNSET
28 cdef unsigned int EDJE_EXTERNAL_TYPE_ABI_VERSION 28 cdef unsigned int EDJE_EXTERNAL_TYPE_ABI_VERSION
29 29
30 #################################################################### 30 ####################################################################
31 # Enums 31 # Enums
32 # 32 #
@@ -567,3 +567,6 @@ cdef class Edje(Object):
567 cdef void message_send_int_set(self, int id, data) 567 cdef void message_send_int_set(self, int id, data)
568 cdef void message_send_float_set(self, int id, data) 568 cdef void message_send_float_set(self, int id, data)
569 cdef message_send_set(self, int id, data) 569 cdef message_send_set(self, int id, data)
570
571
572cdef ExternalParam ExternalParam_from_ptr(Edje_External_Param *param) \ No newline at end of file