From fac49095ce5b23e86a0f630de85fdda79517f3f6 Mon Sep 17 00:00:00 2001 From: Ravi Nanjundappa Date: Fri, 30 Sep 2016 15:59:07 +0530 Subject: [PATCH] DALi C# binding - EventHandler support for Button Fix the issue of EventHandler code generation for Button class. Change-Id: Idd9c4f177c705261320b96972aa229fa915b17cf Signed-off-by: Ravi Nanjundappa --- plugins/dali-swig/SWIG/events/button-event.i | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/dali-swig/SWIG/events/button-event.i b/plugins/dali-swig/SWIG/events/button-event.i index 041c621..e766482 100644 --- a/plugins/dali-swig/SWIG/events/button-event.i +++ b/plugins/dali-swig/SWIG/events/button-event.i @@ -17,7 +17,7 @@ // Example from Swig MACRO -%define EVENTHANDLER_TYPEMAP_EVENTARG(NameSpace, ClassName) +%define BUTTON_EVENTHANDLER_TYPEMAP_EVENTARG(NameSpace, ClassName) %typemap(csimports) NameSpace::ClassName %{ using System; using System.Runtime.InteropServices; @@ -26,7 +26,7 @@ using System.Runtime.InteropServices; %enddef -%define EVENTHANDLER_TYPEMAP_HELPER(NameSpace, ClassName) +%define BUTTON_EVENTHANDLER_TYPEMAP_HELPER(NameSpace, ClassName) %typemap(cscode) NameSpace::ClassName %{ public class ClickedEventArgs : EventArgs @@ -164,7 +164,7 @@ public class StateChangedEventArgs : EventArgs // Callback for button click signal private bool OnClicked (IntPtr data) { - Button##ClickedEventArgs e = new ClickedEventArgs(); + ClickedEventArgs e = new ClickedEventArgs(); e.Button = Button.GetButtonFromPtr(data); @@ -211,7 +211,7 @@ public class StateChangedEventArgs : EventArgs // Callback for button click signal private bool OnPressed (IntPtr data) { - Button##PressedEventArgs e = new PressedEventArgs(); + PressedEventArgs e = new PressedEventArgs(); e.Button = Button.GetButtonFromPtr(data); @@ -258,7 +258,7 @@ public class StateChangedEventArgs : EventArgs // Callback for button click signal private bool OnReleased (IntPtr data) { - Button##ReleasedEventArgs e = new ReleasedEventArgs(); + ReleasedEventArgs e = new ReleasedEventArgs(); e.Button = Button.GetButtonFromPtr(data); @@ -305,7 +305,7 @@ public class StateChangedEventArgs : EventArgs // Callback for button click signal private bool OnStateChanged (IntPtr data) { - Button##StateChangedEventArgs e = new StateChangedEventArgs(); + StateChangedEventArgs e = new StateChangedEventArgs(); e.Button = Button.GetButtonFromPtr(data); -- 2.7.4