X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fevents%2Fcontrol-event.i;h=9f7d02ff8e7000848729a0c7fc7f215fd366e614;hp=a5418de20ee88378c1e37a69c7ca272f716552d5;hb=cafb34548eb507bf9a0db0d11eb7154fc3481438;hpb=b8c40a552195976cd5860b9f82f13fbed127d2f4

diff --git a/plugins/dali-swig/SWIG/events/control-event.i b/plugins/dali-swig/SWIG/events/control-event.i
index a5418de..9f7d02f 100644
--- a/plugins/dali-swig/SWIG/events/control-event.i
+++ b/plugins/dali-swig/SWIG/events/control-event.i
@@ -121,35 +121,26 @@ public class KeyEventArgs : EventArgs
 }
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void KeyInputFocusGainedEventHandler(object source, KeyInputFocusGainedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void KeyInputFocusLostEventHandler(object source, KeyInputFocusLostEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate bool KeyEventHandler(object source, KeyEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void KeyInputFocusGainedCallbackDelegate(IntPtr view);
-  private KeyInputFocusGainedEventHandler _KeyInputFocusGainedEventHandler;
+  private delegate void KeyInputFocusGainedCallbackDelegate(IntPtr control);
+  private DaliEventHandler<object,KeyInputFocusGainedEventArgs> _KeyInputFocusGainedEventHandler;
   private KeyInputFocusGainedCallbackDelegate _KeyInputFocusGainedCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void KeyInputFocusLostCallbackDelegate(IntPtr view);
-  private KeyInputFocusLostEventHandler _KeyInputFocusLostEventHandler;
+  private delegate void KeyInputFocusLostCallbackDelegate(IntPtr control);
+  private DaliEventHandler<object,KeyInputFocusLostEventArgs> _KeyInputFocusLostEventHandler;
   private KeyInputFocusLostCallbackDelegate _KeyInputFocusLostCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool KeyCallbackDelegate(IntPtr view, IntPtr keyEvent);
-  private KeyEventHandler _KeyEventHandler;
+  private delegate bool KeyCallbackDelegate(IntPtr control, IntPtr keyEvent);
+  private DaliEventHandlerWithReturnType<object,KeyEventArgs,bool> _KeyEventHandler;
   private KeyCallbackDelegate _KeyCallbackDelegate;
 
   /**
     * @brief Event for KeyInputFocusGained signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of KeyInputFocusGainedEventHandler) provided by the user.
-    * KeyInputFocusGained signal is emitted when the view gets Key Input Focus.
+    * (in the type of KeyInputFocusGainedEventHandler-DaliEventHandler<object,KeyInputFocusGainedEventArgs>) 
+    * provided by the user. KeyInputFocusGained signal is emitted when the control gets Key Input Focus.
     */
-  public event KeyInputFocusGainedEventHandler KeyInputFocusGained
+  public event DaliEventHandler<object,KeyInputFocusGainedEventArgs> KeyInputFocusGained
   {
      add
      {
@@ -197,10 +188,10 @@ public class KeyEventArgs : EventArgs
 
   /**
     * @brief Event for KeyInputFocusLost signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of KeyInputFocusLostEventHandler) provided by the user.
-    * KeyInputFocusLost signal is emitted when the view loses Key Input Focus.
+    * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler<object,KeyInputFocusLostEventArgs>) 
+    * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus.
     */
-  public event KeyInputFocusLostEventHandler KeyInputFocusLost
+  public event DaliEventHandler<object,KeyInputFocusLostEventArgs> KeyInputFocusLost
   {
      add
      {
@@ -247,10 +238,10 @@ public class KeyEventArgs : EventArgs
 
   /**
     * @brief Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of KeyEventEventHandler) provided by the user.
-    * KeyPressed signal is emitted when key event is received.
+    * (in the type of KeyEventEventHandler-DaliEventHandlerWithReturnType<object,KeyEventArgs,bool>) 
+    * provided by the user. KeyPressed signal is emitted when key event is received.
     */
-  public event KeyEventHandler KeyPressed
+  public event DaliEventHandlerWithReturnType<object,KeyEventArgs,bool> KeyPressed
   {
      add
      {