aboutsummaryrefslogtreecommitdiffstats
path: root/src/examples
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-11 15:46:12 -0300
committerVitor Sousa <vitorsousa@expertisesolutions.com.br>2019-03-11 16:08:04 -0300
commitf29ceef5002f7ab2a0f400adbed20299737bce20 (patch)
tree2324619326073a6a55f286723802553743feb3f9 /src/examples
parenteolian-cxx: Add beta information to *_def (diff)
downloadefl-f29ceef5002f7ab2a0f400adbed20299737bce20.tar.gz
efl-csharp: Respect beta for classes and other stuff.
Summary: In order to work around an issue with Efl.App, which is stable but inherits from Efl.Core.Command_Line, @beta interfaces/mixins in the inheritance chain are simply skipped. Also changed the class used int test for inheritance from C# Efl.Loop is stable but internally it uses a @beta class as argument to its Register() method in the constructor. When instantiating a user-defined C# subclass, the binding calls the C# override in the NativeInherit class and the marshalling fails as no code is generated for the beta class. Also moved Efl.Part test to a beta class. Efl.Part is still beta. Regarding parts, they are skipped if its class is @beta too. Also rejected all elm_* files in elm public eo files. They should get back in as they are converted to Efl.Ui.* api. An exception is elm_interface_scrollable.eo, as efl_ui_panel depends on it. Fixes https://phab.enlightenment.org/T7730 Test Plan: Run tests Reviewers: vitor.sousa, segfaultxavi, felipealmeida, cedric, bu5hm4n, zmike Reviewed By: vitor.sousa Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7730 Differential Revision: https://phab.enlightenment.org/D8268
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/ecore/efl_mono_loop_timer_example.cs6
-rw-r--r--src/examples/elementary/efl_ui_slider_mono.cs6
-rw-r--r--src/examples/elementary/efl_ui_unit_converter.cs7
3 files changed, 18 insertions, 1 deletions
diff --git a/src/examples/ecore/efl_mono_loop_timer_example.cs b/src/examples/ecore/efl_mono_loop_timer_example.cs
index 5b5af06200..a6ad05b491 100644
--- a/src/examples/ecore/efl_mono_loop_timer_example.cs
+++ b/src/examples/ecore/efl_mono_loop_timer_example.cs
@@ -4,6 +4,7 @@ using System.Runtime.CompilerServices;
class TestMain
{
+#if EFL_BETA
private Efl.Loop loop;
private int count;
@@ -48,6 +49,11 @@ class TestMain
{
Console.WriteLine("Ooops. Should not have been called...");
}
+#else
+ public static void Main()
+ {
+ }
+#endif
}
diff --git a/src/examples/elementary/efl_ui_slider_mono.cs b/src/examples/elementary/efl_ui_slider_mono.cs
index 3ef10cbb0e..c2a3232f14 100644
--- a/src/examples/elementary/efl_ui_slider_mono.cs
+++ b/src/examples/elementary/efl_ui_slider_mono.cs
@@ -2,6 +2,7 @@ using System;
public class Example
{
+#if EFL_BETA
public static Efl.Ui.Button CreateButton(Efl.Object parent,
string text,
int w, int h,
@@ -73,5 +74,10 @@ public class Example
Efl.All.Shutdown();
}
+#else
+ public static void Main()
+ {
+ }
+#endif
}
diff --git a/src/examples/elementary/efl_ui_unit_converter.cs b/src/examples/elementary/efl_ui_unit_converter.cs
index 5bbbe1723a..3460af3f5f 100644
--- a/src/examples/elementary/efl_ui_unit_converter.cs
+++ b/src/examples/elementary/efl_ui_unit_converter.cs
@@ -2,7 +2,7 @@ using System;
public class Example
{
-
+#if EFL_BETA
private static double KMS_PER_MILE = 1.609344;
private static double KmsToMiles(double kms)
@@ -146,5 +146,10 @@ public class Example
Efl.All.Shutdown();
}
+#else
+ public static void Main()
+ {
+ }
+#endif
}