summaryrefslogtreecommitdiff
path: root/legacy/eobj
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2012-06-10 14:13:34 +0000
committerTom Hacohen <tom@stosb.com>2012-06-10 14:13:34 +0000
commit1aef778d98be88775fa55672bf542dc930cf410c (patch)
tree0bcd8858a039ffd1fb2e2aa60345551f7bdf10a7 /legacy/eobj
parent786c2b749b1f353ff702bb5a1a22237df50c0593 (diff)
Eo: Turn evas example back on.
SVN revision: 71903
Diffstat (limited to 'legacy/eobj')
-rw-r--r--legacy/eobj/CMakeLists.txt2
-rw-r--r--legacy/eobj/examples/evas/elw_box.c5
-rw-r--r--legacy/eobj/examples/evas/elw_boxedbutton.c15
-rw-r--r--legacy/eobj/examples/evas/elw_button.c6
-rw-r--r--legacy/eobj/examples/evas/elw_win.c17
-rw-r--r--legacy/eobj/examples/evas/evas_obj.c6
6 files changed, 34 insertions, 17 deletions
diff --git a/legacy/eobj/CMakeLists.txt b/legacy/eobj/CMakeLists.txt
index 0f579e8006..f4e1f2e4c0 100644
--- a/legacy/eobj/CMakeLists.txt
+++ b/legacy/eobj/CMakeLists.txt
@@ -39,7 +39,7 @@ configure_file (
39include(EFLCheck) 39include(EFLCheck)
40 40
41add_subdirectory(lib) 41add_subdirectory(lib)
42#add_subdirectory(examples/evas) 42add_subdirectory(examples/evas)
43add_subdirectory(examples/mixin) 43add_subdirectory(examples/mixin)
44add_subdirectory(examples/signals) 44add_subdirectory(examples/signals)
45add_subdirectory(examples/access) 45add_subdirectory(examples/access)
diff --git a/legacy/eobj/examples/evas/elw_box.c b/legacy/eobj/examples/evas/elw_box.c
index e447ddf692..26bad6e1ff 100644
--- a/legacy/eobj/examples/evas/elw_box.c
+++ b/legacy/eobj/examples/evas/elw_box.c
@@ -26,7 +26,7 @@ _pack_end(Eo *obj EINA_UNUSED, void *class_data, va_list *list)
26} 26}
27 27
28static void 28static void
29_constructor(Eo *obj, void *class_data) 29_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
30{ 30{
31 eo_do_super(obj, eo_constructor()); 31 eo_do_super(obj, eo_constructor());
32 32
@@ -44,6 +44,7 @@ static void
44_class_constructor(Eo_Class *klass) 44_class_constructor(Eo_Class *klass)
45{ 45{
46 const Eo_Op_Func_Description func_desc[] = { 46 const Eo_Op_Func_Description func_desc[] = {
47 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
47 EO_OP_FUNC(ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), _pack_end), 48 EO_OP_FUNC(ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), _pack_end),
48 EO_OP_FUNC_SENTINEL 49 EO_OP_FUNC_SENTINEL
49 }; 50 };
@@ -62,8 +63,6 @@ static const Eo_Class_Description class_desc = {
62 EO_CLASS_DESCRIPTION_OPS(&ELW_BOX_BASE_ID, op_desc, ELW_BOX_SUB_ID_LAST), 63 EO_CLASS_DESCRIPTION_OPS(&ELW_BOX_BASE_ID, op_desc, ELW_BOX_SUB_ID_LAST),
63 NULL, 64 NULL,
64 sizeof(Widget_Data), 65 sizeof(Widget_Data),
65 _constructor,
66 NULL,
67 _class_constructor, 66 _class_constructor,
68 NULL 67 NULL
69}; 68};
diff --git a/legacy/eobj/examples/evas/elw_boxedbutton.c b/legacy/eobj/examples/evas/elw_boxedbutton.c
index 8bdc3081a1..361a8d336d 100644
--- a/legacy/eobj/examples/evas/elw_boxedbutton.c
+++ b/legacy/eobj/examples/evas/elw_boxedbutton.c
@@ -29,15 +29,24 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
29 eo_unref(bt); 29 eo_unref(bt);
30} 30}
31 31
32static void
33_class_constructor(Eo_Class *klass)
34{
35 const Eo_Op_Func_Description func_desc[] = {
36 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
37 EO_OP_FUNC_SENTINEL
38 };
39
40 eo_class_funcs_set(klass, func_desc);
41}
42
32static const Eo_Class_Description class_desc = { 43static const Eo_Class_Description class_desc = {
33 "Elw BoxedButton", 44 "Elw BoxedButton",
34 EO_CLASS_TYPE_REGULAR, 45 EO_CLASS_TYPE_REGULAR,
35 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0), 46 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
36 NULL, 47 NULL,
37 sizeof(Widget_Data), 48 sizeof(Widget_Data),
38 _constructor, 49 _class_constructor,
39 NULL,
40 NULL,
41 NULL 50 NULL
42}; 51};
43 52
diff --git a/legacy/eobj/examples/evas/elw_button.c b/legacy/eobj/examples/evas/elw_button.c
index 3eecb98bd8..97599b69a2 100644
--- a/legacy/eobj/examples/evas/elw_button.c
+++ b/legacy/eobj/examples/evas/elw_button.c
@@ -48,7 +48,7 @@ _btn_clicked(void *data, Evas_Object *evas_obj, void *event_info)
48} 48}
49 49
50static void 50static void
51_constructor(Eo *obj, void *class_data) 51_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
52{ 52{
53 eo_do_super(obj, eo_constructor()); 53 eo_do_super(obj, eo_constructor());
54 54
@@ -78,6 +78,8 @@ static void
78_class_constructor(Eo_Class *klass) 78_class_constructor(Eo_Class *klass)
79{ 79{
80 const Eo_Op_Func_Description func_desc[] = { 80 const Eo_Op_Func_Description func_desc[] = {
81 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
82 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
81 EO_OP_FUNC(ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), _text_set), 83 EO_OP_FUNC(ELW_BUTTON_ID(ELW_BUTTON_SUB_ID_TEXT_SET), _text_set),
82 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set), 84 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
83 EO_OP_FUNC_SENTINEL 85 EO_OP_FUNC_SENTINEL
@@ -102,8 +104,6 @@ static const Eo_Class_Description class_desc = {
102 EO_CLASS_DESCRIPTION_OPS(&ELW_BUTTON_BASE_ID, op_desc, ELW_BUTTON_SUB_ID_LAST), 104 EO_CLASS_DESCRIPTION_OPS(&ELW_BUTTON_BASE_ID, op_desc, ELW_BUTTON_SUB_ID_LAST),
103 event_desc, 105 event_desc,
104 sizeof(Widget_Data), 106 sizeof(Widget_Data),
105 _constructor,
106 _destructor,
107 _class_constructor, 107 _class_constructor,
108 NULL 108 NULL
109}; 109};
diff --git a/legacy/eobj/examples/evas/elw_win.c b/legacy/eobj/examples/evas/elw_win.c
index 2558b00968..17dad999db 100644
--- a/legacy/eobj/examples/evas/elw_win.c
+++ b/legacy/eobj/examples/evas/elw_win.c
@@ -23,7 +23,7 @@ my_win_del(void *data, Evas_Object *obj, void *event_info)
23} 23}
24 24
25static void 25static void
26_constructor(Eo *obj, void *class_data) 26_constructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
27{ 27{
28 eo_do_super(obj, eo_constructor()); 28 eo_do_super(obj, eo_constructor());
29 29
@@ -43,15 +43,24 @@ _constructor(Eo *obj, void *class_data)
43 eo_evas_object_set(obj, wd->win); 43 eo_evas_object_set(obj, wd->win);
44} 44}
45 45
46static void
47_class_constructor(Eo_Class *klass)
48{
49 const Eo_Op_Func_Description func_desc[] = {
50 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
51 EO_OP_FUNC_SENTINEL
52 };
53
54 eo_class_funcs_set(klass, func_desc);
55}
56
46static const Eo_Class_Description class_desc = { 57static const Eo_Class_Description class_desc = {
47 "Elw Win", 58 "Elw Win",
48 EO_CLASS_TYPE_REGULAR, 59 EO_CLASS_TYPE_REGULAR,
49 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0), 60 EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
50 NULL, 61 NULL,
51 sizeof(Widget_Data), 62 sizeof(Widget_Data),
52 _constructor, 63 _class_constructor,
53 NULL,
54 NULL,
55 NULL 64 NULL
56}; 65};
57 66
diff --git a/legacy/eobj/examples/evas/evas_obj.c b/legacy/eobj/examples/evas/evas_obj.c
index 753f773208..0db71f2554 100644
--- a/legacy/eobj/examples/evas/evas_obj.c
+++ b/legacy/eobj/examples/evas/evas_obj.c
@@ -89,7 +89,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
89} 89}
90 90
91static void 91static void
92_destructor(Eo *obj, void *class_data) 92_destructor(Eo *obj, void *class_data, va_list *list EINA_UNUSED)
93{ 93{
94 eo_do_super(obj, eo_destructor()); 94 eo_do_super(obj, eo_destructor());
95 95
@@ -106,6 +106,8 @@ static void
106_class_constructor(Eo_Class *klass) 106_class_constructor(Eo_Class *klass)
107{ 107{
108 const Eo_Op_Func_Description func_desc[] = { 108 const Eo_Op_Func_Description func_desc[] = {
109 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
110 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
109 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set), 111 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
110 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), _size_set), 112 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), _size_set),
111 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), _color_set), 113 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), _color_set),
@@ -134,8 +136,6 @@ static const Eo_Class_Description class_desc = {
134 EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_BASE_ID, op_desc, EVAS_OBJ_SUB_ID_LAST), 136 EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_BASE_ID, op_desc, EVAS_OBJ_SUB_ID_LAST),
135 NULL, 137 NULL,
136 sizeof(Widget_Data), 138 sizeof(Widget_Data),
137 _constructor,
138 _destructor,
139 _class_constructor, 139 _class_constructor,
140 NULL 140 NULL
141}; 141};