summaryrefslogtreecommitdiff
path: root/unsorted
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-05-03 01:02:11 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2018-05-03 18:04:41 -0300
commit93d75b47c91123dec160efde623f7a49cf80c76c (patch)
tree6441d960da981cf72120343b8cff6f45bc6de040 /unsorted
parent4eebe1b884272bdbe60c96c6ceb6cf3b7423b0b5 (diff)
efl_mono: Update tests and examples after rename
Summary: Separated from the generator and libs for easier review Depends on D6050 Reviewers: felipealmeida, vitor.sousa Reviewed By: vitor.sousa Subscribers: cedric Tags: #efl Differential Revision: https://phab.enlightenment.org/D6051
Diffstat (limited to 'unsorted')
-rw-r--r--unsorted/efl_mono/EoInherit01.cs4
-rw-r--r--unsorted/efl_mono/FunctionPointer01.cs2
-rw-r--r--unsorted/elementary/efl_ui_slider_mono.cs20
-rw-r--r--unsorted/elementary/efl_ui_unit_converter.cs42
-rw-r--r--unsorted/evas/evas_mono_box.cs14
-rw-r--r--unsorted/evas/evas_mono_image.cs14
-rw-r--r--unsorted/evas/evas_mono_image2.cs12
-rw-r--r--unsorted/evas/evas_mono_rectangle.cs10
-rw-r--r--unsorted/evas/evas_mono_table.cs18
-rw-r--r--unsorted/evas/evas_mono_text.cs14
10 files changed, 75 insertions, 75 deletions
diff --git a/unsorted/efl_mono/EoInherit01.cs b/unsorted/efl_mono/EoInherit01.cs
index 17ea4df2..cf35ca5f 100644
--- a/unsorted/efl_mono/EoInherit01.cs
+++ b/unsorted/efl_mono/EoInherit01.cs
@@ -2,7 +2,7 @@ using static System.Console;
2 2
3class PlusTenNumberWrapper : example.NumberwrapperInherit 3class PlusTenNumberWrapper : example.NumberwrapperInherit
4{ 4{
5 public PlusTenNumberWrapper(efl.Object parent = null) 5 public PlusTenNumberWrapper(efl.IObject parent = null)
6 : base(parent) 6 : base(parent)
7 {} 7 {}
8 8
@@ -52,7 +52,7 @@ public class ExampleEoInherit01
52 WriteLine("## Using original object ##\n"); 52 WriteLine("## Using original object ##\n");
53 53
54 // Check original EFL object 54 // Check original EFL object
55 var origObj = new example.NumberwrapperConcrete(); 55 var origObj = new example.Numberwrapper();
56 given = 111; 56 given = 111;
57 origObj.SetNumber(given); 57 origObj.SetNumber(given);
58 stored = origObj.GetNumber(); 58 stored = origObj.GetNumber();
diff --git a/unsorted/efl_mono/FunctionPointer01.cs b/unsorted/efl_mono/FunctionPointer01.cs
index 2954473a..c32f53cd 100644
--- a/unsorted/efl_mono/FunctionPointer01.cs
+++ b/unsorted/efl_mono/FunctionPointer01.cs
@@ -15,7 +15,7 @@ public class ExampleFunctionPointer01
15 eina.Config.Init(); 15 eina.Config.Init();
16 efl.eo.Config.Init(); 16 efl.eo.Config.Init();
17 17
18 var obj = new example.NumberwrapperConcrete(); 18 var obj = new example.Numberwrapper();
19 19
20 // Set internal value 20 // Set internal value
21 obj.SetNumber(12); 21 obj.SetNumber(12);
diff --git a/unsorted/elementary/efl_ui_slider_mono.cs b/unsorted/elementary/efl_ui_slider_mono.cs
index 6a5c6af1..62b3504f 100644
--- a/unsorted/elementary/efl_ui_slider_mono.cs
+++ b/unsorted/elementary/efl_ui_slider_mono.cs
@@ -2,11 +2,11 @@ using System;
2 2
3public class Example 3public class Example
4{ 4{
5 public static efl.ui.Button CreateButton(efl.Object parent, 5 public static efl.ui.IButton CreateButton(efl.IObject parent,
6 string text, 6 string text,
7 int w, int h, 7 int w, int h,
8 EventHandler callback) { 8 EventHandler callback) {
9 efl.ui.Button button = new efl.ui.ButtonConcrete(parent); 9 efl.ui.IButton button = new efl.ui.Button(parent);
10 button.SetText(text); 10 button.SetText(text);
11 button.SetSize(new eina.Size2D(w, h)); 11 button.SetSize(new eina.Size2D(w, h));
12 12
@@ -36,32 +36,32 @@ public class Example
36 36
37 efl.All.Init(efl.Components.Ui); 37 efl.All.Init(efl.Components.Ui);
38 38
39 efl.ui.Win win = new efl.ui.WinConcrete(null); 39 efl.ui.Win win = new efl.ui.Win(null);
40 win.SetText("Hello, C#!!"); 40 win.SetText("Hello, C#!!");
41 win.SetAutohide(true); 41 win.SetAutohide(true);
42 42
43 efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win); 43 efl.ui.Box_Flow box = new efl.ui.Box_Flow(win);
44 44
45 efl.ui.Button button = CreateButton(box, "Click to exit", 120, 30, 45 efl.ui.IButton button = CreateButton(box, "Click to exit", 120, 30,
46 (object sender, EventArgs e) => { 46 (object sender, EventArgs e) => {
47 efl.ui.Config.Exit(); 47 efl.ui.Config.Exit();
48 }); 48 });
49 49
50 box.Pack(button); 50 box.DoPack(button);
51 51
52 efl.ui.Progressbar bar = new efl.ui.ProgressbarConcrete(box); 52 efl.ui.Progressbar bar = new efl.ui.Progressbar(box);
53 bar.SetSize(new eina.Size2D(W, H)); 53 bar.SetSize(new eina.Size2D(W, H));
54 bar.SetFormatCb(Formatter); 54 bar.SetFormatCb(Formatter);
55 55
56 efl.ui.Slider slider = new efl.ui.SliderConcrete(box); 56 efl.ui.ISlider slider = new efl.ui.Slider(box);
57 slider.SetSize(new eina.Size2D(W, H)); 57 slider.SetSize(new eina.Size2D(W, H));
58 58
59 slider.ChangedEvt += (object sender, EventArgs e) => { 59 slider.ChangedEvt += (object sender, EventArgs e) => {
60 bar.SetRangeValue(slider.GetRangeValue()); 60 bar.SetRangeValue(slider.GetRangeValue());
61 }; 61 };
62 62
63 box.Pack(bar); 63 box.DoPack(bar);
64 box.Pack(slider); 64 box.DoPack(slider);
65 65
66 button.SetVisible(true); 66 button.SetVisible(true);
67 box.SetVisible(true); 67 box.SetVisible(true);
diff --git a/unsorted/elementary/efl_ui_unit_converter.cs b/unsorted/elementary/efl_ui_unit_converter.cs
index d8c56918..85fd0213 100644
--- a/unsorted/elementary/efl_ui_unit_converter.cs
+++ b/unsorted/elementary/efl_ui_unit_converter.cs
@@ -16,14 +16,14 @@ public class Example
16 16
17 private static void ShowErrorPopup(efl.ui.Win win, string message) 17 private static void ShowErrorPopup(efl.ui.Win win, string message)
18 { 18 {
19 efl.ui.Popup_Alert popup = new efl.ui.Popup_AlertConcrete(win); 19 efl.ui.IPopup_Alert popup = new efl.ui.Popup_Alert(win);
20 efl.ui.Text popup_text = new efl.ui.TextConcrete(popup); 20 efl.ui.Text popup_text = new efl.ui.Text(popup);
21 popup_text.SetText($"Error: {message}"); 21 popup_text.SetText($"Error: {message}");
22 popup.SetContent(popup_text); 22 popup.SetContent(popup_text);
23 popup.SetVisible(true); 23 popup.SetVisible(true);
24 popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok"); 24 popup.SetButton(efl.ui.Popup_Alert_Button.Positive, "Ok");
25 popup.SetSize(new eina.Size2D(150, 30)); 25 popup.SetSize(new eina.Size2D(150, 30));
26 popup.ButtonClickedEvt += (object sender, efl.ui.Popup_AlertConcrete.ButtonClickedEvt_Args e) => { 26 popup.ButtonClickedEvt += (object sender, efl.ui.Popup_Alert.ButtonClickedEvt_Args e) => {
27 popup.SetParent(null); 27 popup.SetParent(null);
28 popup.Del(); 28 popup.Del();
29 }; 29 };
@@ -41,63 +41,63 @@ public class Example
41 41
42 efl.All.Init(efl.Components.Ui); 42 efl.All.Init(efl.Components.Ui);
43 43
44 efl.ui.Win win = new efl.ui.WinConcrete(null); 44 efl.ui.Win win = new efl.ui.Win(null);
45 win.SetText("C# Unit Converter"); 45 win.SetText("C# Unit Converter");
46 win.SetAutohide(true); 46 win.SetAutohide(true);
47 47
48 efl.ui.Box_Flow box = new efl.ui.Box_FlowConcrete(win); 48 efl.ui.Box_Flow box = new efl.ui.Box_Flow(win);
49 box.SetDirection(efl.ui.Dir.Horizontal); 49 box.SetDirection(efl.ui.Dir.Horizontal);
50 50
51 efl.ui.Box_Flow miles_box = new efl.ui.Box_FlowConcrete(box); 51 efl.ui.Box_Flow miles_box = new efl.ui.Box_Flow(box);
52 miles_box.SetDirection(efl.ui.Dir.Down); 52 miles_box.SetDirection(efl.ui.Dir.Down);
53 53
54 box.Pack(miles_box); 54 box.DoPack(miles_box);
55 55
56 efl.ui.Text miles_label = new efl.ui.TextConcrete(miles_box); 56 efl.ui.Text miles_label = new efl.ui.Text(miles_box);
57 miles_label.SetText("Miles:"); 57 miles_label.SetText("Miles:");
58 miles_label.SetSize(size); 58 miles_label.SetSize(size);
59 miles_label.SetVisible(true); 59 miles_label.SetVisible(true);
60 60
61 efl.ui.Text_Editable miles_input = new efl.ui.Text_EditableConcrete(miles_box); 61 efl.ui.Text_Editable miles_input = new efl.ui.Text_Editable(miles_box);
62 miles_input.SetText(""); 62 miles_input.SetText("");
63 miles_input.SetScrollable(true); 63 miles_input.SetScrollable(true);
64 miles_input.SetSize(size); 64 miles_input.SetSize(size);
65 miles_input.SetVisible(true); 65 miles_input.SetVisible(true);
66 66
67 efl.ui.Button miles_button = new efl.ui.ButtonConcrete(miles_box); 67 efl.ui.IButton miles_button = new efl.ui.Button(miles_box);
68 miles_button.SetText("To Km"); 68 miles_button.SetText("To Km");
69 miles_button.SetSize(size); 69 miles_button.SetSize(size);
70 miles_button.SetVisible(true); 70 miles_button.SetVisible(true);
71 71
72 miles_box.Pack(miles_label); 72 miles_box.DoPack(miles_label);
73 miles_box.Pack(miles_input); 73 miles_box.DoPack(miles_input);
74 miles_box.Pack(miles_button); 74 miles_box.DoPack(miles_button);
75 75
76 76
77 efl.ui.Box_Flow kms_box = new efl.ui.Box_FlowConcrete(box); 77 efl.ui.Box_Flow kms_box = new efl.ui.Box_Flow(box);
78 kms_box.SetDirection(efl.ui.Dir.Down); 78 kms_box.SetDirection(efl.ui.Dir.Down);
79 79
80 box.Pack(kms_box); 80 box.DoPack(kms_box);
81 81
82 efl.ui.Text kms_label = new efl.ui.TextConcrete(kms_box); 82 efl.ui.Text kms_label = new efl.ui.Text(kms_box);
83 kms_label.SetText("Kilometers:"); 83 kms_label.SetText("Kilometers:");
84 kms_label.SetSize(size); 84 kms_label.SetSize(size);
85 kms_label.SetVisible(true); 85 kms_label.SetVisible(true);
86 86
87 efl.ui.Text_Editable kms_input = new efl.ui.Text_EditableConcrete(kms_box); 87 efl.ui.Text_Editable kms_input = new efl.ui.Text_Editable(kms_box);
88 kms_input.SetText(""); 88 kms_input.SetText("");
89 kms_input.SetScrollable(true); 89 kms_input.SetScrollable(true);
90 kms_input.SetSize(size); 90 kms_input.SetSize(size);
91 kms_input.SetVisible(true); 91 kms_input.SetVisible(true);
92 92
93 efl.ui.Button kms_button = new efl.ui.ButtonConcrete(kms_box); 93 efl.ui.IButton kms_button = new efl.ui.Button(kms_box);
94 kms_button.SetText("To Miles"); 94 kms_button.SetText("To Miles");
95 kms_button.SetSize(size); 95 kms_button.SetSize(size);
96 kms_button.SetVisible(true); 96 kms_button.SetVisible(true);
97 97
98 kms_box.Pack(kms_label); 98 kms_box.DoPack(kms_label);
99 kms_box.Pack(kms_input); 99 kms_box.DoPack(kms_input);
100 kms_box.Pack(kms_button); 100 kms_box.DoPack(kms_button);
101 101
102 kms_button.ClickedEvt += (object sender, EventArgs e) => { 102 kms_button.ClickedEvt += (object sender, EventArgs e) => {
103 try 103 try
diff --git a/unsorted/evas/evas_mono_box.cs b/unsorted/evas/evas_mono_box.cs
index cdc4b8b1..97c161c5 100644
--- a/unsorted/evas/evas_mono_box.cs
+++ b/unsorted/evas/evas_mono_box.cs
@@ -4,7 +4,7 @@ using System.Runtime.CompilerServices;
4 4
5public class MyBox : evas.BoxInherit 5public class MyBox : evas.BoxInherit
6{ 6{
7 public MyBox(efl.Object parent) : base(parent) {} 7 public MyBox(efl.IObject parent) : base(parent) {}
8 8
9 [DllImport("evas")] static extern void evas_obj_box_layout_vertical(IntPtr obj, IntPtr data, IntPtr privdata); 9 [DllImport("evas")] static extern void evas_obj_box_layout_vertical(IntPtr obj, IntPtr data, IntPtr privdata);
10 [DllImport("evas")] static extern void evas_obj_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata); 10 [DllImport("evas")] static extern void evas_obj_box_layout_horizontal(IntPtr obj, IntPtr data, IntPtr privdata);
@@ -32,18 +32,18 @@ class TestMain
32 { 32 {
33 efl.All.Init(); 33 efl.All.Init();
34 34
35 efl.Loop loop = new efl.LoopConcrete(); 35 efl.Loop loop = new efl.Loop();
36 36
37 37
38 EcoreEvas ecore_evas = new EcoreEvas(); 38 EcoreEvas ecore_evas = new EcoreEvas();
39 39
40 efl.canvas.Object canvas = ecore_evas.canvas; 40 efl.canvas.IObject canvas = ecore_evas.canvas;
41 canvas.SetVisible(true); 41 canvas.SetVisible(true);
42 42
43 efl.Object parent = canvas.GetParent(); 43 efl.IObject parent = canvas.GetParent();
44 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); 44 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
45 45
46 evas.Box box = new MyBox(canvas); 46 evas.IBox box = new MyBox(canvas);
47 eina.Size2D size = new eina.Size2D(); 47 eina.Size2D size = new eina.Size2D();
48 48
49 size.W = 320; 49 size.W = 320;
@@ -52,7 +52,7 @@ class TestMain
52 box.SetSize(size); 52 box.SetSize(size);
53 box.SetVisible(true); 53 box.SetVisible(true);
54 54
55 efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); 55 efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
56 rect.SetColor(0, 0, 255, 255); 56 rect.SetColor(0, 0, 255, 255);
57 size.W = 320; 57 size.W = 320;
58 size.H = 120; 58 size.H = 120;
@@ -60,7 +60,7 @@ class TestMain
60 rect.SetVisible(true); 60 rect.SetVisible(true);
61 box.Append(rect); 61 box.Append(rect);
62 62
63 efl.canvas.Rectangle rect2 = new efl.canvas.RectangleConcrete(canvas); 63 efl.canvas.Rectangle rect2 = new efl.canvas.Rectangle(canvas);
64 rect2.SetColor(0, 255, 0, 255); 64 rect2.SetColor(0, 255, 0, 255);
65 rect2.SetSize(size); 65 rect2.SetSize(size);
66 rect2.SetVisible(true); 66 rect2.SetVisible(true);
diff --git a/unsorted/evas/evas_mono_image.cs b/unsorted/evas/evas_mono_image.cs
index ff84db5d..47f9b360 100644
--- a/unsorted/evas/evas_mono_image.cs
+++ b/unsorted/evas/evas_mono_image.cs
@@ -6,7 +6,7 @@ class TestMain
6 static int WIDTH = 320; 6 static int WIDTH = 320;
7 static int HEIGHT = 240; 7 static int HEIGHT = 240;
8 8
9 evas.Image image; 9 evas.IImage image;
10 10
11 11
12 static string ImagePath([CallerFilePath] string folder="") 12 static string ImagePath([CallerFilePath] string folder="")
@@ -14,7 +14,7 @@ class TestMain
14 return System.IO.Path.GetDirectoryName(folder); 14 return System.IO.Path.GetDirectoryName(folder);
15 } 15 }
16 16
17 public TestMain(evas.Image image) 17 public TestMain(evas.IImage image)
18 { 18 {
19 this.image = image; 19 this.image = image;
20 } 20 }
@@ -23,18 +23,18 @@ class TestMain
23 { 23 {
24 efl.All.Init(); 24 efl.All.Init();
25 25
26 efl.Loop loop = new efl.LoopConcrete(); 26 efl.Loop loop = new efl.Loop();
27 27
28 EcoreEvas ecore_evas = new EcoreEvas(); 28 EcoreEvas ecore_evas = new EcoreEvas();
29 eina.Size2D size = new eina.Size2D(); 29 eina.Size2D size = new eina.Size2D();
30 30
31 efl.canvas.Object canvas = ecore_evas.canvas; 31 efl.canvas.IObject canvas = ecore_evas.canvas;
32 canvas.SetVisible(true); 32 canvas.SetVisible(true);
33 33
34 efl.Object parent = canvas.GetParent(); 34 efl.IObject parent = canvas.GetParent();
35 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); 35 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
36 36
37 efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); 37 efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
38 bg.SetColor(255, 255, 255, 255); 38 bg.SetColor(255, 255, 255, 255);
39 size.W = WIDTH; 39 size.W = WIDTH;
40 size.H = HEIGHT; 40 size.H = HEIGHT;
@@ -42,7 +42,7 @@ class TestMain
42 bg.SetVisible(true); 42 bg.SetVisible(true);
43 43
44 string valid_path = args[0]; 44 string valid_path = args[0];
45 evas.Image image = new evas.ImageConcrete(canvas); 45 evas.Image image = new evas.Image(canvas);
46 image.SetFile(valid_path, null); 46 image.SetFile(valid_path, null);
47 47
48 /* FIXME evas-image uses error handling code from 48 /* FIXME evas-image uses error handling code from
diff --git a/unsorted/evas/evas_mono_image2.cs b/unsorted/evas/evas_mono_image2.cs
index e2ae49f0..1f0e52ac 100644
--- a/unsorted/evas/evas_mono_image2.cs
+++ b/unsorted/evas/evas_mono_image2.cs
@@ -12,17 +12,17 @@ class TestMain
12 { 12 {
13 efl.All.Init(); 13 efl.All.Init();
14 14
15 efl.Loop loop = new efl.LoopConcrete(); 15 efl.Loop loop = new efl.Loop();
16 16
17 EcoreEvas ecore_evas = new EcoreEvas(); 17 EcoreEvas ecore_evas = new EcoreEvas();
18 18
19 eina.Size2D size = new eina.Size2D(); 19 eina.Size2D size = new eina.Size2D();
20 eina.Position2D pos = new eina.Position2D(); 20 eina.Position2D pos = new eina.Position2D();
21 21
22 efl.canvas.Object canvas = ecore_evas.canvas; 22 efl.canvas.IObject canvas = ecore_evas.canvas;
23 canvas.SetVisible(true); 23 canvas.SetVisible(true);
24 24
25 efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); 25 efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
26 bg.SetColor(255, 255, 255, 255); 26 bg.SetColor(255, 255, 255, 255);
27 pos.X = 0; 27 pos.X = 0;
28 pos.Y = 0; 28 pos.Y = 0;
@@ -33,7 +33,7 @@ class TestMain
33 bg.SetVisible(true); 33 bg.SetVisible(true);
34 34
35 string path = args[0]; 35 string path = args[0];
36 evas.Image logo = new evas.ImageConcrete(canvas); 36 evas.Image logo = new evas.Image(canvas);
37 logo.SetFillAuto(true); 37 logo.SetFillAuto(true);
38 38
39 // TODO add preloaded support (depends on events) 39 // TODO add preloaded support (depends on events)
@@ -53,7 +53,7 @@ class TestMain
53 pixels[i] = generator.Next(); 53 pixels[i] = generator.Next();
54 } 54 }
55 55
56 evas.Image noise_img = new evas.ImageConcrete(canvas); 56 evas.Image noise_img = new evas.Image(canvas);
57 size.W = WIDTH / 4; 57 size.W = WIDTH / 4;
58 size.H = HEIGHT / 4; 58 size.H = HEIGHT / 4;
59 noise_img.SetSize(size); 59 noise_img.SetSize(size);
@@ -66,7 +66,7 @@ class TestMain
66 noise_img.SetVisible(true); 66 noise_img.SetVisible(true);
67 Console.WriteLine("Creating noise image with sizez %d, %d", WIDTH/4, HEIGHT/4); 67 Console.WriteLine("Creating noise image with sizez %d, %d", WIDTH/4, HEIGHT/4);
68 68
69 efl.canvas.Proxy proxy_img = new efl.canvas.ProxyConcrete(canvas); 69 efl.canvas.Proxy proxy_img = new efl.canvas.Proxy(canvas);
70 proxy_img.SetSource(noise_img); 70 proxy_img.SetSource(noise_img);
71 pos.X = WIDTH / 2; 71 pos.X = WIDTH / 2;
72 pos.Y = HEIGHT / 2; 72 pos.Y = HEIGHT / 2;
diff --git a/unsorted/evas/evas_mono_rectangle.cs b/unsorted/evas/evas_mono_rectangle.cs
index 8db2c63e..c31c2478 100644
--- a/unsorted/evas/evas_mono_rectangle.cs
+++ b/unsorted/evas/evas_mono_rectangle.cs
@@ -14,15 +14,15 @@ class TestMain
14 14
15 efl.All.Init(); 15 efl.All.Init();
16 16
17 efl.Loop loop = new efl.LoopConcrete(); 17 efl.Loop loop = new efl.Loop();
18 EcoreEvas ecore_evas = new EcoreEvas(); 18 EcoreEvas ecore_evas = new EcoreEvas();
19 efl.canvas.Object canvas = ecore_evas.canvas; 19 efl.canvas.IObject canvas = ecore_evas.canvas;
20 canvas.SetVisible(true); 20 canvas.SetVisible(true);
21 21
22 efl.Object parent = canvas.GetParent(); 22 efl.IObject parent = canvas.GetParent();
23 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); 23 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
24 24
25 efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); 25 efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
26 rect.SetColor(colors[0, 0], colors[0, 1], colors[0, 2], 255); 26 rect.SetColor(colors[0, 0], colors[0, 1], colors[0, 2], 255);
27 eina.Size2D size = new eina.Size2D(); 27 eina.Size2D size = new eina.Size2D();
28 size.W = 640; 28 size.W = 640;
@@ -30,7 +30,7 @@ class TestMain
30 rect.SetSize(size); 30 rect.SetSize(size);
31 rect.SetVisible(true); 31 rect.SetVisible(true);
32 32
33 canvas.KeyDownEvt += (object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) => { 33 canvas.KeyDownEvt += (object sender, efl.input.Interface.KeyDownEvt_Args e) => {
34 color_index = (color_index + 1) % 3; 34 color_index = (color_index + 1) % 3;
35 Console.WriteLine("Key Down"); 35 Console.WriteLine("Key Down");
36 Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X")); 36 Console.WriteLine("Got key obj at {0}", e.arg.raw_handle.ToString("X"));
diff --git a/unsorted/evas/evas_mono_table.cs b/unsorted/evas/evas_mono_table.cs
index e79ad7c9..db329b22 100644
--- a/unsorted/evas/evas_mono_table.cs
+++ b/unsorted/evas/evas_mono_table.cs
@@ -11,7 +11,7 @@ class TestMain
11 { 11 {
12 efl.All.Init(); 12 efl.All.Init();
13 13
14 efl.Loop loop = new efl.LoopConcrete(); 14 efl.Loop loop = new efl.Loop();
15 15
16 EcoreEvas ecore_evas = new EcoreEvas(); 16 EcoreEvas ecore_evas = new EcoreEvas();
17 17
@@ -21,25 +21,25 @@ class TestMain
21 21
22 eina.Size2D hint = new eina.Size2D(); 22 eina.Size2D hint = new eina.Size2D();
23 23
24 efl.canvas.Object canvas = ecore_evas.canvas; 24 efl.canvas.IObject canvas = ecore_evas.canvas;
25 canvas.SetVisible(true); 25 canvas.SetVisible(true);
26 26
27 efl.Object parent = canvas.GetParent(); 27 efl.IObject parent = canvas.GetParent();
28 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero); 28 System.Diagnostics.Debug.Assert(parent.raw_handle != IntPtr.Zero);
29 29
30 efl.canvas.Rectangle bg = new efl.canvas.RectangleConcrete(canvas); 30 efl.canvas.Rectangle bg = new efl.canvas.Rectangle(canvas);
31 bg.SetColor(255, 255, 255, 255); 31 bg.SetColor(255, 255, 255, 255);
32 bg.SetSize(size); 32 bg.SetSize(size);
33 bg.SetVisible(true); 33 bg.SetVisible(true);
34 34
35 35
36 evas.Table table = new evas.TableConcrete(canvas); 36 evas.Table table = new evas.Table(canvas);
37 table.SetHomogeneous(evas.object_table.Homogeneous_Mode.None); 37 table.SetHomogeneous(evas.object_table.Homogeneous_Mode.None);
38 table.SetPadding(0, 0); 38 table.SetPadding(0, 0);
39 table.SetSize(size); 39 table.SetSize(size);
40 table.SetVisible(true); 40 table.SetVisible(true);
41 41
42 efl.canvas.Rectangle rect = new efl.canvas.RectangleConcrete(canvas); 42 efl.canvas.Rectangle rect = new efl.canvas.Rectangle(canvas);
43 rect.SetColor(255, 0, 0, 255); 43 rect.SetColor(255, 0, 0, 255);
44 hint.W = 100; 44 hint.W = 100;
45 hint.H = 50; 45 hint.H = 50;
@@ -47,7 +47,7 @@ class TestMain
47 rect.SetVisible(true); 47 rect.SetVisible(true);
48 table.Pack(rect, 1, 1, 2, 1); 48 table.Pack(rect, 1, 1, 2, 1);
49 49
50 rect = new efl.canvas.RectangleConcrete(canvas); 50 rect = new efl.canvas.Rectangle(canvas);
51 rect.SetColor(0, 255, 0, 255); 51 rect.SetColor(0, 255, 0, 255);
52 hint.W = 50; 52 hint.W = 50;
53 hint.H = 100; 53 hint.H = 100;
@@ -55,7 +55,7 @@ class TestMain
55 rect.SetVisible(true); 55 rect.SetVisible(true);
56 table.Pack(rect, 1, 2, 1, 2); 56 table.Pack(rect, 1, 2, 1, 2);
57 57
58 rect = new efl.canvas.RectangleConcrete(canvas); 58 rect = new efl.canvas.Rectangle(canvas);
59 rect.SetColor(0, 0, 255, 255); 59 rect.SetColor(0, 0, 255, 255);
60 hint.W = 50; 60 hint.W = 50;
61 hint.H = 50; 61 hint.H = 50;
@@ -63,7 +63,7 @@ class TestMain
63 rect.SetVisible(true); 63 rect.SetVisible(true);
64 table.Pack(rect, 2, 2, 1, 1); 64 table.Pack(rect, 2, 2, 1, 1);
65 65
66 rect = new efl.canvas.RectangleConcrete(canvas); 66 rect = new efl.canvas.Rectangle(canvas);
67 rect.SetColor(255, 255, 0, 255); 67 rect.SetColor(255, 255, 0, 255);
68 rect.SetHintMin(hint); 68 rect.SetHintMin(hint);
69 rect.SetVisible(true); 69 rect.SetVisible(true);
diff --git a/unsorted/evas/evas_mono_text.cs b/unsorted/evas/evas_mono_text.cs
index 799ade55..a1532a45 100644
--- a/unsorted/evas/evas_mono_text.cs
+++ b/unsorted/evas/evas_mono_text.cs
@@ -22,8 +22,8 @@ class TestMain
22 static int HEIGHT = 240; 22 static int HEIGHT = 240;
23 23
24 private EcoreEvas ecore_evas; 24 private EcoreEvas ecore_evas;
25 private efl.canvas.Object canvas; 25 private efl.canvas.IObject canvas;
26 private efl.canvas.Rectangle bg; 26 private efl.canvas.IRectangle bg;
27 private evas.Text text; 27 private evas.Text text;
28 private evas.Image border; 28 private evas.Image border;
29 29
@@ -34,7 +34,7 @@ class TestMain
34 canvas = ecore_evas.canvas; 34 canvas = ecore_evas.canvas;
35 canvas.SetVisible(true); 35 canvas.SetVisible(true);
36 36
37 bg = new efl.canvas.RectangleConcrete(canvas); 37 bg = new efl.canvas.Rectangle(canvas);
38 bg.SetColor(255, 255, 255, 255); 38 bg.SetColor(255, 255, 255, 255);
39 position.X = 0; 39 position.X = 0;
40 position.Y = 0; 40 position.Y = 0;
@@ -47,7 +47,7 @@ class TestMain
47 47
48 bg.KeyDownEvt += On_KeyDown; 48 bg.KeyDownEvt += On_KeyDown;
49 49
50 text = new evas.TextConcrete(canvas); 50 text = new evas.Text(canvas);
51 text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow); 51 text.SetStyle(evas.Text_Style_Type.OutlineSoftShadow);
52 52
53 text.SetColor(0, 0, 0, 255); 53 text.SetColor(0, 0, 0, 255);
@@ -71,7 +71,7 @@ class TestMain
71 Console.WriteLine("Adding text object with font {0} and size {1}", font, size); 71 Console.WriteLine("Adding text object with font {0} and size {1}", font, size);
72 72
73 // setup border 73 // setup border
74 border = new evas.ImageConcrete(canvas); 74 border = new evas.Image(canvas);
75 border.SetFile(border_file, null); 75 border.SetFile(border_file, null);
76 border.SetBorder(3, 3, 3, 3); 76 border.SetBorder(3, 3, 3, 3);
77 border.SetBorderCenterFill(0); 77 border.SetBorderCenterFill(0);
@@ -87,7 +87,7 @@ class TestMain
87 87
88 } 88 }
89 89
90 private void On_KeyDown(object sender, efl.input.InterfaceConcrete.KeyDownEvt_Args e) 90 private void On_KeyDown(object sender, efl.input.Interface.KeyDownEvt_Args e)
91 { 91 {
92 var key = e.arg.GetKey(); 92 var key = e.arg.GetKey();
93 93
@@ -114,7 +114,7 @@ class TestMain
114 if (args.Length >= 1) 114 if (args.Length >= 1)
115 border_path = args[0]; 115 border_path = args[0];
116 116
117 efl.Loop loop = new efl.LoopConcrete(); 117 efl.Loop loop = new efl.Loop();
118 TestMain t = new TestMain(border_path); 118 TestMain t = new TestMain(border_path);
119 119
120 loop.Begin(); 120 loop.Begin();