summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/eolian_mono/eolian/mono/blacklist.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/klass.hh2
-rw-r--r--src/bin/eolian_mono/eolian/mono/struct_definition.hh2
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs5
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs8
5 files changed, 7 insertions, 12 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/blacklist.hh b/src/bin/eolian_mono/eolian/mono/blacklist.hh
index 1db4c6108a..a436bcc203 100644
--- a/src/bin/eolian_mono/eolian/mono/blacklist.hh
+++ b/src/bin/eolian_mono/eolian/mono/blacklist.hh
@@ -56,7 +56,7 @@ inline bool is_function_blacklisted(std::string const& c_name)
56// Blacklist structs that require some kind of manual binding. 56// Blacklist structs that require some kind of manual binding.
57inline bool is_struct_blacklisted(std::string const& full_name) 57inline bool is_struct_blacklisted(std::string const& full_name)
58{ 58{
59 return full_name == "Efl.Event.Description" 59 return full_name == "Efl.Event_Description"
60 || full_name == "Eina.Binbuf" 60 || full_name == "Eina.Binbuf"
61 || full_name == "Eina.Strbuf" 61 || full_name == "Eina.Strbuf"
62 || full_name == "Eina.Slice" 62 || full_name == "Eina.Slice"
diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh
index e85654756d..c25b1d8e34 100644
--- a/src/bin/eolian_mono/eolian/mono/klass.hh
+++ b/src/bin/eolian_mono/eolian/mono/klass.hh
@@ -500,7 +500,7 @@ struct klass
500 << scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key, out event_count))\n" 500 << scope_tab << scope_tab << "if (!event_cb_count.TryGetValue(key, out event_count))\n"
501 << scope_tab << scope_tab << scope_tab << "event_cb_count[key] = event_count;\n" 501 << scope_tab << scope_tab << scope_tab << "event_cb_count[key] = event_count;\n"
502 << scope_tab << scope_tab << "if (event_count == 1) {\n" 502 << scope_tab << scope_tab << "if (event_count == 1) {\n"
503 << scope_tab << scope_tab << scope_tab << "efl.kw_event.Description desc = new efl.kw_event.Description(key);\n" 503 << scope_tab << scope_tab << scope_tab << "efl.Event_Description desc = new efl.Event_Description(key);\n"
504 << scope_tab << scope_tab << scope_tab << "bool result = efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);\n" 504 << scope_tab << scope_tab << scope_tab << "bool result = efl.eo.Globals.efl_event_callback_del(handle, desc, evt_delegate, System.IntPtr.Zero);\n"
505 << scope_tab << scope_tab << scope_tab << "if (!result) {\n" 505 << scope_tab << scope_tab << scope_tab << "if (!result) {\n"
506 << scope_tab << scope_tab << scope_tab << scope_tab << "eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n" 506 << scope_tab << scope_tab << scope_tab << scope_tab << "eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n"
diff --git a/src/bin/eolian_mono/eolian/mono/struct_definition.hh b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
index 618b433213..42d2f0d711 100644
--- a/src/bin/eolian_mono/eolian/mono/struct_definition.hh
+++ b/src/bin/eolian_mono/eolian/mono/struct_definition.hh
@@ -368,7 +368,7 @@ struct struct_binding_conversion_functions_generator
368 // Open conversion class 368 // Open conversion class
369 if (!as_generator 369 if (!as_generator
370 ( 370 (
371 "internal static class " << string << "_StructConversion\n{\n" 371 "public static class " << string << "_StructConversion\n{\n"
372 ) 372 )
373 .generate(sink, struct_.cxx_name, context)) 373 .generate(sink, struct_.cxx_name, context))
374 return false; 374 return false;
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index bb7a45b291..d25ffec625 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -53,16 +53,13 @@ public class Globals {
53 53
54 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_priority_add( 54 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_priority_add(
55 System.IntPtr obj, 55 System.IntPtr obj,
56 // FIXME commented to allow passing null stuff during test
57 //ref efl.kw_event.Description desc,
58 //efl.kw_event.Description desc,
59 IntPtr desc, 56 IntPtr desc,
60 short priority, 57 short priority,
61 efl.Event_Cb cb, 58 efl.Event_Cb cb,
62 System.IntPtr data); 59 System.IntPtr data);
63 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del( 60 [DllImport(efl.Libs.Eo)] public static extern bool efl_event_callback_del(
64 System.IntPtr obj, 61 System.IntPtr obj,
65 efl.kw_event.Description desc, 62 efl.Event_Description desc,
66 efl.Event_Cb cb, 63 efl.Event_Cb cb,
67 System.IntPtr data); 64 System.IntPtr data);
68 [DllImport(efl.Libs.Eo)] public static extern IntPtr 65 [DllImport(efl.Libs.Eo)] public static extern IntPtr
diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs
index 925e437908..207f5cab52 100644
--- a/src/bindings/mono/eo_mono/workaround.cs
+++ b/src/bindings/mono/eo_mono/workaround.cs
@@ -70,10 +70,10 @@ public struct Evas_Object_Box_Option {
70}; 70};
71#pragma warning restore 0169 71#pragma warning restore 0169
72 72
73namespace efl { namespace kw_event { 73namespace efl {
74 74
75[StructLayout(LayoutKind.Sequential)] 75[StructLayout(LayoutKind.Sequential)]
76public struct Description { 76public struct Event_Description {
77 public IntPtr Name; 77 public IntPtr Name;
78 [MarshalAs(UnmanagedType.U1)] public bool Unfreezable; 78 [MarshalAs(UnmanagedType.U1)] public bool Unfreezable;
79 [MarshalAs(UnmanagedType.U1)] public bool Legacy_is; 79 [MarshalAs(UnmanagedType.U1)] public bool Legacy_is;
@@ -81,7 +81,7 @@ public struct Description {
81 81
82 private static Dictionary<string, IntPtr> descriptions = new Dictionary<string, IntPtr>(); 82 private static Dictionary<string, IntPtr> descriptions = new Dictionary<string, IntPtr>();
83 83
84 public Description(string name) 84 public Event_Description(string name)
85 { 85 {
86 if (!descriptions.ContainsKey(name)) 86 if (!descriptions.ContainsKey(name))
87 { 87 {
@@ -101,8 +101,6 @@ public struct Description {
101 } 101 }
102}; 102};
103 103
104} // namespace kw_event
105
106 104
107public delegate void Event_Cb(System.IntPtr data, ref Event evt); 105public delegate void Event_Cb(System.IntPtr data, ref Event evt);
108#pragma warning disable 0169 106#pragma warning disable 0169