fixup! DALi C# binding - Generic Delegates support for EventHandlers

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / SWIG / events / button-event.i

diff --git a/plugins/dali-swig/SWIG/events/button-event.i b/plugins/dali-swig/SWIG/events/button-event.i
index 041c621..bfef5ad 100644 (file)
--- 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
@@ -97,40 +97,29 @@ public class StateChangedEventArgs : EventArgs
    }
 }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate bool ClickedEventHandler(object source, ClickedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate bool PressedEventHandler(object source, PressedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate bool ReleasedEventHandler(object source, ReleasedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate bool StateChangedEventHandler(object source, StateChangedEventArgs e);
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate bool ClickedCallbackDelegate(global::System.IntPtr data);
-  private ClickedEventHandler   _buttonClickedEventHandler;
+  private DaliEventHandlerWithReturnType<object,ClickedEventArgs,bool> _buttonClickedEventHandler;
   private ClickedCallbackDelegate _buttonClickedCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate bool PressedCallbackDelegate(global::System.IntPtr data);
-  private PressedEventHandler   _buttonPressedEventHandler;
+  private DaliEventHandlerWithReturnType<object,PressedEventArgs,bool> _buttonPressedEventHandler;
   private PressedCallbackDelegate _buttonPressedCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate bool ReleasedCallbackDelegate(global::System.IntPtr data);
-  private ReleasedEventHandler   _buttonReleasedEventHandler;
+  private DaliEventHandlerWithReturnType<object,ReleasedEventArgs,bool>  _buttonReleasedEventHandler;
   private ReleasedCallbackDelegate _buttonReleasedCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   private delegate bool StateChangedCallbackDelegate(global::System.IntPtr data);
-  private StateChangedEventHandler   _buttonStateChangedEventHandler;
+  private DaliEventHandlerWithReturnType<object,StateChangedEventArgs,bool> _buttonStateChangedEventHandler;
   private StateChangedCallbackDelegate _buttonStateChangedCallbackDelegate;
 
 
-  public event ClickedEventHandler Clicked
+  public event DaliEventHandlerWithReturnType<object,ClickedEventArgs,bool> Clicked
   {
      add
      {
@@ -164,7 +153,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);
 
@@ -177,7 +166,7 @@ public class StateChangedEventArgs : EventArgs
   }
 
 
-  public event PressedEventHandler Pressed
+  public event DaliEventHandlerWithReturnType<object,PressedEventArgs,bool> Pressed
   {
      add
      {
@@ -211,7 +200,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);
 
@@ -224,7 +213,7 @@ public class StateChangedEventArgs : EventArgs
   }
 
 
-  public event ReleasedEventHandler Released
+  public event DaliEventHandlerWithReturnType<object,ReleasedEventArgs,bool> Released
   {
      add
      {
@@ -258,7 +247,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);
 
@@ -271,7 +260,7 @@ public class StateChangedEventArgs : EventArgs
   }
 
 
-  public event StateChangedEventHandler StateChanged
+  public event DaliEventHandlerWithReturnType<object,StateChangedEventArgs,bool> StateChanged
   {
      add
      {
@@ -305,7 +294,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);