Remove some signal classes in C#

And add signal connect/disconnect functions

And replace them to connect/disconnect functions

Change-Id: I6dd669a89a22794cc40df4a208b0c41381e4eea4
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/dali-csharp-binder/src/actor-wrap.cpp b/dali-csharp-binder/src/actor-wrap.cpp
index 8e527f3..6a1d2e8 100644 (file)
--- a/dali-csharp-binder/src/actor-wrap.cpp
+++ b/dali-csharp-binder/src/actor-wrap.cpp
@@ -3647,787 +3647,52 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_UnparentAndReset(void* jarg1)
 }
 
 // Signals
+#ifndef GENERATE_DEVEL_ACTOR_SIGNAL
+#define GENERATE_DEVEL_ACTOR_SIGNAL(HType, SignalName) GENERATE_DEVEL_SIGNAL(Dali::Actor*, HType, Dali::DevelActor, Dali_Actor, SignalName)
+#endif
+#ifndef GENERATE_ACTOR_SIGNAL
+#define GENERATE_ACTOR_SIGNAL(HType, SignalName) GENERATE_SIGNAL(Dali::Actor*, HType, Dali_Actor, SignalName)
+#endif
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_VisibilityChangedSignal(void* jarg1)
-{
-  void*                                          jresult;
-  Dali::Actor                                    arg1;
-  Dali::Actor*                                   argp1;
-  Dali::DevelActor::VisibilityChangedSignalType* result = 0;
-
-  argp1 = (Dali::Actor*)jarg1;
-  if(!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = (Dali::DevelActor::VisibilityChangedSignalType*)&Dali::DevelActor::VisibilityChangedSignal(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_LayoutDirectionChangedSignal(void* jarg1)
-{
-  void*                                          jresult;
-  Dali::Actor*                                   arg1;
-  Dali::Actor::LayoutDirectionChangedSignalType* result = 0;
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::LayoutDirectionChangedSignalType*)&(arg1)->LayoutDirectionChangedSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_HitTestResultSignal(void* jarg1)
-{
-  void*                              jresult;
-  Dali::Actor                        arg1;
-  Dali::Actor*                       argp1  = (Dali::Actor*)0;
-  Dali::Actor::TouchEventSignalType* result = 0;
-
-  argp1 = (Dali::Actor*)jarg1;
-  if(!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = (Dali::Actor::TouchEventSignalType*)&Dali::DevelActor::HitTestResultSignal(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_InterceptTouchSignal(void* jarg1)
-{
-  void*                              jresult;
-  Dali::Actor                        arg1;
-  Dali::Actor*                       argp1  = (Dali::Actor*)0;
-  Dali::Actor::TouchEventSignalType* result = 0;
-
-  argp1 = (Dali::Actor*)jarg1;
-  if(!argp1)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg1 = *argp1;
-  {
-    try
-    {
-      result = (Dali::Actor::TouchEventSignalType*)&Dali::DevelActor::InterceptTouchedSignal(arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_TouchSignal(void* jarg1)
-{
-  void*                              jresult;
-  Dali::Actor*                       arg1   = (Dali::Actor*)0;
-  Dali::Actor::TouchEventSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::TouchEventSignalType*)&(arg1)->TouchedSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_HoveredSignal(void* jarg1)
-{
-  void*                         jresult;
-  Dali::Actor*                  arg1   = (Dali::Actor*)0;
-  Dali::Actor::HoverSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::HoverSignalType*)&(arg1)->HoveredSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_WheelEventSignal(void* jarg1)
-{
-  void*                              jresult;
-  Dali::Actor*                       arg1   = (Dali::Actor*)0;
-  Dali::Actor::WheelEventSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::WheelEventSignalType*)&(arg1)->WheelEventSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_OnSceneSignal(void* jarg1)
-{
-  void*                           jresult;
-  Dali::Actor*                    arg1   = (Dali::Actor*)0;
-  Dali::Actor::OnSceneSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::OnSceneSignalType*)&(arg1)->OnSceneSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_OffSceneSignal(void* jarg1)
-{
-  void*                            jresult;
-  Dali::Actor*                     arg1   = (Dali::Actor*)0;
-  Dali::Actor::OffSceneSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::OffSceneSignalType*)&(arg1)->OffSceneSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Actor_OnRelayoutSignal(void* jarg1)
-{
-  void*                              jresult;
-  Dali::Actor*                       arg1   = (Dali::Actor*)0;
-  Dali::Actor::OnRelayoutSignalType* result = 0;
-
-  if(!jarg1)
-  {
-    SWIG_EXCEPTION_WITH_FILE_AND_LINE(SWIG_CSharpArgumentNullException, "jarg1 is null!");
-    return 0;
-  }
-
-  arg1 = (Dali::Actor*)jarg1;
-  {
-    try
-    {
-      result = (Dali::Actor::OnRelayoutSignalType*)&(arg1)->OnRelayoutSignal();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-// Signal Connect
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Empty(void* jarg1)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-  bool                                                      result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_GetConnectionCount(void* jarg1)
-{
-  unsigned long                                             jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-  std::size_t                                               result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Connect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::TouchEvent const&)             = (bool (*)(Dali::Actor, Dali::TouchEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::TouchEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Connect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Disconnect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::TouchEvent const&)             = (bool (*)(Dali::Actor, Dali::TouchEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::TouchEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Disconnect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorTouchDataSignal_Emit(void* jarg1, void* jarg2, void* jarg3)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-  Dali::Actor                                               arg2;
-  Dali::TouchEvent*                                         arg3 = 0;
-  Dali::Actor*                                              argp2;
-  bool                                                      result;
-
-  arg1  = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  argp2 = (Dali::Actor*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::TouchEvent*)jarg3;
-  if(!arg3)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_TouchEvent_SS_const_SA__SP__Sg__Emit(arg1, arg2, (Dali::TouchEvent const&)*arg3);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ActorTouchDataSignal()
-{
-  void*                                                     jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)new Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorTouchDataSignal(void* jarg1)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::TouchEvent const&)>*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Empty(void* jarg1)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-  bool                                                      result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_HoverEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorHoverSignal_GetConnectionCount(void* jarg1)
-{
-  unsigned long                                             jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-  std::size_t                                               result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_HoverEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Connect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::HoverEvent const&)             = (bool (*)(Dali::Actor, Dali::HoverEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::HoverEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_HoverEvent_SS_const_SA__SP__Sg__Connect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Disconnect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::HoverEvent const&)             = (bool (*)(Dali::Actor, Dali::HoverEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::HoverEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_HoverEvent_SS_const_SA__SP__Sg__Disconnect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorHoverSignal_Emit(void* jarg1, void* jarg2, void* jarg3)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-  Dali::Actor                                               arg2;
-  Dali::HoverEvent*                                         arg3 = 0;
-  Dali::Actor*                                              argp2;
-  bool                                                      result;
-
-  arg1  = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  argp2 = (Dali::Actor*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::HoverEvent*)jarg3;
-  if(!arg3)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::HoverEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_HoverEvent_SS_const_SA__SP__Sg__Emit(arg1, arg2, (Dali::HoverEvent const&)*arg3);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ActorHoverSignal()
-{
-  void*                                                     jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)new Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorHoverSignal(void* jarg1)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::HoverEvent const&)>*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Empty(void* jarg1)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-  bool                                                      result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_WheelEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorWheelSignal_GetConnectionCount(void* jarg1)
-{
-  unsigned long                                             jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-  std::size_t                                               result;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  {
-    try
-    {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_WheelEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Connect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::WheelEvent const&)             = (bool (*)(Dali::Actor, Dali::WheelEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::WheelEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_WheelEvent_SS_const_SA__SP__Sg__Connect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Disconnect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-  bool (*arg2)(Dali::Actor, Dali::WheelEvent const&)             = (bool (*)(Dali::Actor, Dali::WheelEvent const&))0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  arg2 = (bool (*)(Dali::Actor, Dali::WheelEvent const&))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_WheelEvent_SS_const_SA__SP__Sg__Disconnect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorWheelSignal_Emit(void* jarg1, void* jarg2, void* jarg3)
-{
-  bool                                                      jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-  Dali::Actor                                               arg2;
-  Dali::WheelEvent*                                         arg3 = 0;
-  Dali::Actor*                                              argp2;
-  bool                                                      result;
-
-  arg1  = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  argp2 = (Dali::Actor*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::WheelEvent*)jarg3;
-  if(!arg3)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::WheelEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Actor_Sc_Dali_WheelEvent_SS_const_SA__SP__Sg__Emit(arg1, arg2, (Dali::WheelEvent const&)*arg3);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ActorWheelSignal()
-{
-  void*                                                     jresult;
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* result = 0;
-
-  {
-    try
-    {
-      result = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)new Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void*)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorWheelSignal(void* jarg1)
-{
-  Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>* arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)0;
-
-  arg1 = (Dali::Signal<bool(Dali::Actor, Dali::WheelEvent const&)>*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ActorSignal_Empty(void* jarg1)
-{
-  bool                             jresult;
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
-  bool                             result;
-
-  arg1 = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  {
-    try
-    {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Actor_SP__Sg__Empty((Dali::Signal<void(Dali::Actor)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ActorSignal_GetConnectionCount(void* jarg1)
-{
-  unsigned long                    jresult;
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
-  std::size_t                      result;
-
-  arg1 = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  {
-    try
-    {
-      result = Dali_Signal_Sl_void_Sp_Dali_Actor_SP__Sg__GetConnectionCount((Dali::Signal<void(Dali::Actor)> const*)arg1);
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Connect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
-  void (*arg2)(Dali::Actor)             = (void (*)(Dali::Actor))0;
-
-  arg1 = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  arg2 = (void (*)(Dali::Actor))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_SP__Sg__Connect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
+GENERATE_DEVEL_ACTOR_SIGNAL(bool(*)(Dali::Actor, Dali::TouchEvent const&), HitTestResultSignal)
+// CSharp_Dali_Actor_HitTestResultSignal_Connect
+// CSharp_Dali_Actor_HitTestResultSignal_Disconnect
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Disconnect(void* jarg1, void* jarg2)
-{
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
-  void (*arg2)(Dali::Actor)             = (void (*)(Dali::Actor))0;
+GENERATE_DEVEL_ACTOR_SIGNAL(bool(*)(Dali::Actor, Dali::TouchEvent const&), InterceptTouchedSignal)
+// CSharp_Dali_Actor_InterceptTouchedSignal_Connect
+// CSharp_Dali_Actor_InterceptTouchedSignal_Disconnect
 
-  arg1 = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  arg2 = (void (*)(Dali::Actor))jarg2;
-  {
-    try
-    {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_SP__Sg__Disconnect(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
+GENERATE_ACTOR_SIGNAL(bool(*)(Dali::Actor, Dali::TouchEvent const&), TouchedSignal)
+// CSharp_Dali_Actor_TouchedSignal_Connect
+// CSharp_Dali_Actor_TouchedSignal_Disconnect
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ActorSignal_Emit(void* jarg1, void* jarg2)
-{
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
-  Dali::Actor                      arg2;
-  Dali::Actor*                     argp2;
+GENERATE_ACTOR_SIGNAL(bool(*)(Dali::Actor, Dali::HoverEvent const&), HoveredSignal)
+// CSharp_Dali_Actor_HoveredSignal_Connect
+// CSharp_Dali_Actor_HoveredSignal_Disconnect
 
-  arg1  = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  argp2 = (Dali::Actor*)jarg2;
-  if(!argp2)
-  {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Actor", 0);
-    return;
-  }
-  arg2 = *argp2;
-  {
-    try
-    {
-      Dali_Signal_Sl_void_Sp_Dali_Actor_SP__Sg__Emit(arg1, arg2);
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
+GENERATE_ACTOR_SIGNAL(bool(*)(Dali::Actor, Dali::WheelEvent const&), WheelEventSignal)
+// CSharp_Dali_Actor_WheelEventSignal_Connect
+// CSharp_Dali_Actor_WheelEventSignal_Disconnect
 
-SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_new_ActorSignal()
-{
-  void*                            jresult;
-  Dali::Signal<void(Dali::Actor)>* result = 0;
+GENERATE_ACTOR_SIGNAL(void(*)(Dali::Actor), OnSceneSignal)
+// CSharp_Dali_Actor_OnSceneSignal_Connect
+// CSharp_Dali_Actor_OnSceneSignal_Disconnect
 
-  {
-    try
-    {
-      result = (Dali::Signal<void(Dali::Actor)>*)new Dali::Signal<void(Dali::Actor)>();
-    }
-    CALL_CATCH_EXCEPTION(0);
-  }
+GENERATE_ACTOR_SIGNAL(void(*)(Dali::Actor), OffSceneSignal)
+// CSharp_Dali_Actor_OffSceneSignal_Connect
+// CSharp_Dali_Actor_OffSceneSignal_Disconnect
 
-  jresult = (void*)result;
-  return jresult;
-}
+GENERATE_ACTOR_SIGNAL(void(*)(Dali::Actor), OnRelayoutSignal)
+// CSharp_Dali_Actor_OnRelayoutSignal_Connect
+// CSharp_Dali_Actor_OnRelayoutSignal_Disconnect
 
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ActorSignal(void* jarg1)
-{
-  Dali::Signal<void(Dali::Actor)>* arg1 = (Dali::Signal<void(Dali::Actor)>*)0;
+GENERATE_DEVEL_ACTOR_SIGNAL(void(*)(Dali::Actor, bool, Dali::DevelActor::VisibilityChange::Type), VisibilityChangedSignal)
+// CSharp_Dali_Actor_VisibilityChangedSignal_Connect
+// CSharp_Dali_Actor_VisibilityChangedSignal_Disconnect
 
-  arg1 = (Dali::Signal<void(Dali::Actor)>*)jarg1;
-  {
-    try
-    {
-      delete arg1;
-    }
-    CALL_CATCH_EXCEPTION();
-  }
-}
+GENERATE_ACTOR_SIGNAL(void(*)(Dali::Actor, LayoutDirection::Type), LayoutDirectionChangedSignal)
+// CSharp_Dali_Actor_LayoutDirectionChangedSignal_Connect
+// CSharp_Dali_Actor_LayoutDirectionChangedSignal_Disconnect
 
 #ifdef __cplusplus
 }

diff --git a/dali-csharp-binder/src/common.h b/dali-csharp-binder/src/common.h
index ba6ff0d..fd08961 100755 (executable)
--- a/dali-csharp-binder/src/common.h
+++ b/dali-csharp-binder/src/common.h
@@ -282,4 +282,86 @@ extern void internal_try_catch(const std::function<void(void)>& func, const char
 // This is compiler bug. So we need to cover the function by additional parentheses.
 #define try_catch(func) internal_try_catch((func), __FILE__, __LINE__, __FUNCTION__)
 
+
+// This macro generates 2 functions for signal:
+//  1. CSharp_Someclass_SomeSignal_Connect(void* caller, void* handler)
+//  2. CSharp_Someclass_SomeSignal_Disconnect(void* caller, void* handler)
+//
+// Arguments
+//  - CType: Type of Caller. For example, "Dali::Actor*"
+//  - HType: Type of Handler. For example, "void(*)(Dali::Actor*)"
+//  - Prefix: It can be a class name or namespace. This value determines the function name.
+//  - SignalName: The signal name to be called. For example, "TouchedSignal"
+//
+#ifndef GENERATE_SIGNAL
+#define GENERATE_SIGNAL(CType, HType, Prefix, SignalName)                                                               \
+  SWIGEXPORT void SWIGSTDCALL CSharp_##Prefix##_##SignalName##_Connect(void* caller, void* handler)                     \
+  {                                                                                                                     \
+    if(!caller)                                                                                                         \
+    {                                                                                                                   \
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Caller (Type :" #CType ") is null", 0); \
+      return;                                                                                                           \
+    }                                                                                                                   \
+    try                                                                                                                 \
+    {                                                                                                                   \
+      ((CType)caller)->SignalName().Connect((HType)handler);                                                            \
+    }                                                                                                                   \
+    CALL_CATCH_EXCEPTION();                                                                                             \
+  }                                                                                                                     \
+  SWIGEXPORT void SWIGSTDCALL CSharp_##Prefix##_##SignalName##_Disconnect(void* caller, void* handler)                  \
+  {                                                                                                                     \
+    if(!caller)                                                                                                         \
+    {                                                                                                                   \
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Caller (Type :" #CType ") is null", 0); \
+      return;                                                                                                           \
+    }                                                                                                                   \
+    try                                                                                                                 \
+    {                                                                                                                   \
+      ((CType)caller)->SignalName().Disconnect((HType)handler);                                                         \
+    }                                                                                                                   \
+    CALL_CATCH_EXCEPTION();                                                                                             \
+  }
+#endif
+
+// This macro generates 2 functions for signal declared in Devel class:
+//  1. CSharp_Someclass_SomeSignal_Connect(void* caller, void* handler)
+//  2. CSharp_Someclass_SomeSignal_Disconnect(void* caller, void* handler)
+//
+// Arguments
+//  - CType: Type of Caller. For example, "Dali::Actor*"
+//  - HType: Type of Handler. For example, "void(*)(Dali::Actor*)"
+//  - DevelType: Devel namespace. For example, "Dali::DevelActor"
+//  - Prefix: It can be a class name or namespace. This value determines the function name.
+//  - SignalName: The signal name to be called. For example, "TouchedSignal"
+//
+#ifndef GENERATE_DEVEL_SIGNAL
+#define GENERATE_DEVEL_SIGNAL(CType, HType, DevelType, Prefix, SignalName)                                              \
+  SWIGEXPORT void SWIGSTDCALL CSharp_##Prefix##_##SignalName##_Connect(void* caller, void* handler)                     \
+  {                                                                                                                     \
+    if(!caller)                                                                                                         \
+    {                                                                                                                   \
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Caller (Type :" #CType ") is null", 0); \
+      return;                                                                                                           \
+    }                                                                                                                   \
+    try                                                                                                                 \
+    {                                                                                                                   \
+      DevelType::SignalName(*((CType)caller)).Connect((HType)handler);                                                  \
+    }                                                                                                                   \
+    CALL_CATCH_EXCEPTION();                                                                                             \
+  }                                                                                                                     \
+  SWIGEXPORT void SWIGSTDCALL CSharp_##Prefix##_##SignalName##_Disconnect(void* caller, void* handler)                  \
+  {                                                                                                                     \
+    if(!caller)                                                                                                         \
+    {                                                                                                                   \
+      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Caller (Type :" #CType ") is null", 0); \
+      return;                                                                                                           \
+    }                                                                                                                   \
+    try                                                                                                                 \
+    {                                                                                                                   \
+      DevelType::SignalName(*((CType)caller)).Disconnect((HType)handler);                                               \
+    }                                                                                                                   \
+    CALL_CATCH_EXCEPTION();                                                                                             \
+  }
+#endif
+
 #endif // CSHARP_COMMON_H

diff --git a/dali-csharp-binder/src/dali-wrap.cpp b/dali-csharp-binder/src/dali-wrap.cpp
index e56ac3c..e0754b2 100644 (file)
--- a/dali-csharp-binder/src/dali-wrap.cpp
+++ b/dali-csharp-binder/src/dali-wrap.cpp
@@ -29707,118 +29707,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyEventSignal(void * jarg1) {
 
 }
 
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_TouchSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_TouchEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< void (Dali::TouchEvent const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_TouchSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-  std::size_t result;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  {
-    try {
-      result = Dali_Signal_Sl_void_Sp_Dali_TouchEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::TouchEvent const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-  void (*arg2)(Dali::TouchEvent const &) = (void (*)(Dali::TouchEvent const &)) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::TouchEvent const &))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_TouchEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-  void (*arg2)(Dali::TouchEvent const &) = (void (*)(Dali::TouchEvent const &)) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  arg2 = (void (*)(Dali::TouchEvent const &))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_TouchEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TouchSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-  Dali::TouchEvent *arg2 = 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  arg2 = (Dali::TouchEvent *)jarg2;
-  if (!arg2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::TouchEvent const & type is null", 0);
-    return ;
-  }
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_TouchEvent_SS_const_SA__SP__Sg__Emit(arg1,(Dali::TouchEvent const &)*arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_TouchSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::TouchEvent const &) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::TouchEvent const &) > *)new Dali::Signal< void (Dali::TouchEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_TouchSignal(void * jarg1) {
-  Dali::Signal< void (Dali::TouchEvent const &) > *arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::TouchEvent const &) > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_StageWheelSignal_Empty(void * jarg1) {
   bool jresult ;
   Dali::Signal< void (Dali::WheelEvent const &) > *arg1 = (Dali::Signal< void (Dali::WheelEvent const &) > *) 0 ;
@@ -35400,57 +35288,25 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_View_ClearBackground(void * jarg1) {
 
 }
 
+#ifndef GENERATE_CONTROL_SIGNAL
+#define GENERATE_CONTROL_SIGNAL(HType, SignalName) GENERATE_SIGNAL(Dali::Toolkit::Control*, HType, Dali_View, SignalName)
+#endif
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyEventSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
-  Dali::Toolkit::Control::KeyEventSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyEventSignalType *) &(arg1)->KeyEventSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyInputFocusGainedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
-  Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyInputFocusSignalType *) &(arg1)->KeyInputFocusGainedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_View_KeyInputFocusLostSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *) 0 ;
-  Dali::Toolkit::Control::KeyInputFocusSignalType *result = 0 ;
+GENERATE_CONTROL_SIGNAL(bool(*)(Dali::Toolkit::Control, Dali::KeyEvent const&), KeyEventSignal)
+// CSharp_Dali_View_KeyEventSignal_Connect
+// CSharp_Dali_View_KeyEventSignal_Disconnect
 
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::Control::KeyInputFocusSignalType *) &(arg1)->KeyInputFocusLostSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
+GENERATE_CONTROL_SIGNAL(void(*)(Dali::Toolkit::Control), KeyInputFocusGainedSignal)
+// CSharp_Dali_View_KeyInputFocusGainedSignal_Connect
+// CSharp_Dali_View_KeyInputFocusGainedSignal_Disconnect
 
-  jresult = (void *)result;
-  return jresult;
-}
+GENERATE_CONTROL_SIGNAL(void(*)(Dali::Toolkit::Control), KeyInputFocusLostSignal)
+// CSharp_Dali_View_KeyInputFocusLostSignal_Connect
+// CSharp_Dali_View_KeyInputFocusLostSignal_Disconnect
 
+GENERATE_CONTROL_SIGNAL(void(*)(Dali::Toolkit::Control), ResourceReadySignal)
+// CSharp_Dali_View_ResourceReadySignal_Connect
+// CSharp_Dali_View_ResourceReadySignal_Disconnect
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_View__SWIG_2(void * jarg1) {
   void * jresult ;
@@ -35567,27 +35423,6 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_View_GetVisualProperty(void* control, i
   return result;
 }
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_ResourceReadySignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::Control *arg1 = 0 ;
-  Dali::Toolkit::Control::ResourceReadySignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::Control *)jarg1;
-  if (!arg1) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (Dali::Toolkit::Control::ResourceReadySignalType *) &arg1->ResourceReadySignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_IsResourceReady(void * jarg1) {
   bool jresult ;
   Dali::Toolkit::Control *arg1 = 0 ;
@@ -44765,23 +44600,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_FocusOvershotSign
   return jresult;
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_FocusedActorActivatedSignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::AccessibilityManager *arg1 = (Dali::Toolkit::AccessibilityManager *) 0 ;
-  Dali::Toolkit::AccessibilityManager::FocusedActorActivatedSignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::AccessibilityManager *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::AccessibilityManager::FocusedActorActivatedSignalType *) &(arg1)->FocusedActorActivatedSignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
+GENERATE_SIGNAL(Dali::Toolkit::AccessibilityManager*, void(*)(Dali::Actor), Dali_AccessibilityManager, FocusedActorActivatedSignal)
+// CSharp_Dali_AccessibilityManager_FocusedActorActivatedSignal_Connect
+// CSharp_Dali_AccessibilityManager_FocusedActorActivatedSignal_Disconnect
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_AccessibilityManager_StatusChangedSignal(void * jarg1) {
   void * jresult ;
@@ -52234,244 +52055,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ScrollableSignal(void * jarg1) {
 
 }
 
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ControlKeySignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Control_Sc_Dali_KeyEvent_SS_const_SA__SP__Sg__Empty((Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_ControlKeySignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-  std::size_t result;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  {
-    try {
-      result = Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Control_Sc_Dali_KeyEvent_SS_const_SA__SP__Sg__GetConnectionCount((Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ControlKeySignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::Control,Dali::KeyEvent const &) = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &)) 0 ;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  arg2 = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Control_Sc_Dali_KeyEvent_SS_const_SA__SP__Sg__Connect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_ControlKeySignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-  bool (*arg2)(Dali::Toolkit::Control,Dali::KeyEvent const &) = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &)) 0 ;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  arg2 = (bool (*)(Dali::Toolkit::Control,Dali::KeyEvent const &))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Control_Sc_Dali_KeyEvent_SS_const_SA__SP__Sg__Disconnect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_ControlKeySignal_Emit(void * jarg1, void * jarg2, void * jarg3) {
-  bool jresult ;
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-  Dali::Toolkit::Control arg2 ;
-  Dali::KeyEvent *arg3 = 0 ;
-  Dali::Toolkit::Control *argp2 ;
-  bool result;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  argp2 = (Dali::Toolkit::Control *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Toolkit::Control", 0);
-    return 0;
-  }
-  arg2 = *argp2;
-  arg3 = (Dali::KeyEvent *)jarg3;
-  if (!arg3) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::KeyEvent const & type is null", 0);
-    return 0;
-  }
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_bool_Sp_Dali_Toolkit_Control_Sc_Dali_KeyEvent_SS_const_SA__SP__Sg__Emit(arg1,arg2,(Dali::KeyEvent const &)*arg3);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_ControlKeySignal() {
-  void * jresult ;
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)new Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_ControlKeySignal(void * jarg1) {
-  Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *) 0 ;
-
-  arg1 = (Dali::Signal< bool (Dali::Toolkit::Control,Dali::KeyEvent const &) > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Empty(void * jarg1) {
-  bool jresult ;
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-  bool result;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  {
-    try {
-      result = (bool)Dali_Signal_Sl_void_Sp_Dali_Toolkit_Control_SP__Sg__Empty((Dali::Signal< void (Dali::Toolkit::Control) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = result;
-  return jresult;
-}
-
-
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_GetConnectionCount(void * jarg1) {
-  unsigned long jresult ;
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-  std::size_t result;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  {
-    try {
-      result = Dali_Signal_Sl_void_Sp_Dali_Toolkit_Control_SP__Sg__GetConnectionCount((Dali::Signal< void (Dali::Toolkit::Control) > const *)arg1);
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (unsigned long)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Connect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-  void (*arg2)(Dali::Toolkit::Control) = (void (*)(Dali::Toolkit::Control)) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  arg2 = (void (*)(Dali::Toolkit::Control))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_Control_SP__Sg__Connect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Disconnect(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-  void (*arg2)(Dali::Toolkit::Control) = (void (*)(Dali::Toolkit::Control)) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  arg2 = (void (*)(Dali::Toolkit::Control))jarg2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_Control_SP__Sg__Disconnect(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_KeyInputFocusSignal_Emit(void * jarg1, void * jarg2) {
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-  Dali::Toolkit::Control arg2 ;
-  Dali::Toolkit::Control *argp2 ;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  argp2 = (Dali::Toolkit::Control *)jarg2;
-  if (!argp2) {
-    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Toolkit::Control", 0);
-    return ;
-  }
-  arg2 = *argp2;
-  {
-    try {
-      Dali_Signal_Sl_void_Sp_Dali_Toolkit_Control_SP__Sg__Emit(arg1,arg2);
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_KeyInputFocusSignal() {
-  void * jresult ;
-  Dali::Signal< void (Dali::Toolkit::Control) > *result = 0 ;
-
-  {
-    try {
-      result = (Dali::Signal< void (Dali::Toolkit::Control) > *)new Dali::Signal< void (Dali::Toolkit::Control) >();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
-SWIGEXPORT void SWIGSTDCALL CSharp_Dali_delete_KeyInputFocusSignal(void * jarg1) {
-  Dali::Signal< void (Dali::Toolkit::Control) > *arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *) 0 ;
-
-  arg1 = (Dali::Signal< void (Dali::Toolkit::Control) > *)jarg1;
-  {
-    try {
-      delete arg1;
-    } CALL_CATCH_EXCEPTION();
-  }
-
-}
-
-
 SWIGEXPORT bool SWIGSTDCALL CSharp_Dali_VideoViewSignal_Empty(void * jarg1) {
   bool jresult ;
   Dali::Signal< void (Dali::Toolkit::VideoView &) > *arg1 = (Dali::Signal< void (Dali::Toolkit::VideoView &) > *) 0 ;

diff --git a/dali-csharp-binder/src/gl-window-wrap.cpp b/dali-csharp-binder/src/gl-window-wrap.cpp
index 064b19e..adeb5b1 100644 (file)
--- a/dali-csharp-binder/src/gl-window-wrap.cpp
+++ b/dali-csharp-binder/src/gl-window-wrap.cpp
@@ -993,24 +993,9 @@ extern "C"
   }
 
   /* Touch Event Binding */
-  SWIGEXPORT void *SWIGSTDCALL CSharp_Dali_GlWindow_TouchSignal(void *jarg1)
-  {
-    void *jresult;
-    Dali::GlWindow *arg1 = (Dali::GlWindow *)0;
-    Dali::GlWindow::TouchEventSignalType *result = 0;
-
-    arg1 = (Dali::GlWindow *)jarg1;
-    {
-      try
-      {
-        result = (Dali::GlWindow::TouchEventSignalType *)&(arg1->TouchedSignal());
-      }
-      CALL_CATCH_EXCEPTION(0);
-    }
-
-    jresult = (void *)result;
-    return jresult;
-  }
+  GENERATE_SIGNAL(Dali::GlWindow*, void(*)(Dali::TouchEvent const&), Dali_GlWindow, TouchedSignal)
+  // CSharp_Dali_GLWindow_TouchedSignal_Connect
+  // CSharp_Dali_GLWindow_TouchedSignal_Disconnect
 
   /*Key Event Binding */
 

diff --git a/dali-csharp-binder/src/keyboard-focus-manager-wrap.cpp b/dali-csharp-binder/src/keyboard-focus-manager-wrap.cpp
index 71e5895..3649e95 100755 (executable)
--- a/dali-csharp-binder/src/keyboard-focus-manager-wrap.cpp
+++ b/dali-csharp-binder/src/keyboard-focus-manager-wrap.cpp
@@ -361,24 +361,9 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_KeyboardFocusManager_FocusGroupChangedSigna
   return jresult;
 }
 
-
-SWIGEXPORT void * SWIGSTDCALL CSharp_KeyboardFocusManager_FocusedActorEnterKeySignal(void * jarg1) {
-  void * jresult ;
-  Dali::Toolkit::KeyboardFocusManager *arg1 = (Dali::Toolkit::KeyboardFocusManager *) 0 ;
-  Dali::Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType *result = 0 ;
-
-  arg1 = (Dali::Toolkit::KeyboardFocusManager *)jarg1;
-  {
-    try {
-      result = (Dali::Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType *) &(arg1)->FocusedActorEnterKeySignal();
-    } CALL_CATCH_EXCEPTION(0);
-  }
-
-  jresult = (void *)result;
-  return jresult;
-}
-
-
+GENERATE_SIGNAL(Dali::Toolkit::KeyboardFocusManager*, void(*)(Dali::Actor), KeyboardFocusManager, FocusedActorEnterKeySignal)
+// CSharp_KeyboardFocusManager_FocusedActorEnterKeySignal_Connect
+// CSharp_KeyboardFocusManager_FocusedActorEnterKeySignal_Disconnect
 
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_KeyboardPreFocusChangeSignal_Empty(void * jarg1) {
   unsigned int jresult ;