summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/lib/edje/Edje_Eo.h2
-rw-r--r--src/lib/edje/edje_legacy.c14
-rw-r--r--src/lib/edje/edje_object.eo14
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/edje/edje_util.c14
-rw-r--r--src/lib/edje/efl_layout_calc.eo (renamed from src/lib/edje/efl_canvas_layout_calc.eo)2
-rw-r--r--src/lib/elementary/efl_ui_image.c8
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_layout.c8
-rw-r--r--src/lib/elementary/efl_ui_layout.eo6
-rw-r--r--src/tests/edje/edje_test_edje.c4
13 files changed, 42 insertions, 42 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 2c1921a..e87c45e 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -2,7 +2,7 @@
2### Library 2### Library
3 3
4edje_eolian_files = \ 4edje_eolian_files = \
5 lib/edje/efl_canvas_layout_calc.eo \ 5 lib/edje/efl_layout_calc.eo \
6 lib/edje/efl_layout_signal.eo \ 6 lib/edje/efl_layout_signal.eo \
7 lib/edje/efl_canvas_layout_group.eo \ 7 lib/edje/efl_canvas_layout_group.eo \
8 lib/edje/edje_object.eo \ 8 lib/edje/edje_object.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index 9f3c7bc..cd2465e 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -1,6 +1,6 @@
1#include <Efl.h> 1#include <Efl.h>
2 2
3#include "efl_canvas_layout_calc.eo.h" 3#include "efl_layout_calc.eo.h"
4#include "efl_layout_signal.eo.h" 4#include "efl_layout_signal.eo.h"
5#include "efl_canvas_layout_group.eo.h" 5#include "efl_canvas_layout_group.eo.h"
6#include "edje_object.eo.h" 6#include "edje_object.eo.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 700d17c..526b31a 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1090,13 +1090,13 @@ edje_object_part_text_insert(Eo *obj, const char *part, const char *text)
1090EAPI void 1090EAPI void
1091edje_object_update_hints_set(Edje_Object *obj, Eina_Bool update) 1091edje_object_update_hints_set(Edje_Object *obj, Eina_Bool update)
1092{ 1092{
1093 efl_canvas_layout_calc_auto_update_hints_set(obj, update); 1093 efl_layout_calc_auto_update_hints_set(obj, update);
1094} 1094}
1095 1095
1096EAPI Eina_Bool 1096EAPI Eina_Bool
1097edje_object_update_hints_get(const Edje_Object *obj) 1097edje_object_update_hints_get(const Edje_Object *obj)
1098{ 1098{
1099 return efl_canvas_layout_calc_auto_update_hints_get(obj); 1099 return efl_layout_calc_auto_update_hints_get(obj);
1100} 1100}
1101 1101
1102EAPI void 1102EAPI void
@@ -1118,7 +1118,7 @@ edje_object_size_min_restricted_calc(Edje_Object *obj, int *minw, int *minh, int
1118 if (minh) *minh = sz.h; 1118 if (minh) *minh = sz.h;
1119 return; 1119 return;
1120 } 1120 }
1121 sz = efl_canvas_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh)); 1121 sz = efl_layout_calc_size_min(obj, EINA_SIZE2D(restrictedw, restrictedh));
1122 if (minw) *minw = sz.w; 1122 if (minw) *minw = sz.w;
1123 if (minh) *minh = sz.h; 1123 if (minh) *minh = sz.h;
1124} 1124}
@@ -1130,7 +1130,7 @@ edje_object_parts_extends_calc(Edje_Object *obj, int *x, int *y, int *w, int *h)
1130 Edje *ed; 1130 Edje *ed;
1131 1131
1132 ed = _edje_fetch(obj); 1132 ed = _edje_fetch(obj);
1133 if (ed) r = efl_canvas_layout_calc_parts_extends(obj); 1133 if (ed) r = efl_layout_calc_parts_extends(obj);
1134 if (x) *x = r.x; 1134 if (x) *x = r.x;
1135 if (y) *y = r.y; 1135 if (y) *y = r.y;
1136 if (w) *w = r.w; 1136 if (w) *w = r.w;
@@ -1141,19 +1141,19 @@ edje_object_parts_extends_calc(Edje_Object *obj, int *x, int *y, int *w, int *h)
1141EAPI int 1141EAPI int
1142edje_object_freeze(Edje_Object *obj) 1142edje_object_freeze(Edje_Object *obj)
1143{ 1143{
1144 return efl_canvas_layout_calc_freeze(obj); 1144 return efl_layout_calc_freeze(obj);
1145} 1145}
1146 1146
1147EAPI int 1147EAPI int
1148edje_object_thaw(Edje_Object *obj) 1148edje_object_thaw(Edje_Object *obj)
1149{ 1149{
1150 return efl_canvas_layout_calc_thaw(obj); 1150 return efl_layout_calc_thaw(obj);
1151} 1151}
1152 1152
1153EAPI void 1153EAPI void
1154edje_object_calc_force(Edje_Object *obj) 1154edje_object_calc_force(Edje_Object *obj)
1155{ 1155{
1156 efl_canvas_layout_calc_force(obj); 1156 efl_layout_calc_force(obj);
1157} 1157}
1158 1158
1159EAPI void 1159EAPI void
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index af514c5..a23fb94 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -3,7 +3,7 @@ import edje_types;
3// FIXME: This EO doc needs a direct link to the "edcref" doc 3// FIXME: This EO doc needs a direct link to the "edcref" doc
4 4
5class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, 5class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
6 Efl.Observer, Efl.Ui.Base, Efl.Canvas.Layout_Calc, 6 Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
7 Efl.Layout.Signal, Efl.Canvas.Layout_Group, 7 Efl.Layout.Signal, Efl.Canvas.Layout_Group,
8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, 8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
9 Efl.Gfx.Size_Class) 9 Efl.Gfx.Size_Class)
@@ -109,12 +109,12 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
109 Efl.Gfx.Size_Class.size_class { get; set; } 109 Efl.Gfx.Size_Class.size_class { get; set; }
110 Efl.Gfx.Size_Class.size_class_del; 110 Efl.Gfx.Size_Class.size_class_del;
111 Efl.Canvas.Group.group_calculate; 111 Efl.Canvas.Group.group_calculate;
112 Efl.Canvas.Layout_Calc.calc_auto_update_hints { get; set; } 112 Efl.Layout.Calc.calc_auto_update_hints { get; set; }
113 Efl.Canvas.Layout_Calc.calc_size_min; 113 Efl.Layout.Calc.calc_size_min;
114 Efl.Canvas.Layout_Calc.calc_parts_extends; 114 Efl.Layout.Calc.calc_parts_extends;
115 Efl.Canvas.Layout_Calc.calc_freeze; 115 Efl.Layout.Calc.calc_freeze;
116 Efl.Canvas.Layout_Calc.calc_thaw; 116 Efl.Layout.Calc.calc_thaw;
117 Efl.Canvas.Layout_Calc.calc_force; 117 Efl.Layout.Calc.calc_force;
118 Efl.Canvas.Layout_Group.group_size_min { get; } 118 Efl.Canvas.Layout_Group.group_size_min { get; }
119 Efl.Canvas.Layout_Group.group_size_max { get; } 119 Efl.Canvas.Layout_Group.group_size_max { get; }
120 Efl.Canvas.Layout_Group.group_data { get; } 120 Efl.Canvas.Layout_Group.group_data { get; }
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index c5238b3..eae37b8 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -42,7 +42,7 @@
42// auto_unref 42// auto_unref
43#define EDJE_OBJECT_BETA 43#define EDJE_OBJECT_BETA
44#define EFL_CANVAS_OBJECT_PROTECTED 44#define EFL_CANVAS_OBJECT_PROTECTED
45#define EFL_CANVAS_LAYOUT_CALC_PROTECTED 45#define EFL_LAYOUT_CALC_PROTECTED
46 46
47#include <Eina.h> 47#include <Eina.h>
48#include <Eet.h> 48#include <Eet.h>
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 662d4f5..2a029d7 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -544,6 +544,6 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd)
544 544
545#include "edje_object.eo.c" 545#include "edje_object.eo.c"
546#include "edje_global.eo.c" 546#include "edje_global.eo.c"
547#include "efl_canvas_layout_calc.eo.c" 547#include "efl_layout_calc.eo.c"
548#include "efl_layout_signal.eo.c" 548#include "efl_layout_signal.eo.c"
549#include "efl_canvas_layout_group.eo.c" 549#include "efl_canvas_layout_group.eo.c"
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 47ee13d..d941b82 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -460,7 +460,7 @@ _edje_object_efl_canvas_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *e
460} 460}
461 461
462EOLIAN int 462EOLIAN int
463_edje_object_efl_canvas_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed) 463_edje_object_efl_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed)
464{ 464{
465 unsigned short i; 465 unsigned short i;
466 466
@@ -478,7 +478,7 @@ _edje_object_efl_canvas_layout_calc_calc_freeze(Eo *obj EINA_UNUSED, Edje *ed)
478} 478}
479 479
480EOLIAN int 480EOLIAN int
481_edje_object_efl_canvas_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed) 481_edje_object_efl_layout_calc_calc_thaw(Eo *obj EINA_UNUSED, Edje *ed)
482{ 482{
483 unsigned short i; 483 unsigned short i;
484 484
@@ -3344,7 +3344,7 @@ _edje_object_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edj
3344} 3344}
3345 3345
3346EOLIAN void 3346EOLIAN void
3347_edje_object_efl_canvas_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed) 3347_edje_object_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed)
3348{ 3348{
3349 int pf, pf2; 3349 int pf, pf2;
3350 3350
@@ -3367,7 +3367,7 @@ _edje_object_efl_canvas_layout_calc_calc_force(Eo *obj EINA_UNUSED, Edje *ed)
3367} 3367}
3368 3368
3369EOLIAN Eina_Rectangle 3369EOLIAN Eina_Rectangle
3370_edje_object_efl_canvas_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed) 3370_edje_object_efl_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje *ed)
3371{ 3371{
3372 Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX; 3372 Evas_Coord xx1 = INT_MAX, yy1 = INT_MAX;
3373 Evas_Coord xx2 = 0, yy2 = 0, w = 0, h = 0; 3373 Evas_Coord xx2 = 0, yy2 = 0, w = 0, h = 0;
@@ -3407,7 +3407,7 @@ _edje_object_efl_canvas_layout_calc_calc_parts_extends(Eo *obj EINA_UNUSED, Edje
3407} 3407}
3408 3408
3409EOLIAN Eina_Size2D 3409EOLIAN Eina_Size2D
3410_edje_object_efl_canvas_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted) 3410_edje_object_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Edje *ed, Eina_Size2D restricted)
3411{ 3411{
3412 const int CALC_COUNT_LIMIT = 255; 3412 const int CALC_COUNT_LIMIT = 255;
3413 3413
@@ -5040,7 +5040,7 @@ edje_object_preload(Eo *obj, Eina_Bool cancel)
5040} 5040}
5041 5041
5042EOLIAN void 5042EOLIAN void
5043_edje_object_efl_canvas_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update) 5043_edje_object_efl_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUSED, Edje *ed, Eina_Bool update)
5044{ 5044{
5045 if (!ed) return; 5045 if (!ed) return;
5046 if (ed->update_hints == !!update) return; 5046 if (ed->update_hints == !!update) return;
@@ -5054,7 +5054,7 @@ _edje_object_efl_canvas_layout_calc_calc_auto_update_hints_set(Eo *obj EINA_UNUS
5054} 5054}
5055 5055
5056EOLIAN Eina_Bool 5056EOLIAN Eina_Bool
5057_edje_object_efl_canvas_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed) 5057_edje_object_efl_layout_calc_calc_auto_update_hints_get(Eo *obj EINA_UNUSED, Edje *ed)
5058{ 5058{
5059 return ed->update_hints; 5059 return ed->update_hints;
5060} 5060}
diff --git a/src/lib/edje/efl_canvas_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo
index 1ed6fdf..d196e9a 100644
--- a/src/lib/edje/efl_canvas_layout_calc.eo
+++ b/src/lib/edje/efl_layout_calc.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3interface Efl.Canvas.Layout_Calc 3interface Efl.Layout.Calc
4{ 4{
5 [[This interface defines a common set of APIs used to trigger calculations 5 [[This interface defines a common set of APIs used to trigger calculations
6 with layout objects. 6 with layout objects.
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 292875d..63933d8 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -5,7 +5,7 @@
5#define EFL_ACCESS_IMAGE_PROTECTED 5#define EFL_ACCESS_IMAGE_PROTECTED
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED 7#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
8#define EFL_CANVAS_LAYOUT_CALC_PROTECTED 8#define EFL_LAYOUT_CALC_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
11 11
@@ -1190,17 +1190,17 @@ _efl_ui_image_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Ef
1190} 1190}
1191 1191
1192EOLIAN static void 1192EOLIAN static void
1193_efl_ui_image_efl_canvas_layout_calc_calc_force(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1193_efl_ui_image_efl_layout_calc_calc_force(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1194{ 1194{
1195 if (sd->edje) 1195 if (sd->edje)
1196 edje_object_calc_force(sd->img); 1196 edje_object_calc_force(sd->img);
1197} 1197}
1198 1198
1199EOLIAN static Eina_Size2D 1199EOLIAN static Eina_Size2D
1200_efl_ui_image_efl_canvas_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Size2D restricted) 1200_efl_ui_image_efl_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Eina_Size2D restricted)
1201{ 1201{
1202 if (sd->edje) 1202 if (sd->edje)
1203 return efl_canvas_layout_calc_size_min(sd->img, restricted); 1203 return efl_layout_calc_size_min(sd->img, restricted);
1204 else 1204 else
1205 { 1205 {
1206 // Ignore restricted here? Combine with min? Hmm... 1206 // Ignore restricted here? Combine with min? Hmm...
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 3e6f1e6..9065496 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -47,7 +47,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
47 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, 47 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
48 Efl.Access.Image, Efl.Access.Widget.Action, 48 Efl.Access.Image, Efl.Access.Widget.Action,
49 Efl.Orientation, Efl.Flipable, 49 Efl.Orientation, Efl.Flipable,
50 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc, 50 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
51 Efl.Canvas.Layout_Group, Efl.Layout.Signal) 51 Efl.Canvas.Layout_Group, Efl.Layout.Signal)
52{ 52{
53 [[ Efl UI image class]] 53 [[ Efl UI image class]]
@@ -141,8 +141,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
141 Efl.Canvas.Layout_Group.group_size_min { get; } 141 Efl.Canvas.Layout_Group.group_size_min { get; }
142 Efl.Canvas.Layout_Group.group_size_max { get; } 142 Efl.Canvas.Layout_Group.group_size_max { get; }
143 //Efl.Canvas.Layout_Group.group_data { get; } 143 //Efl.Canvas.Layout_Group.group_data { get; }
144 Efl.Canvas.Layout_Calc.calc_size_min; 144 Efl.Layout.Calc.calc_size_min;
145 Efl.Canvas.Layout_Calc.calc_force; 145 Efl.Layout.Calc.calc_force;
146 Efl.Canvas.Object.clip { set; } 146 Efl.Canvas.Object.clip { set; }
147 Efl.Canvas.Group.group_member_add; 147 Efl.Canvas.Group.group_member_add;
148 Efl.Ui.Draggable.drag_target { get; set; } 148 Efl.Ui.Draggable.drag_target { get; set; }
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index f1efc08..c86c636 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1599,7 +1599,7 @@ elm_layout_sizing_restricted_eval(Eo *obj, Eina_Bool w, Eina_Bool h)
1599} 1599}
1600 1600
1601EOLIAN static int 1601EOLIAN static int
1602_efl_ui_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd) 1602_efl_ui_layout_efl_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *sd)
1603{ 1603{
1604 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1604 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1605 1605
@@ -1611,7 +1611,7 @@ _efl_ui_layout_efl_canvas_layout_calc_calc_freeze(Eo *obj, Efl_Ui_Layout_Data *s
1611} 1611}
1612 1612
1613EOLIAN static int 1613EOLIAN static int
1614_efl_ui_layout_efl_canvas_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd) 1614_efl_ui_layout_efl_layout_calc_calc_thaw(Eo *obj, Efl_Ui_Layout_Data *sd)
1615{ 1615{
1616 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0); 1616 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
1617 1617
@@ -2247,13 +2247,13 @@ elm_layout_part_cursor_unset(Eo *obj, const char *part)
2247EAPI int 2247EAPI int
2248elm_layout_freeze(Evas_Object *obj) 2248elm_layout_freeze(Evas_Object *obj)
2249{ 2249{
2250 return efl_canvas_layout_calc_freeze(obj); 2250 return efl_layout_calc_freeze(obj);
2251} 2251}
2252 2252
2253EAPI int 2253EAPI int
2254elm_layout_thaw(Evas_Object *obj) 2254elm_layout_thaw(Evas_Object *obj)
2255{ 2255{
2256 return efl_canvas_layout_calc_thaw(obj); 2256 return efl_layout_calc_thaw(obj);
2257} 2257}
2258 2258
2259void 2259void
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 44cd39f..45b163c 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,6 +1,6 @@
1class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, 1class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, 2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
3 Efl.Canvas.Layout_Calc, Efl.Layout.Signal, 3 Efl.Layout.Calc, Efl.Layout.Signal,
4 Efl.Canvas.Layout_Group) 4 Efl.Canvas.Layout_Group)
5{ 5{
6 [[Elementary layout class]] 6 [[Elementary layout class]]
@@ -48,8 +48,8 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
48 Efl.File.file { get; set; } 48 Efl.File.file { get; set; }
49 Efl.File.mmap { get; set; } 49 Efl.File.mmap { get; set; }
50 Efl.Canvas.Group.group_calculate; 50 Efl.Canvas.Group.group_calculate;
51 Efl.Canvas.Layout_Calc.calc_freeze; 51 Efl.Layout.Calc.calc_freeze;
52 Efl.Canvas.Layout_Calc.calc_thaw; 52 Efl.Layout.Calc.calc_thaw;
53 Efl.Layout.Signal.signal_callback_add; 53 Efl.Layout.Signal.signal_callback_add;
54 Efl.Layout.Signal.signal_callback_del; 54 Efl.Layout.Signal.signal_callback_del;
55 Efl.Layout.Signal.signal_emit; 55 Efl.Layout.Signal.signal_emit;
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 4d83f48..a8dbbf3 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -155,8 +155,8 @@ START_TEST(edje_test_calculate_parens)
155 155
156 obj = edje_object_add(evas); 156 obj = edje_object_add(evas);
157 157
158 /* A negative test case for efl_canvas_layout_calc_parts_extends */ 158 /* A negative test case for efl_layout_calc_parts_extends */
159 rect = efl_canvas_layout_calc_parts_extends(obj); 159 rect = efl_layout_calc_parts_extends(obj);
160 fail_if(rect.w < 0 || rect.h < 0); 160 fail_if(rect.w < 0 || rect.h < 0);
161 161
162 fail_unless(edje_object_file_set(obj, test_layout_get("test_parens.edj"), "test_group")); 162 fail_unless(edje_object_file_set(obj, test_layout_get("test_parens.edj"), "test_group"));