aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-12 18:09:51 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-03-18 18:32:49 -0300
commit3139aadb549fdfaf1831abfb74e05960f242fa75 (patch)
treeb9a528e0455554a6fd723e23c28298f51b80c198
parentcsharp: Uncomment future chaining. (diff)
downloadefl-devs/lauromoura/mono_model.tar.gz
csharp: Model fixes after rebase.devs/lauromoura/mono_model
Enable compilation with beta. Two model tests still failing.
-rw-r--r--src/bindings/mono/efl_mono/Factory.cs2
-rw-r--r--src/bindings/mono/efl_mono/UserModel.cs4
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bindings/mono/efl_mono/Factory.cs b/src/bindings/mono/efl_mono/Factory.cs
index 3802aac032..ca8fedcb1b 100644
--- a/src/bindings/mono/efl_mono/Factory.cs
+++ b/src/bindings/mono/efl_mono/Factory.cs
@@ -11,7 +11,7 @@ namespace Efl { namespace Ui {
public class ItemFactory<T> : Efl.Ui.CachingFactory, IDisposable
{
public ItemFactory(Efl.Object parent = null)
- : base (parent, Efl.Eo.Globals.get_efl_klass_from_klass<T>())
+ : base (parent, typeof(T))
{
}
diff --git a/src/bindings/mono/efl_mono/UserModel.cs b/src/bindings/mono/efl_mono/UserModel.cs
index 6aa5fb8cb8..1f812e1646 100644
--- a/src/bindings/mono/efl_mono/UserModel.cs
+++ b/src/bindings/mono/efl_mono/UserModel.cs
@@ -75,10 +75,10 @@ public class UserModel<T> : Efl.MonoModelInternal, IDisposable
if (((object)this).GetType() == typeof (UserModel<T>))
return Efl.MonoModelInternalNativeInherit.GetEflClassStatic();
else
- return Efl.Eo.Globals.klasses[((object)this).GetType()];
+ return Efl.Eo.ClassRegister.GetKlass(((object)this).GetType());
}
}
- public UserModel (Efl.Object parent = null) : base("MonoModelInternal", Efl.MonoModelInternal.efl_mono_model_internal_class_get(), typeof(MonoModelInternal), parent, true)
+ public UserModel (Efl.Object parent = null) : base(Efl.MonoModelInternal.efl_mono_model_internal_class_get(), typeof(MonoModelInternal), parent, true)
{
inherited = false;
var properties = typeof(T).GetProperties();
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index 2cbc06d206..ac7fbc90ac 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -235,10 +235,10 @@ public class Globals {
}
#if EFL_BETA
- public static Efl.Class get_efl_klass_from_klass<T>()
+ public static IntPtr get_efl_klass_from_klass<T>()
{
var native = get_native_class (typeof(T));
- return new Efl.Class (native.GetEflClass());
+ return native.GetEflClass();
}
#endif // EFL_BETA