Merge changes Ia8845a8e,I6d6a4bb8

* changes:
  [NUI] Fix TriggerEvent crash issue
  [NUI] Fix FeedKeyEvent issue

diff --git a/src/Tizen.NUI/src/internal/EventThreadCallback.cs b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
index b43eba0..55b9175 100755 (executable)
--- a/src/Tizen.NUI/src/internal/EventThreadCallback.cs
+++ b/src/Tizen.NUI/src/internal/EventThreadCallback.cs
@@ -44,11 +44,11 @@ namespace Tizen.NUI
 
         ~EventThreadCallback()
         {
-            if (!isDisposeQueued)
-            {
-                isDisposeQueued = true;
-                DisposeQueue.Instance.Add(this);
-            }
+            //if (!isDisposeQueued)
+            //{
+                //isDisposeQueued = true;
+                //DisposeQueue.Instance.Add(this);
+            //}
         }
 
         public void Dispose()
@@ -94,7 +94,7 @@ namespace Tizen.NUI
                 if (swigCMemOwn)
                 {
                     swigCMemOwn = false;
-                    NDalicManualPINVOKE.delete_EventThreadCallback(swigCPtr);
+                    //NDalicManualPINVOKE.delete_EventThreadCallback(swigCPtr);
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }

diff --git a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
index 13a3bc2..1b75ff9 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/ManualPINVOKE.cs
@@ -850,7 +850,7 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_SetTransparency")]
         public static extern global::System.IntPtr SetTransparency(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2);
 
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Adaptor_FeedKeyEvent")]
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_FeedKeyEvent")]
         public static extern void Window_FeedKeyEvent(global::System.Runtime.InteropServices.HandleRef jarg1);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_MakeCallback")]

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
old mode 100644 (file)
new mode 100755 (executable)
index 5cae4d9..3adf2a5
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -1668,7 +1668,7 @@ namespace Tizen.NUI
         /// Feed a key-event into the window.
         /// </summary>
         /// <since_tizen> 4 </since_tizen>
-        public static void FeedKeyEvent(Key keyEvent)
+        public void FeedKeyEvent(Key keyEvent)
         {
             NDalicManualPINVOKE.Window_FeedKeyEvent(Key.getCPtr(keyEvent));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();