[Pkg-e-commits] [SCM] Python bindings for Evas branch, master, updated. debian/0.2.1-2-196-gd35428d

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 3049bc9f780fbb045ad82335339f2f3888fcf88e
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Wed Dec 16 20:52:15 2009 +0100

    Import new SVN snapshot

diff --git a/evas/__init__.py b/evas/__init__.py
index 452105c..4befd2a 100644
--- a/evas/__init__.py
+++ b/evas/__init__.py
@@ -26,6 +26,8 @@ from c_evas import Canvas, SmartObject, ClippedSmartObject, Rectangle, Line, \
      color_argb_premul, color_argb_unpremul, color_parse, \
      color_rgb_to_hsv, color_hsv_to_rgb, image_mask_fill
 
+EVAS_HINT_EXPAND = 1.0
+EVAS_HINT_FILL = -1.0
 
 EVAS_CALLBACK_MOUSE_IN = 0
 EVAS_CALLBACK_MOUSE_OUT = 1
diff --git a/evas/evas.c_evas_object.pxi b/evas/evas.c_evas_object.pxi
index c2a8d85..4611568 100644
--- a/evas/evas.c_evas_object.pxi
+++ b/evas/evas.c_evas_object.pxi
@@ -1396,7 +1396,7 @@ cdef public class Object [object PyEvasObject, type PyEvasObject_Type]:
 
     def on_del_del(self, func):
         "Same as event_callback_del(EVAS_CALLBACK_DEL, ...)"
-        self.event_callback_del(EVAS_CALLBACK_FREE, func)
+        self.event_callback_del(EVAS_CALLBACK_DEL, func)
 
     def on_hold_add(self, func, *a, **k):
         "Same as event_callback_add(EVAS_CALLBACK_HOLD, ...)"
diff --git a/include/evas/c_evas.pxd b/include/evas/c_evas.pxd
index a21a302..ee526b8 100644
--- a/include/evas/c_evas.pxd
+++ b/include/evas/c_evas.pxd
@@ -23,6 +23,17 @@ cdef extern from "Evas.h":
     ####################################################################
     # Enumerations
     #
+
+    ctypedef enum Evas_Layer:
+        EVAS_LAYER_MIN = -32768
+        EVAS_LAYER_MAX =  32767
+
+
+    ctypedef enum Evas_Text:
+        EVAS_TEXT_INVALID = -1
+        EVAS_TEXT_SPECIAL = -2
+
+
     ctypedef enum Evas_Callback_Type:
         EVAS_CALLBACK_MOUSE_IN
         EVAS_CALLBACK_MOUSE_OUT
@@ -46,6 +57,32 @@ cdef extern from "Evas.h":
         EVAS_CALLBACK_IMAGE_PRELOADED
 
 
+    ctypedef enum Evas_Pixel_Format:
+        EVAS_PIXEL_FORMAT_NONE        = 0
+        EVAS_PIXEL_FORMAT_ARGB32      = 1
+        EVAS_PIXEL_FORMAT_YUV420P_601 = 2
+
+
+    ctypedef enum Evas_Color_Space:
+        EVAS_COLOR_SPACE_ARGB = 0
+        EVAS_COLOR_SPACE_AHSV = 1
+
+
+    ctypedef enum Evas_Texture:
+        EVAS_TEXTURE_REFLECT          = 0
+        EVAS_TEXTURE_REPEAT           = 1
+        EVAS_TEXTURE_RESTRICT         = 2
+        EVAS_TEXTURE_RESTRICT_REFLECT = 3
+        EVAS_TEXTURE_RESTRICT_REPEAT  = 4
+        EVAS_TEXTURE_PAD              = 5
+
+
+    cdef enum Evas_Alloc_Error:
+        EVAS_ALLOC_ERROR_NONE      = 0
+        EVAS_ALLOC_ERROR_FATAL     = 1
+        EVAS_ALLOC_ERROR_RECOVERED = 2
+
+
     cdef enum Evas_Load_Error:
         EVAS_LOAD_ERROR_NONE = 0
         EVAS_LOAD_ERROR_GENERIC = 1
@@ -291,6 +328,21 @@ cdef extern from "Evas.h":
     Eina_List *eina_list_free(Eina_List *list)
     Eina_List *eina_list_append(Eina_List *list, void *data)
 
+    ####################################################################
+    # Eina Iterator
+    #
+    ctypedef struct Eina_Iterator:
+        Eina_Bool (*next)(Eina_Iterator *it, void **data)
+        void *(*get_container)(Eina_Iterator *it)
+        void (*free)(Eina_Iterator *it)
+
+    Eina_Bool eina_iterator_next(Eina_Iterator *iterator, void **data)
+    void eina_iterator_free(Eina_Iterator *iterator)
+
+    ctypedef struct Eina_Hash_Tuple:
+        void *key
+        void *data
+        unsigned int key_length
 
     ####################################################################
     # Canvas

-- 
Python bindings for Evas