summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-09-05 16:54:40 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-09-05 17:14:22 +0900
commit0dabbfe177ee5a1deb38ab6aa0c994ecad68d1cf (patch)
tree35b2b23d51160ababcee8e624642c1cb4f1e0081 /src/lib
parent743e0468e910a4f0928bcbf8f7547203108f0d78 (diff)
Revert "efl: Remove unnecessary abstract/class inheritance"
This reverts commit 4067fafe07c4d22ac2e2672921c268ae8866029f. As commented on D6982, the original patch changes the widget's behavior. e.g. Efl.Ui.Win cannot be called with Efl.Config_Gloabal APIs. Elm.Combobox cannot provide events of Button and Hover. Until the above changes are resolved, the original patch is reverted.
Diffstat (limited to '')
-rw-r--r--src/lib/edje/efl_canvas_layout_part_external.eo3
-rw-r--r--src/lib/elementary/efl_ui_win.eo2
-rw-r--r--src/lib/elementary/elm_combobox.eo5
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo4
5 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/edje/efl_canvas_layout_part_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo
index 4a80b1cfe9..e3d3b48a32 100644
--- a/src/lib/edje/efl_canvas_layout_part_external.eo
+++ b/src/lib/edje/efl_canvas_layout_part_external.eo
@@ -1,4 +1,5 @@
1class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content) 1class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content,
2 Efl.Canvas.Object)
2{ 3{
3 [[Class representing an external part in Edje layouts. 4 [[Class representing an external part in Edje layouts.
4 5
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 9650d01538..567eb6e1e6 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -157,7 +157,7 @@ enum Efl.Ui.Win_Move_Resize_Mode
157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window, 157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window,
158 Efl.Access.Component, Efl.Access.Widget.Action, 158 Efl.Access.Component, Efl.Access.Widget.Action,
159 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 159 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
160 Efl.Gfx.Size_Hint, Efl.Text, Efl.Part, 160 Efl.Gfx.Size_Hint, Efl.Text, Efl.Config_Global, Efl.Part,
161 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root) 161 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root)
162{ 162{
163 [[Efl UI window class]] 163 [[Efl UI window class]]
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index 123da1a3a7..62d447024d 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -1,5 +1,6 @@
1class Elm.Combobox (Elm.Genlist, Efl.Ui.Selectable, Efl.Access.Widget.Action, 1class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable,
2 Efl.Ui.Autorepeat, Efl.Ui.Legacy) 2 Efl.Access.Widget.Action,
3 Elm.Entry, Elm.Genlist, Elm.Hover, Efl.Ui.Legacy)
3{ 4{
4 [[Elementary combobox class]] 5 [[Elementary combobox class]]
5 legacy_prefix: elm_combobox; 6 legacy_prefix: elm_combobox;
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index af5599c6e8..6d13d1c861 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -2,9 +2,9 @@ import efl_text_types;
2 2
3struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]] 3struct Efl.Canvas.Object_Animation_Event; [[Information of animation events]]
4 4
5abstract Efl.Canvas.Object (Efl.Loop_Consumer, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, 5abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
6 Efl.Input.Interface, Efl.Gfx.Size_Hint, 6 Efl.Input.Interface, Efl.Gfx.Size_Hint,
7 Efl.Gfx.Map, Efl.Ui.Base, Efl.Canvas.Pointer) 7 Efl.Gfx.Map, Efl.Loop_Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
8{ 8{
9 [[Efl canvas object abstract class]] 9 [[Efl canvas object abstract class]]
10 legacy_prefix: evas_object; 10 legacy_prefix: evas_object;
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 33f555fc1d..0c0ff5b370 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
1import efl_input_types; 1import efl_input_types;
2 2
3class Evas.Canvas (Efl.Loop_Consumer, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface, 3class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface,
4 Efl.Canvas.Pointer) 4 Efl.Loop_Consumer, Efl.Canvas.Pointer)
5{ 5{
6 [[Evas canvas class]] 6 [[Evas canvas class]]
7 legacy_prefix: evas; 7 legacy_prefix: evas;