Adding Key GetDeviceName API

Change-Id: I12a640da0432ab98e7cb7dd43018a0713984de15

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
index 98a45f5..3c4d144 100755 (executable)
--- a/plugins/dali-swig/SWIG/dali-core.i
+++ b/plugins/dali-swig/SWIG/dali-core.i
@@ -244,6 +244,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/events/long-press-gesture-detector.h>
 %include <dali/public-api/events/long-press-gesture.h>
 %include <dali/public-api/events/wheel-event.h>
+%include <dali/devel-api/events/key-event-devel.h>
 
 %include <dali/public-api/actors/actor.h>
 %include <dali/devel-api/actors/actor-devel.h>

diff --git a/plugins/dali-swig/SWIG/dali.i b/plugins/dali-swig/SWIG/dali.i
index 4e3fdb5..4c1e882 100755 (executable)
--- a/plugins/dali-swig/SWIG/dali.i
+++ b/plugins/dali-swig/SWIG/dali.i
@@ -50,6 +50,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 
 #include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/events/key-event-devel.h>
 
 #include <dali/public-api/math/matrix.h>
 #include <dali/public-api/math/matrix3.h>

diff --git a/plugins/dali-swig/SWIG/gestures/key.i b/plugins/dali-swig/SWIG/gestures/key.i
index 9ba9232..8fdd05f 100644 (file)
--- a/plugins/dali-swig/SWIG/gestures/key.i
+++ b/plugins/dali-swig/SWIG/gestures/key.i
@@ -8,6 +8,9 @@
 %csmethodmodifiers Dali::KeyEvent::time "private";
 %csmethodmodifiers Dali::KeyEvent::state "private";
 
+%csmethodmodifiers Dali::DevelKeyEvent::GetDeviceName "private";
+%csmethodmodifiers Dali::DevelKeyEvent::SetDeviceName "private";
+
 %typemap(cscode) Dali::KeyEvent %{
   public static Key GetKeyFromPtr(global::System.IntPtr cPtr) {
     Key ret = new Key(cPtr, false);
@@ -15,6 +18,16 @@
     return ret;
   }
 
+  public string DeviceName
+  {
+    get
+    {
+      string ret = NDalicPINVOKE.GetDeviceName(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+      return ret;
+    }
+  }
+
   public string KeyPressedName
   {
     get