From bd2d757678d8d92dd3f25101b9ad5fc34010ab09 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Thu, 13 Apr 2017 13:38:15 +0100 Subject: [PATCH] Adding Key GetDeviceName API Change-Id: I12a640da0432ab98e7cb7dd43018a0713984de15 --- plugins/dali-swig/SWIG/dali-core.i | 1 + plugins/dali-swig/SWIG/dali.i | 1 + plugins/dali-swig/SWIG/gestures/key.i | 13 +++++++++++++ 3 files changed, 15 insertions(+) diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i index 98a45f5..3c4d144 100755 --- 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 %include %include +%include %include %include diff --git a/plugins/dali-swig/SWIG/dali.i b/plugins/dali-swig/SWIG/dali.i index 4e3fdb5..4c1e882 100755 --- a/plugins/dali-swig/SWIG/dali.i +++ b/plugins/dali-swig/SWIG/dali.i @@ -50,6 +50,7 @@ #include #include +#include #include #include diff --git a/plugins/dali-swig/SWIG/gestures/key.i b/plugins/dali-swig/SWIG/gestures/key.i index 9ba9232..8fdd05f 100644 --- 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 -- 2.7.4