X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-swig%2FSWIG%2Fsignals.i;h=0842c9b26dd5141a6fa4006bb55c2fbd771f25a5;hb=e40a68da97d5a5564be9a194c4e02949ad5313cb;hp=65a6ce91340970cd73614bdc8575d4f822ae4fe9;hpb=e2ab03b7246a8621d025f02a0a2f9325748f993c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/plugins/dali-swig/SWIG/signals.i b/plugins/dali-swig/SWIG/signals.i
index 65a6ce9..0842c9b 100644
--- a/plugins/dali-swig/SWIG/signals.i
+++ b/plugins/dali-swig/SWIG/signals.i
@@ -55,6 +55,36 @@
  * so we have make them ourselves
  */
 
+%define SIGNAL_TEMPLATE_HELPER_0( returnType,  returnFunc)
+  template<> class Signal< returnType () >
+  {
+  public:
+    %extend
+    {
+      bool Empty() const
+      {
+         return $self->Empty();
+      }
+      std::size_t GetConnectionCount() const
+      {
+        return $self->GetConnectionCount();
+      }
+      void Connect( returnType ( *func ) () )
+      {
+          $self->Connect( func );
+      }
+      void Disconnect( returnType ( *func ) () )
+      {
+          $self->Disconnect( func );
+      }
+      returnType Emit()
+      {
+          returnFunc $self->Emit();
+      }
+    }
+  };
+%enddef
+
 %define SIGNAL_TEMPLATE_HELPER_1( returnType,  returnFunc, argumentType )
   template<> class Signal< returnType ( argumentType ) >
   {
@@ -156,6 +186,13 @@
 %enddef
 
 // Macro to define a csharp signal.
+// 0 param signals ( no return )
+%define DALI_SIGNAL_0_PARAM()
+
+  SIGNAL_TYPEMAP_HELPER( void (*func) () );
+  SIGNAL_TEMPLATE_HELPER_0( void, NO_RETURN_FUNC);
+%enddef
+
 // 1 param signals ( no return )
 %define DALI_SIGNAL_1_PARAM( argumentType1 )
 
@@ -183,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 )
 
@@ -209,6 +253,12 @@
 
 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 );
 
@@ -279,10 +329,10 @@ DALI_SIGNAL_1_PARAM( const Dali::RefObject* );
 DALI_SIGNAL_1_PARAM( const Dali::RenderTask& );
 
 // Signal< bool ( const Dali::Toolkit::AccessibilityManager& ) >
-DALI_SIGNAL_1_PARAM_RETURN( bool ,const Dali::Toolkit::AccessibilityManager& );
+DALI_SIGNAL_1_PARAM_RETURN( bool, Dali::Toolkit::AccessibilityManager& );
 
 // Signal< bool ( const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& ) >
-DALI_SIGNAL_2_PARAM_RETURN( bool ,const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& );
+DALI_SIGNAL_2_PARAM_RETURN( bool, const Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& );
 
 // Signal< void ( const Dali::Actor Dali::Toolkit::AccessibilityManager::FocusOvershotDirection ) >
 DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection );
@@ -290,21 +340,15 @@ DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOver
 // Signal< bool ( Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent& ) >
 DALI_SIGNAL_2_PARAM_RETURN( bool ,Dali::Toolkit::AccessibilityManager&, const Dali::TouchEvent&);
 
-// Signal< void ( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection) >
-//DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection );
-
 // Signal< void (  Dali::Toolkit::StyleManager, Dali::StyleChange::Type) >
 DALI_SIGNAL_2_PARAM( Dali::Toolkit::StyleManager, Dali::StyleChange::Type);
 
-// Signal< void (  Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection )>
-//DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Toolkit::AccessibilityManager::FocusOvershotDirection );
-
-// Signal<  Dali::Actor (  Dali::Actor, Dali::Actor, Dali::Actor, Dali::Toolkit::Control::KeyboardFocus::Direction) >
-DALI_SIGNAL_3_PARAM_RETURN( Dali::Actor, Dali::Actor, Dali::Actor, Dali::Toolkit::Control::KeyboardFocus::Direction);
-
 // void Signal<  Dali::Actor, bool >;
 DALI_SIGNAL_2_PARAM( Dali::Actor, bool);
 
+// void Signal<  Dali::Actor, Dali::Actor >;
+DALI_SIGNAL_2_PARAM( Dali::Actor, Dali::Actor);
+
 // bool Signal< Dali::Toolkit::Button >;
 DALI_SIGNAL_1_PARAM_RETURN( bool, Dali::Toolkit::Button);
 
@@ -317,6 +361,9 @@ DALI_SIGNAL_3_PARAM( Dali::Toolkit::PageTurnView, unsigned int, bool );
 // void Signal< Dali::Toolkit::PageTurnView >;
 DALI_SIGNAL_1_PARAM( Dali::Toolkit::PageTurnView );
 
+// void Signal< Dali::Toolkit::ProgressBar, float, float >;
+DALI_SIGNAL_3_PARAM( Dali::Toolkit::ProgressBar, float, float );
+
 // void Signal< const Dali::Toolkit::ScrollView::SnapEvent& >;
 DALI_SIGNAL_1_PARAM( const Dali::Toolkit::ScrollView::SnapEvent& );
 
@@ -327,7 +374,7 @@ DALI_SIGNAL_1_PARAM( const Dali::Vector2& );
 DALI_SIGNAL_1_PARAM( Dali::Toolkit::TextEditor );
 
 // void Signal< Dali::Toolkit::TextField >;
-DALI_SIGNAL_1_PARAM( Dali::Toolkit::TextField )
+DALI_SIGNAL_1_PARAM( Dali::Toolkit::TextField );
 
 // bool Signal< Dali::Toolkit::Control, const Dali::KeyEvent& >;
 DALI_SIGNAL_2_PARAM_RETURN( bool, Dali::Toolkit::Control, const Dali::KeyEvent& );