From: Richard Huang <r.huang@samsung.com>
Date: Thu, 23 Feb 2017 14:32:39 +0000 (+0000)
Subject: Added binding for Timer Tick event
X-Git-Tag: dali_1.2.29~8^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=dc1ae31598b8711327a6018455843a56b7031db1

Added binding for Timer Tick event

Change-Id: I3ee32d1ffccc576d9b5fd9757542bc1906403acf
---

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
index b59ff97..ad70834 100755
--- a/plugins/dali-swig/SWIG/dali-core.i
+++ b/plugins/dali-swig/SWIG/dali-core.i
@@ -23,8 +23,6 @@
 %apply float& OUTPUT { float& viewportX };
 %apply float& OUTPUT { float& viewportY };
 
-#if defined(SWIGCSHARP)
-
 %include arrays_csharp.i
 %apply unsigned char INPUT[] { unsigned char* pixelBuffer}
 %apply unsigned char INPUT[] { unsigned char* buffer}
@@ -38,8 +36,6 @@
 %apply unsigned short INPUT[] { unsigned short* indices}
 %apply float INPUT[] { float* array }
 
-#endif
-
 %ignore *::Animation(Internal::Animation*);
 %ignore *::Actor(Internal::Actor*);
 %ignore *::BufferImage(Internal::BufferImage*);
@@ -164,7 +160,6 @@
 %rename(Z) Dali::Vector4::z;
 %rename(W) Dali::Vector4::w;
 
-
 typedef std::pair<std::string, Dali::Property::Value> StringValuePair;
 typedef std::vector<Dali::TouchPoint> TouchPointContainer;
 typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
@@ -292,7 +287,6 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %template(VectorUnsignedChar) Dali::Vector<unsigned char>;
 %template(VectorUint16Pair) Dali::Vector<Dali::Uint16Pair>;
 %template(VoidSignal) Dali::Signal<void()>;
-%template(BoolSignal) Dali::Signal<bool()>;
 %template(FloatSignal) Dali::Signal<void(float)>;
 %template(ObjectCreatedSignal) Dali::Signal<void(Dali::BaseHandle)>;
 %template(ObjectDestroyedSignal) Dali::Signal<void(const Dali::RefObject*)>;
diff --git a/plugins/dali-swig/SWIG/events/timer-event.i b/plugins/dali-swig/SWIG/events/timer-event.i
index 1604a08..00dae5b 100644
--- a/plugins/dali-swig/SWIG/events/timer-event.i
+++ b/plugins/dali-swig/SWIG/events/timer-event.i
@@ -44,7 +44,7 @@ using System.Runtime.InteropServices;
     * (in the type of TickEventHandler-DaliEventHandlerWithReturnType<object,TickEventArgs,bool>) 
     * provided by the user. Ticked signal is emitted after specified time interval.
     */
-  public event DaliEventHandlerWithReturnType<object,TickEventArgs,bool> Ticked
+  public event DaliEventHandlerWithReturnType<object,TickEventArgs,bool> Tick
   {
      add
      {
@@ -102,5 +102,5 @@ using System.Runtime.InteropServices;
 
 namespace Dali
 {
-  DALI_TIMER_EVENTHANDLER_PARAM( Dali::Adaptor, Timer);
+  DALI_TIMER_EVENTHANDLER_PARAM( Dali, Timer);
 }
diff --git a/plugins/dali-swig/SWIG/signals.i b/plugins/dali-swig/SWIG/signals.i
index e7aa444..26d869c 100644
--- a/plugins/dali-swig/SWIG/signals.i
+++ b/plugins/dali-swig/SWIG/signals.i
@@ -220,6 +220,13 @@
  Macros for signals with return values
 *****************/
 
+// 0 param signals ( with return )
+%define DALI_SIGNAL_0_PARAM_RETURN( returnType )
+
+  SIGNAL_TYPEMAP_HELPER( returnType (*func) () );
+  SIGNAL_TEMPLATE_HELPER_0( returnType, return);
+%enddef
+
 // 1 param signals ( with return )
 %define DALI_SIGNAL_1_PARAM_RETURN( returnType, argumentType1 )
 
@@ -249,6 +256,9 @@ namespace Dali
 // Signal< void () >
 DALI_SIGNAL_0_PARAM();
 
+// Signal< bool () >
+DALI_SIGNAL_0_PARAM_RETURN( bool );
+
 // Signal< void (Actor) >
 DALI_SIGNAL_1_PARAM( Dali::Actor );