From: Youxia Wu <youxia.wu@partner.samsung.com>
Date: Tue, 25 Apr 2017 16:05:00 +0000 (+0800)
Subject: Manual merge for NUI v0.2.36
X-Git-Tag: submit/trunk/20170823.075128~91^2~202
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b700f1c6251d9dcbc82959c5bcb8de1c2f132dea;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Manual merge for NUI v0.2.36

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

diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs
new file mode 100755
index 0000000..31e5689
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.12
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI {
+
+public class SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t(global::System.IntPtr cPtr, bool futureUse) {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t() {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+  }
+
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__SignalT_void_fDali__Actor_bool_Dali__DevelActor__VisibilityChange__TypeF_t obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}
diff --git a/src/Tizen.NUI/src/internal/Type.cs b/src/Tizen.NUI/src/internal/Type.cs
new file mode 100755
index 0000000..24a3b23
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/Type.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.12
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI {
+
+public enum Type {
+  NONE,
+  USER,
+  KEYBOARD,
+  MOUSE,
+  TOUCH,
+  PEN,
+  POINTER,
+  GAMEPAD
+}
+
+}
diff --git a/src/Tizen.NUI/src/internal/VisibilityChangeType.cs b/src/Tizen.NUI/src/internal/VisibilityChangeType.cs
new file mode 100755
index 0000000..b0ab543
--- /dev/null
+++ b/src/Tizen.NUI/src/internal/VisibilityChangeType.cs
@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.12
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI {
+
+public enum VisibilityChangeType {
+  SELF,
+  PARENT
+}
+
+}