summaryrefslogtreecommitdiff
path: root/src/lib/evas/include
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2013-04-11 22:08:24 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2013-05-05 14:32:24 +0300
commit3d5136e4cc02d43ec45acd5b6e1bf674500e21ae (patch)
tree4fecdc7e4a7ece3267b58b6153b9e088d38a6d0f /src/lib/evas/include
parent019a8b8298f29623757bd98db797980c3be4b090 (diff)
Efl: adapt legacy Evas callbacks to Eo callbacks mechanism.
Diffstat (limited to 'src/lib/evas/include')
-rw-r--r--src/lib/evas/include/evas_private.h24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 5db60ace45..ebfda7f4f7 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -32,7 +32,6 @@ typedef struct _Evas_Font Evas_Font;
32typedef struct _Evas_Font_Alias Evas_Font_Alias; 32typedef struct _Evas_Font_Alias Evas_Font_Alias;
33typedef struct _Evas_Font_Description Evas_Font_Description; 33typedef struct _Evas_Font_Description Evas_Font_Description;
34typedef struct _Evas_Data_Node Evas_Data_Node; 34typedef struct _Evas_Data_Node Evas_Data_Node;
35typedef struct _Evas_Func_Node Evas_Func_Node;
36typedef RGBA_Image_Loadopts Evas_Image_Load_Opts; 35typedef RGBA_Image_Loadopts Evas_Image_Load_Opts;
37typedef struct _Evas_Func Evas_Func; 36typedef struct _Evas_Func Evas_Func;
38typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func; 37typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
@@ -40,7 +39,6 @@ typedef struct _Evas_Image_Save_Func Evas_Image_Save_Func;
40typedef struct _Evas_Object_Func Evas_Object_Func; 39typedef struct _Evas_Object_Func Evas_Object_Func;
41typedef struct _Evas_Intercept_Func Evas_Intercept_Func; 40typedef struct _Evas_Intercept_Func Evas_Intercept_Func;
42typedef struct _Evas_Key_Grab Evas_Key_Grab; 41typedef struct _Evas_Key_Grab Evas_Key_Grab;
43typedef struct _Evas_Callbacks Evas_Callbacks;
44typedef struct _Evas_Format Evas_Format; 42typedef struct _Evas_Format Evas_Format;
45typedef struct _Evas_Map_Point Evas_Map_Point; 43typedef struct _Evas_Map_Point Evas_Map_Point;
46typedef struct _Evas_Smart_Cb_Description_Array Evas_Smart_Cb_Description_Array; 44typedef struct _Evas_Smart_Cb_Description_Array Evas_Smart_Cb_Description_Array;
@@ -307,13 +305,6 @@ struct _Evas_Post_Callback
307 unsigned char delete_me : 1; 305 unsigned char delete_me : 1;
308}; 306};
309 307
310struct _Evas_Callbacks
311{
312 Eina_Inlist *callbacks;
313 int walking_list;
314 unsigned char deletions_waiting : 1;
315};
316
317struct _Evas_Public_Data 308struct _Evas_Public_Data
318{ 309{
319 EINA_INLIST; 310 EINA_INLIST;
@@ -400,8 +391,7 @@ struct _Evas_Public_Data
400 391
401 Eina_List *post_events; // free me on evas_free 392 Eina_List *post_events; // free me on evas_free
402 393
403 Evas_Callbacks *callbacks; 394 Eina_Inlist *callbacks;
404 Eina_Inlist *callbacks_infos;
405 395
406 int delete_grabs; 396 int delete_grabs;
407 int walking_grabs; 397 int walking_grabs;
@@ -579,7 +569,7 @@ struct _Evas_Object_Protected_Data
579 Evas_Intercept_Func *interceptors; 569 Evas_Intercept_Func *interceptors;
580 Eina_List *grabs; 570 Eina_List *grabs;
581 571
582 Evas_Callbacks *callbacks; 572 Eina_Inlist *callbacks;
583 573
584 struct { 574 struct {
585 Eina_List *clipees; 575 Eina_List *clipees;
@@ -662,16 +652,6 @@ struct _Evas_Object_Protected_Data
662 Eina_Bool is_smart : 1; 652 Eina_Bool is_smart : 1;
663}; 653};
664 654
665struct _Evas_Func_Node
666{
667 EINA_INLIST;
668 void (*func) ();
669 void *data;
670 Evas_Callback_Type type;
671 Evas_Callback_Priority priority;
672 unsigned char delete_me : 1;
673};
674
675struct _Evas_Data_Node 655struct _Evas_Data_Node
676{ 656{
677 char *key; 657 char *key;