Manual merge for dali-csharp-binder v0.2.36

Change-Id: I72a613433d11b03ede01c76876601be7e47c17da
Signed-off-by: Youxia Wu <youxia.wu@partner.samsung.com>

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index aff1129..ea8ae64 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -32559,6 +32559,38 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_LowerBelow(void * jarg1, void * jarg2) {
   }
 }
 
+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);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0; 
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0; 
+      };
+    }
+  }
+  jresult = (void *)result; 
+  return jresult;
+}
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Layer_Property_CLIPPING_ENABLE_get() {
   int jresult ;

diff --git a/dali-csharp-binder/src/event-thread-callback-wrap.cpp b/dali-csharp-binder/src/event-thread-callback-wrap.cpp
index 736c697..ced564b 100755 (executable)
--- a/dali-csharp-binder/src/event-thread-callback-wrap.cpp
+++ b/dali-csharp-binder/src/event-thread-callback-wrap.cpp
@@ -39,14 +39,17 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_new_EventThreadCallback(SWIG_CallbackM
       result = (Dali::EventThreadCallback *)new Dali::EventThreadCallback((Dali::CallbackBase *)Dali::MakeCallback(arg1));
     } catch (std::out_of_range& e) {
       {
+        delete result;
         SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
       };
     } catch (std::exception& e) {
       {
+        delete result;
         SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
       };
     } catch (...) {
       {
+        delete result;
         SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
       };
     }