dali 1.2.28 version upgrade

Change-Id: If82759c89a95f260326108a624219fe428f3dc0f
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/LICENSE b/LICENSE
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.cs b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.cs
index 2bb8b86..b7c6fd5 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.cs
+++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.cs
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -74,7 +74,7 @@ namespace MyCSharpExample
             topLabel.SizeModeFactor = new Vector3(0.0f, 0.1f, 0.0f);\r
             topLabel.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f);\r
             topLabel.TextColor = Color.Yellow;\r
-            topLabel.Text = " DALi Views Ver.0216-01";\r
+            topLabel.Text = " DALi Views Ver.0303-01";\r
             topLabel.HorizontalAlignment = "BEGIN";\r
             topLabel.VerticalAlignment = "CENTER";\r
 \r
@@ -108,6 +108,7 @@ namespace MyCSharpExample
 \r
             FocusManager.Instance.PreFocusChange += OnPreFocusChange;\r
 \r
+#if false\r
             _timer = new Timer(500);\r
             _timer.Tick += OnTimerTick;\r
             _timer.Start();\r
@@ -122,7 +123,6 @@ namespace MyCSharpExample
             _testView.Size = new Size(1.0f, 2.0f, 0.0f);\r
             Tizen.Log.Debug("NUI", "3) test view sizewidth = " + _testView.SizeWidth + "  sizeHeight= " + _testView.SizeHeight);\r
 \r
-#if false\r
             Window _win = new Window(new RectInteger(100, 100, 500, 500), "win test", false);\r
             Window _win = _application.GetWindow();\r
             _win.Activate();\r
@@ -163,7 +163,7 @@ namespace MyCSharpExample
             itemLabel.Size = new Size(_stage.Size.Width * 0.2f, _stage.Size.Height * 0.05f, 0.0f);\r
             itemLabel.HorizontalAlignment = "BEGIN";\r
             itemLabel.VerticalAlignment = "BOTTOM";\r
-            //itemLabel.PointSize = 10.0f;\r
+            itemLabel.PointSize = 10.0f;\r
             _contentContainer.AddChild(itemLabel, new TableView.CellPosition(((uint)idx / 5) * 2, (uint)idx % 5));\r
 \r
             // If item is implemented in public, attach it on stage\r
@@ -322,7 +322,7 @@ namespace MyCSharpExample
                     text.MultiLine = true;\r
                     text.WidthResizePolicy = ResizePolicyType.FillToParent;\r
                     text.HeightResizePolicy = ResizePolicyType.DimensionDependency;\r
-                    text.Padding = new Vector4(10.0f, 10.0f, 20.0f, 0.0f);\r
+                    text.SetPadding(new PaddingType(10.0f, 10.0f, 20.0f, 0.0f));\r
                     _popup.SetContent(text);\r
                     _popup.Focusable = true;\r
                     _popup.SetDisplayState(Popup.DisplayStateType.Hidden);\r
@@ -470,8 +470,8 @@ namespace MyCSharpExample
         {\r
             Tizen.Log.Debug("NUI", "dali c# control-dashboard! main() is called!");\r
 \r
-            Example example = new Example(Application.NewApplication("/home/owner/apps_rw/NUISamples.TizenTV/res/json/control-dashboard-theme.json"));\r
+            Example example = new Example(Application.NewApplication(/*"/home/owner/apps_rw/NUISamples.TizenTV/res/json/control-dashboard-theme.json"*/));\r
             example.MainLoop();\r
         }\r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
index 9cd6261..ea3442a 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
+++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj
@@ -56,6 +56,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <Folder Include="examples\" />\r
     <Folder Include="lib\" />\r
   </ItemGroup>\r
   <ItemGroup>\r

diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.json b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.json
index 59741cf..0b2c7fe 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.json
+++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.json
@@ -1,28 +1,28 @@
 {\r
-       "buildOptions": {\r
-               "emitEntryPoint": true,\r
-               "debugType": "portable",\r
-               "platform": "AnyCPU",\r
-               "preserveCompilationContext": true\r
-       },\r
-       "dependencies": {\r
-               "Microsoft.NETCore.App": {\r
-                       "version": "1.0.0"\r
-               },\r
-               "Tizen.Library": "1.0.0-pre2",\r
-               "Xamarin.Forms": "2.3.3.175",\r
-               "Xamarin.Forms.Platform.Tizen": "2.3.3.175-beta-007"\r
-       },\r
-       "runtimes": {\r
-               "win": {},\r
-               "linux": {}\r
-       },\r
-       "frameworks": {\r
-               "netcoreapp1.0": {\r
-                       "imports": [\r
-                               "portable-net45+wp80+win81+wpa81",\r
-                               "netstandard1.6"\r
-                       ]\r
-               }\r
-       }\r
-}\r
+  "buildOptions": {\r
+    "emitEntryPoint": true,\r
+    "debugType": "portable",\r
+    "platform": "AnyCPU",\r
+    "preserveCompilationContext": true\r
+  },\r
+  "dependencies": {\r
+    "Microsoft.NETCore.App": {\r
+      "version": "1.0.0"\r
+    },\r
+    "Tizen.Applications": "1.2.4",\r
+    "Xamarin.Forms": "2.3.3.175",\r
+    "Xamarin.Forms.Platform.Tizen": "2.3.3.175-beta-007"\r
+  },\r
+  "runtimes": {\r
+    "win": {},\r
+    "linux": {}\r
+  },\r
+  "frameworks": {\r
+    "netcoreapp1.0": {\r
+      "imports": [\r
+        "portable-net45+wp80+win81+wpa81",\r
+        "netstandard1.6"\r
+      ]\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.lock.json b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.lock.json
index 69d4a80..5297743 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.lock.json
+++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.project.lock.json
@@ -1,17 +1,10 @@
 {\r
   "locked": false,\r
-  "version": 1,\r
+  "version": 2,\r
   "targets": {\r
     ".NETCoreApp,Version=v1.0": {\r
-      "ElmSharp/1.1.0-beta-009": {\r
-        "compile": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        }\r
-      },\r
       "Libuv/1.9.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1"\r
         },\r
@@ -50,8 +43,11 @@
           }\r
         }\r
       },\r
-      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {},\r
+      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.CodeAnalysis.Common/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Analyzers": "1.1.0",\r
           "System.AppContext": "4.1.0",\r
@@ -101,6 +97,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.CSharp/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "[1.3.0]"\r
         },\r
@@ -112,6 +109,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.VisualBasic/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "1.3.0"\r
         },\r
@@ -123,6 +121,7 @@
         }\r
       },\r
       "Microsoft.CSharp/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -149,6 +148,7 @@
         }\r
       },\r
       "Microsoft.NETCore.App/1.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Libuv": "1.9.0",\r
           "Microsoft.CSharp": "4.0.1",\r
@@ -199,19 +199,26 @@
           "lib/netcoreapp1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.DotNetHost/1.0.1": {},\r
+      "Microsoft.NETCore.DotNetHost/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.DotNetHostPolicy/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHostResolver": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.DotNetHostResolver/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHost": "1.0.1"\r
         }\r
       },\r
-      "Microsoft.NETCore.Jit/1.0.2": {},\r
+      "Microsoft.NETCore.Jit/1.0.2": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.Platforms/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -220,12 +227,14 @@
         }\r
       },\r
       "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Jit": "1.0.2",\r
           "Microsoft.NETCore.Windows.ApiSets": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.Targets/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -233,8 +242,11 @@
           "lib/netstandard1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {},\r
+      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.VisualBasic/10.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -261,6 +273,7 @@
         }\r
       },\r
       "Microsoft.Win32.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -271,6 +284,7 @@
         }\r
       },\r
       "Microsoft.Win32.Registry/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -296,6 +310,7 @@
         }\r
       },\r
       "NETStandard.Library/1.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -344,6 +359,7 @@
         }\r
       },\r
       "runtime.native.System/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -356,6 +372,7 @@
         }\r
       },\r
       "runtime.native.System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -368,6 +385,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Http/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -380,6 +398,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Security/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -392,6 +411,7 @@
         }\r
       },\r
       "runtime.native.System.Security.Cryptography/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -404,6 +424,7 @@
         }\r
       },\r
       "System.AppContext/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -415,6 +436,7 @@
         }\r
       },\r
       "System.Buffers/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -430,6 +452,7 @@
         }\r
       },\r
       "System.Collections/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -443,6 +466,7 @@
         }\r
       },\r
       "System.Collections.Concurrent/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -463,6 +487,7 @@
         }\r
       },\r
       "System.Collections.Immutable/1.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -481,6 +506,7 @@
         }\r
       },\r
       "System.ComponentModel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -492,6 +518,7 @@
         }\r
       },\r
       "System.ComponentModel.Annotations/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.ComponentModel": "4.0.1",\r
@@ -513,6 +540,7 @@
         }\r
       },\r
       "System.Console/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -525,6 +553,7 @@
         }\r
       },\r
       "System.Diagnostics.Debug/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -538,6 +567,7 @@
         }\r
       },\r
       "System.Diagnostics.DiagnosticSource/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -553,6 +583,7 @@
         }\r
       },\r
       "System.Diagnostics.FileVersionInfo/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -579,6 +610,7 @@
         }\r
       },\r
       "System.Diagnostics.Process/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -621,6 +653,7 @@
         }\r
       },\r
       "System.Diagnostics.StackTrace/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Immutable": "1.2.0",\r
           "System.IO.FileSystem": "4.0.1",\r
@@ -637,6 +670,7 @@
         }\r
       },\r
       "System.Diagnostics.Tools/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -650,6 +684,7 @@
         }\r
       },\r
       "System.Diagnostics.Tracing/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -660,6 +695,7 @@
         }\r
       },\r
       "System.Dynamic.Runtime/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -685,6 +721,7 @@
         }\r
       },\r
       "System.Globalization/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -698,6 +735,7 @@
         }\r
       },\r
       "System.Globalization.Calendars/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -709,6 +747,7 @@
         }\r
       },\r
       "System.Globalization.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -732,6 +771,7 @@
         }\r
       },\r
       "System.IO/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -747,6 +787,7 @@
         }\r
       },\r
       "System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -778,6 +819,7 @@
         }\r
       },\r
       "System.IO.Compression.ZipFile/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Buffers": "4.0.0",\r
           "System.IO": "4.1.0",\r
@@ -797,6 +839,7 @@
         }\r
       },\r
       "System.IO.FileSystem/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -812,6 +855,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -823,6 +867,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Watcher/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -860,6 +905,7 @@
         }\r
       },\r
       "System.IO.MemoryMappedFiles/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -890,6 +936,7 @@
         }\r
       },\r
       "System.IO.UnmanagedMemoryStream/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.IO.FileSystem.Primitives": "4.0.1",\r
@@ -907,6 +954,7 @@
         }\r
       },\r
       "System.Linq/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -922,6 +970,7 @@
         }\r
       },\r
       "System.Linq.Expressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -949,6 +998,7 @@
         }\r
       },\r
       "System.Linq.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -969,6 +1019,7 @@
         }\r
       },\r
       "System.Linq.Queryable/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -987,6 +1038,7 @@
         }\r
       },\r
       "System.Net.Http/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1030,6 +1082,7 @@
         }\r
       },\r
       "System.Net.NameResolution/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1061,6 +1114,7 @@
         }\r
       },\r
       "System.Net.Primitives/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1075,6 +1129,7 @@
         }\r
       },\r
       "System.Net.Requests/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1108,6 +1163,7 @@
         }\r
       },\r
       "System.Net.Security/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -1153,6 +1209,7 @@
         }\r
       },\r
       "System.Net.Sockets/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1166,6 +1223,7 @@
         }\r
       },\r
       "System.Net.WebHeaderCollection/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -1180,6 +1238,7 @@
         }\r
       },\r
       "System.Numerics.Vectors/4.1.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -1194,6 +1253,7 @@
         }\r
       },\r
       "System.ObjectModel/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -1209,6 +1269,7 @@
         }\r
       },\r
       "System.Reflection/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1224,6 +1285,7 @@
         }\r
       },\r
       "System.Reflection.DispatchProxy/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -1244,6 +1306,7 @@
         }\r
       },\r
       "System.Reflection.Emit/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -1259,6 +1322,7 @@
         }\r
       },\r
       "System.Reflection.Emit.ILGeneration/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Primitives": "4.0.1",\r
@@ -1272,6 +1336,7 @@
         }\r
       },\r
       "System.Reflection.Emit.Lightweight/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Emit.ILGeneration": "4.0.1",\r
@@ -1286,6 +1351,7 @@
         }\r
       },\r
       "System.Reflection.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1300,6 +1366,7 @@
         }\r
       },\r
       "System.Reflection.Metadata/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Immutable": "1.2.0",\r
@@ -1325,6 +1392,7 @@
         }\r
       },\r
       "System.Reflection.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1338,6 +1406,7 @@
         }\r
       },\r
       "System.Reflection.TypeExtensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Runtime": "4.1.0"\r
@@ -1350,6 +1419,7 @@
         }\r
       },\r
       "System.Resources.Reader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -1365,6 +1435,7 @@
         }\r
       },\r
       "System.Resources.ResourceManager/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1380,6 +1451,7 @@
         }\r
       },\r
       "System.Runtime/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -1392,6 +1464,7 @@
         }\r
       },\r
       "System.Runtime.Extensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1405,6 +1478,7 @@
         }\r
       },\r
       "System.Runtime.Handles/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1415,6 +1489,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1428,6 +1503,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices.RuntimeInformation/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Reflection": "4.1.0",\r
@@ -1452,6 +1528,7 @@
         }\r
       },\r
       "System.Runtime.Loader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -1465,6 +1542,7 @@
         }\r
       },\r
       "System.Runtime.Numerics/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -1479,6 +1557,7 @@
         }\r
       },\r
       "System.Security.Claims/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -1496,6 +1575,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Algorithms/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1526,6 +1606,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Cng/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -1554,6 +1635,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Csp/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -1584,6 +1666,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Encoding/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1613,6 +1696,7 @@
         }\r
       },\r
       "System.Security.Cryptography.OpenSsl/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.IO": "4.1.0",\r
@@ -1642,6 +1726,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Primitives/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -1659,6 +1744,7 @@
         }\r
       },\r
       "System.Security.Cryptography.X509Certificates/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1701,6 +1787,7 @@
         }\r
       },\r
       "System.Security.Principal/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -1712,6 +1799,7 @@
         }\r
       },\r
       "System.Security.Principal.Windows/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -1743,6 +1831,7 @@
         }\r
       },\r
       "System.Text.Encoding/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1756,6 +1845,7 @@
         }\r
       },\r
       "System.Text.Encoding.CodePages/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -1785,6 +1875,7 @@
         }\r
       },\r
       "System.Text.Encoding.Extensions/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1799,6 +1890,7 @@
         }\r
       },\r
       "System.Text.RegularExpressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -1815,6 +1907,7 @@
         }\r
       },\r
       "System.Threading/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Threading.Tasks": "4.0.11"\r
@@ -1827,6 +1920,7 @@
         }\r
       },\r
       "System.Threading.Overlapped/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -1848,6 +1942,7 @@
         }\r
       },\r
       "System.Threading.Tasks/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1861,6 +1956,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Dataflow/4.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -1882,6 +1978,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Extensions/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Runtime": "4.1.0",\r
@@ -1895,6 +1992,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Concurrent": "4.0.12",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -1913,6 +2011,7 @@
         }\r
       },\r
       "System.Threading.Thread/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -1924,6 +2023,7 @@
         }\r
       },\r
       "System.Threading.ThreadPool/4.0.10": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Runtime.Handles": "4.0.1"\r
@@ -1936,6 +2036,7 @@
         }\r
       },\r
       "System.Threading.Timer/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -1946,6 +2047,7 @@
         }\r
       },\r
       "System.Xml.ReaderWriter/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -1971,6 +2073,7 @@
         }\r
       },\r
       "System.Xml.XDocument/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -1993,6 +2096,7 @@
         }\r
       },\r
       "System.Xml.XmlDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2013,6 +2117,7 @@
         }\r
       },\r
       "System.Xml.XPath/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2032,6 +2137,7 @@
         }\r
       },\r
       "System.Xml.XPath.XDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -2051,6 +2157,7 @@
         }\r
       },\r
       "Tizen/1.0.2": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.3/Tizen.dll": {}\r
         },\r
@@ -2058,7 +2165,8 @@
           "lib/netstandard1.3/Tizen.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications/1.1.0": {\r
+      "Tizen.Applications/1.2.4": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Tizen": "1.0.2"\r
         },\r
@@ -2069,198 +2177,8 @@
           "lib/netstandard1.3/Tizen.Applications.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications.Badge/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MediaContent/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MimeType/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Library/1.0.0-pre2": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.1.0-beta-009",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.1.0",\r
-          "Tizen.Applications.Badge": "1.0.2",\r
-          "Tizen.Content.MediaContent": "1.0.6",\r
-          "Tizen.Content.MimeType": "1.0.2",\r
-          "Tizen.Messaging.Push": "1.0.2",\r
-          "Tizen.Multimedia": "1.0.28",\r
-          "Tizen.Network.Connection": "1.0.6",\r
-          "Tizen.Network.WiFi": "1.0.3",\r
-          "Tizen.Security": "1.0.5",\r
-          "Tizen.Security.SecureRepository": "1.0.7",\r
-          "Tizen.Sensor": "1.0.4",\r
-          "Tizen.System": "1.0.5",\r
-          "Tizen.System.MediaKey": "1.0.2",\r
-          "Tizen.Tracer": "1.0.3",\r
-          "Tizen.Uix.Stt": "1.0.0",\r
-          "Tizen.Uix.Tts": "1.0.0"\r
-        }\r
-      },\r
-      "Tizen.Messaging.Push/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.1"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Multimedia/1.0.28": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.0.14",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.Connection/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.WiFi/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Network.Connection": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security.SecureRepository/1.0.7": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Sensor/1.0.4": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.System": "1.0.5"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System.MediaKey/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Tracer/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Stt/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Tts/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        }\r
-      },\r
       "Xamarin.Forms/2.3.3.175": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Core.dll": {},\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Platform.dll": {},\r
@@ -2273,6 +2191,7 @@
         }\r
       },\r
       "Xamarin.Forms.Platform.Tizen/2.3.3.175-beta-007": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Xamarin.Forms": "2.3.3.175"\r
         },\r
@@ -2285,21 +2204,17 @@
       }\r
     },\r
     ".NETCoreApp,Version=v1.0/linux": {\r
-      "ElmSharp/1.1.0-beta-009": {\r
-        "compile": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        }\r
-      },\r
       "Libuv/1.9.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1"\r
         }\r
       },\r
-      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {},\r
+      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.CodeAnalysis.Common/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Analyzers": "1.1.0",\r
           "System.AppContext": "4.1.0",\r
@@ -2349,6 +2264,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.CSharp/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "[1.3.0]"\r
         },\r
@@ -2360,6 +2276,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.VisualBasic/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "1.3.0"\r
         },\r
@@ -2371,6 +2288,7 @@
         }\r
       },\r
       "Microsoft.CSharp/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2397,6 +2315,7 @@
         }\r
       },\r
       "Microsoft.NETCore.App/1.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Libuv": "1.9.0",\r
           "Microsoft.CSharp": "4.0.1",\r
@@ -2447,19 +2366,26 @@
           "lib/netcoreapp1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.DotNetHost/1.0.1": {},\r
+      "Microsoft.NETCore.DotNetHost/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.DotNetHostPolicy/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHostResolver": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.DotNetHostResolver/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHost": "1.0.1"\r
         }\r
       },\r
-      "Microsoft.NETCore.Jit/1.0.2": {},\r
+      "Microsoft.NETCore.Jit/1.0.2": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.Platforms/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -2468,12 +2394,14 @@
         }\r
       },\r
       "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Jit": "1.0.2",\r
           "Microsoft.NETCore.Windows.ApiSets": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.Targets/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -2481,8 +2409,11 @@
           "lib/netstandard1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {},\r
+      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.VisualBasic/10.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2509,6 +2440,7 @@
         }\r
       },\r
       "Microsoft.Win32.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -2520,6 +2452,7 @@
         }\r
       },\r
       "Microsoft.Win32.Registry/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -2538,6 +2471,7 @@
         }\r
       },\r
       "NETStandard.Library/1.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -2586,6 +2520,7 @@
         }\r
       },\r
       "runtime.any.System.Collections/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -2597,6 +2532,7 @@
         }\r
       },\r
       "runtime.any.System.Diagnostics.Tools/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2605,6 +2541,7 @@
         }\r
       },\r
       "runtime.any.System.Diagnostics.Tracing/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2613,6 +2550,7 @@
         }\r
       },\r
       "runtime.any.System.Globalization/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2621,6 +2559,7 @@
         }\r
       },\r
       "runtime.any.System.Globalization.Calendars/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2629,6 +2568,7 @@
         }\r
       },\r
       "runtime.any.System.IO/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2637,6 +2577,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2645,6 +2586,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection.Extensions/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2653,6 +2595,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection.Primitives/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2661,6 +2604,7 @@
         }\r
       },\r
       "runtime.any.System.Resources.ResourceManager/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2669,6 +2613,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Private.Uri": "4.0.1"\r
         },\r
@@ -2680,6 +2625,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime.Handles/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2688,6 +2634,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime.InteropServices/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2696,6 +2643,7 @@
         }\r
       },\r
       "runtime.any.System.Text.Encoding/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2704,6 +2652,7 @@
         }\r
       },\r
       "runtime.any.System.Text.Encoding.Extensions/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2712,6 +2661,7 @@
         }\r
       },\r
       "runtime.any.System.Threading.Tasks/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2720,6 +2670,7 @@
         }\r
       },\r
       "runtime.any.System.Threading.Timer/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -2728,6 +2679,7 @@
         }\r
       },\r
       "runtime.native.System/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -2740,6 +2692,7 @@
         }\r
       },\r
       "runtime.native.System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -2752,6 +2705,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Http/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -2764,6 +2718,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Security/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -2776,6 +2731,7 @@
         }\r
       },\r
       "runtime.native.System.Security.Cryptography/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -2788,6 +2744,7 @@
         }\r
       },\r
       "runtime.unix.Microsoft.Win32.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Runtime.InteropServices": "4.1.0",\r
@@ -2801,6 +2758,7 @@
         }\r
       },\r
       "runtime.unix.System.Console/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.IO": "4.1.0",\r
@@ -2824,6 +2782,7 @@
         }\r
       },\r
       "runtime.unix.System.Diagnostics.Debug/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "runtime.native.System": "4.0.0"\r
         },\r
@@ -2835,6 +2794,7 @@
         }\r
       },\r
       "runtime.unix.System.IO.FileSystem/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2859,6 +2819,7 @@
         }\r
       },\r
       "runtime.unix.System.Net.Primitives/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -2880,6 +2841,7 @@
         }\r
       },\r
       "runtime.unix.System.Net.Sockets/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2907,6 +2869,7 @@
         }\r
       },\r
       "runtime.unix.System.Private.Uri/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "runtime.native.System": "4.0.0"\r
         },\r
@@ -2918,6 +2881,7 @@
         }\r
       },\r
       "runtime.unix.System.Runtime.Extensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Private.Uri": "4.0.1",\r
           "runtime.native.System": "4.0.0",\r
@@ -2931,6 +2895,7 @@
         }\r
       },\r
       "System.AppContext/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -2942,6 +2907,7 @@
         }\r
       },\r
       "System.Buffers/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -2957,6 +2923,7 @@
         }\r
       },\r
       "System.Collections/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -2971,6 +2938,7 @@
         }\r
       },\r
       "System.Collections.Concurrent/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -2991,6 +2959,7 @@
         }\r
       },\r
       "System.Collections.Immutable/1.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3009,6 +2978,7 @@
         }\r
       },\r
       "System.ComponentModel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -3020,6 +2990,7 @@
         }\r
       },\r
       "System.ComponentModel.Annotations/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.ComponentModel": "4.0.1",\r
@@ -3041,6 +3012,7 @@
         }\r
       },\r
       "System.Console/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3054,6 +3026,7 @@
         }\r
       },\r
       "System.Diagnostics.Debug/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3068,6 +3041,7 @@
         }\r
       },\r
       "System.Diagnostics.DiagnosticSource/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -3083,6 +3057,7 @@
         }\r
       },\r
       "System.Diagnostics.FileVersionInfo/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -3102,6 +3077,7 @@
         }\r
       },\r
       "System.Diagnostics.Process/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -3133,6 +3109,7 @@
         }\r
       },\r
       "System.Diagnostics.StackTrace/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Immutable": "1.2.0",\r
           "System.IO.FileSystem": "4.0.1",\r
@@ -3149,6 +3126,7 @@
         }\r
       },\r
       "System.Diagnostics.Tools/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3163,6 +3141,7 @@
         }\r
       },\r
       "System.Diagnostics.Tracing/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3174,6 +3153,7 @@
         }\r
       },\r
       "System.Dynamic.Runtime/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3199,6 +3179,7 @@
         }\r
       },\r
       "System.Globalization/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3213,6 +3194,7 @@
         }\r
       },\r
       "System.Globalization.Calendars/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3225,6 +3207,7 @@
         }\r
       },\r
       "System.Globalization.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -3241,6 +3224,7 @@
         }\r
       },\r
       "System.IO/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3257,6 +3241,7 @@
         }\r
       },\r
       "System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -3281,6 +3266,7 @@
         }\r
       },\r
       "System.IO.Compression.ZipFile/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Buffers": "4.0.0",\r
           "System.IO": "4.1.0",\r
@@ -3300,6 +3286,7 @@
         }\r
       },\r
       "System.IO.FileSystem/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3316,6 +3303,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -3327,6 +3315,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Watcher/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -3353,6 +3342,7 @@
         }\r
       },\r
       "System.IO.MemoryMappedFiles/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -3376,6 +3366,7 @@
         }\r
       },\r
       "System.IO.UnmanagedMemoryStream/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.IO.FileSystem.Primitives": "4.0.1",\r
@@ -3393,6 +3384,7 @@
         }\r
       },\r
       "System.Linq/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3408,6 +3400,7 @@
         }\r
       },\r
       "System.Linq.Expressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3435,6 +3428,7 @@
         }\r
       },\r
       "System.Linq.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -3455,6 +3449,7 @@
         }\r
       },\r
       "System.Linq.Queryable/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3473,6 +3468,7 @@
         }\r
       },\r
       "System.Net.Http/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -3509,6 +3505,7 @@
         }\r
       },\r
       "System.Net.NameResolution/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -3533,6 +3530,7 @@
         }\r
       },\r
       "System.Net.Primitives/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3548,6 +3546,7 @@
         }\r
       },\r
       "System.Net.Requests/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -3571,6 +3570,7 @@
         }\r
       },\r
       "System.Net.Security/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -3609,6 +3609,7 @@
         }\r
       },\r
       "System.Net.Sockets/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3623,6 +3624,7 @@
         }\r
       },\r
       "System.Net.WebHeaderCollection/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -3637,6 +3639,7 @@
         }\r
       },\r
       "System.Numerics.Vectors/4.1.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -3651,6 +3654,7 @@
         }\r
       },\r
       "System.ObjectModel/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -3666,6 +3670,7 @@
         }\r
       },\r
       "System.Private.Uri/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3676,6 +3681,7 @@
         }\r
       },\r
       "System.Reflection/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3692,6 +3698,7 @@
         }\r
       },\r
       "System.Reflection.DispatchProxy/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -3712,6 +3719,7 @@
         }\r
       },\r
       "System.Reflection.Emit/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -3727,6 +3735,7 @@
         }\r
       },\r
       "System.Reflection.Emit.ILGeneration/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Primitives": "4.0.1",\r
@@ -3740,6 +3749,7 @@
         }\r
       },\r
       "System.Reflection.Emit.Lightweight/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Emit.ILGeneration": "4.0.1",\r
@@ -3754,6 +3764,7 @@
         }\r
       },\r
       "System.Reflection.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3769,6 +3780,7 @@
         }\r
       },\r
       "System.Reflection.Metadata/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Immutable": "1.2.0",\r
@@ -3794,6 +3806,7 @@
         }\r
       },\r
       "System.Reflection.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3808,6 +3821,7 @@
         }\r
       },\r
       "System.Reflection.TypeExtensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Runtime": "4.1.0"\r
@@ -3820,6 +3834,7 @@
         }\r
       },\r
       "System.Resources.Reader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -3835,6 +3850,7 @@
         }\r
       },\r
       "System.Resources.ResourceManager/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3851,6 +3867,7 @@
         }\r
       },\r
       "System.Runtime/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3864,6 +3881,7 @@
         }\r
       },\r
       "System.Runtime.Extensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3878,6 +3896,7 @@
         }\r
       },\r
       "System.Runtime.Handles/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3889,6 +3908,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -3903,6 +3923,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices.RuntimeInformation/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Reflection": "4.1.0",\r
@@ -3920,6 +3941,7 @@
         }\r
       },\r
       "System.Runtime.Loader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -3933,6 +3955,7 @@
         }\r
       },\r
       "System.Runtime.Numerics/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -3947,6 +3970,7 @@
         }\r
       },\r
       "System.Security.Claims/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -3964,6 +3988,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Algorithms/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -3987,6 +4012,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Cng/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -4008,6 +4034,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Csp/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -4031,6 +4058,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Encoding/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -4053,6 +4081,7 @@
         }\r
       },\r
       "System.Security.Cryptography.OpenSsl/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.IO": "4.1.0",\r
@@ -4076,6 +4105,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Primitives/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -4093,6 +4123,7 @@
         }\r
       },\r
       "System.Security.Cryptography.X509Certificates/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -4128,6 +4159,7 @@
         }\r
       },\r
       "System.Security.Principal/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -4139,6 +4171,7 @@
         }\r
       },\r
       "System.Security.Principal.Windows/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -4163,6 +4196,7 @@
         }\r
       },\r
       "System.Text.Encoding/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -4177,6 +4211,7 @@
         }\r
       },\r
       "System.Text.Encoding.CodePages/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -4199,6 +4234,7 @@
         }\r
       },\r
       "System.Text.Encoding.Extensions/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -4214,6 +4250,7 @@
         }\r
       },\r
       "System.Text.RegularExpressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -4230,6 +4267,7 @@
         }\r
       },\r
       "System.Threading/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Threading.Tasks": "4.0.11"\r
@@ -4242,6 +4280,7 @@
         }\r
       },\r
       "System.Threading.Overlapped/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -4256,6 +4295,7 @@
         }\r
       },\r
       "System.Threading.Tasks/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -4270,6 +4310,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Dataflow/4.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -4291,6 +4332,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Extensions/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Runtime": "4.1.0",\r
@@ -4304,6 +4346,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Concurrent": "4.0.12",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4322,6 +4365,7 @@
         }\r
       },\r
       "System.Threading.Thread/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -4333,6 +4377,7 @@
         }\r
       },\r
       "System.Threading.ThreadPool/4.0.10": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Runtime.Handles": "4.0.1"\r
@@ -4345,6 +4390,7 @@
         }\r
       },\r
       "System.Threading.Timer/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -4356,6 +4402,7 @@
         }\r
       },\r
       "System.Xml.ReaderWriter/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4381,6 +4428,7 @@
         }\r
       },\r
       "System.Xml.XDocument/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4403,6 +4451,7 @@
         }\r
       },\r
       "System.Xml.XmlDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4423,6 +4472,7 @@
         }\r
       },\r
       "System.Xml.XPath/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4442,6 +4492,7 @@
         }\r
       },\r
       "System.Xml.XPath.XDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -4461,6 +4512,7 @@
         }\r
       },\r
       "Tizen/1.0.2": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.3/Tizen.dll": {}\r
         },\r
@@ -4468,7 +4520,8 @@
           "lib/netstandard1.3/Tizen.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications/1.1.0": {\r
+      "Tizen.Applications/1.2.4": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Tizen": "1.0.2"\r
         },\r
@@ -4479,198 +4532,8 @@
           "lib/netstandard1.3/Tizen.Applications.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications.Badge/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MediaContent/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MimeType/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Library/1.0.0-pre2": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.1.0-beta-009",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.1.0",\r
-          "Tizen.Applications.Badge": "1.0.2",\r
-          "Tizen.Content.MediaContent": "1.0.6",\r
-          "Tizen.Content.MimeType": "1.0.2",\r
-          "Tizen.Messaging.Push": "1.0.2",\r
-          "Tizen.Multimedia": "1.0.28",\r
-          "Tizen.Network.Connection": "1.0.6",\r
-          "Tizen.Network.WiFi": "1.0.3",\r
-          "Tizen.Security": "1.0.5",\r
-          "Tizen.Security.SecureRepository": "1.0.7",\r
-          "Tizen.Sensor": "1.0.4",\r
-          "Tizen.System": "1.0.5",\r
-          "Tizen.System.MediaKey": "1.0.2",\r
-          "Tizen.Tracer": "1.0.3",\r
-          "Tizen.Uix.Stt": "1.0.0",\r
-          "Tizen.Uix.Tts": "1.0.0"\r
-        }\r
-      },\r
-      "Tizen.Messaging.Push/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.1"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Multimedia/1.0.28": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.0.14",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.Connection/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.WiFi/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Network.Connection": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security.SecureRepository/1.0.7": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Sensor/1.0.4": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.System": "1.0.5"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System.MediaKey/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Tracer/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Stt/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Tts/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        }\r
-      },\r
       "Xamarin.Forms/2.3.3.175": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Core.dll": {},\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Platform.dll": {},\r
@@ -4683,6 +4546,7 @@
         }\r
       },\r
       "Xamarin.Forms.Platform.Tizen/2.3.3.175-beta-007": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Xamarin.Forms": "2.3.3.175"\r
         },\r
@@ -4695,21 +4559,17 @@
       }\r
     },\r
     ".NETCoreApp,Version=v1.0/win": {\r
-      "ElmSharp/1.1.0-beta-009": {\r
-        "compile": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/ElmSharp.dll": {}\r
-        }\r
-      },\r
       "Libuv/1.9.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1"\r
         }\r
       },\r
-      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {},\r
+      "Microsoft.CodeAnalysis.Analyzers/1.1.0": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.CodeAnalysis.Common/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Analyzers": "1.1.0",\r
           "System.AppContext": "4.1.0",\r
@@ -4759,6 +4619,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.CSharp/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "[1.3.0]"\r
         },\r
@@ -4770,6 +4631,7 @@
         }\r
       },\r
       "Microsoft.CodeAnalysis.VisualBasic/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.CodeAnalysis.Common": "1.3.0"\r
         },\r
@@ -4781,6 +4643,7 @@
         }\r
       },\r
       "Microsoft.CSharp/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4807,6 +4670,7 @@
         }\r
       },\r
       "Microsoft.NETCore.App/1.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Libuv": "1.9.0",\r
           "Microsoft.CSharp": "4.0.1",\r
@@ -4857,19 +4721,26 @@
           "lib/netcoreapp1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.DotNetHost/1.0.1": {},\r
+      "Microsoft.NETCore.DotNetHost/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.DotNetHostPolicy/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHostResolver": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.DotNetHostResolver/1.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.DotNetHost": "1.0.1"\r
         }\r
       },\r
-      "Microsoft.NETCore.Jit/1.0.2": {},\r
+      "Microsoft.NETCore.Jit/1.0.2": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.NETCore.Platforms/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -4878,12 +4749,14 @@
         }\r
       },\r
       "Microsoft.NETCore.Runtime.CoreCLR/1.0.2": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Jit": "1.0.2",\r
           "Microsoft.NETCore.Windows.ApiSets": "1.0.1"\r
         }\r
       },\r
       "Microsoft.NETCore.Targets/1.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.0/_._": {}\r
         },\r
@@ -4891,8 +4764,11 @@
           "lib/netstandard1.0/_._": {}\r
         }\r
       },\r
-      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {},\r
+      "Microsoft.NETCore.Windows.ApiSets/1.0.1": {\r
+        "type": "package"\r
+      },\r
       "Microsoft.VisualBasic/10.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -4919,6 +4795,7 @@
         }\r
       },\r
       "Microsoft.Win32.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -4930,6 +4807,7 @@
         }\r
       },\r
       "Microsoft.Win32.Registry/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -4948,6 +4826,7 @@
         }\r
       },\r
       "NETStandard.Library/1.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -4996,6 +4875,7 @@
         }\r
       },\r
       "runtime.any.System.Collections/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -5007,6 +4887,7 @@
         }\r
       },\r
       "runtime.any.System.Diagnostics.Tools/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5015,6 +4896,7 @@
         }\r
       },\r
       "runtime.any.System.Diagnostics.Tracing/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5023,6 +4905,7 @@
         }\r
       },\r
       "runtime.any.System.Globalization/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5031,6 +4914,7 @@
         }\r
       },\r
       "runtime.any.System.Globalization.Calendars/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5039,6 +4923,7 @@
         }\r
       },\r
       "runtime.any.System.IO/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5047,6 +4932,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5055,6 +4941,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection.Extensions/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5063,6 +4950,7 @@
         }\r
       },\r
       "runtime.any.System.Reflection.Primitives/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5071,6 +4959,7 @@
         }\r
       },\r
       "runtime.any.System.Resources.ResourceManager/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5079,6 +4968,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Private.Uri": "4.0.1"\r
         },\r
@@ -5090,6 +4980,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime.Handles/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5098,6 +4989,7 @@
         }\r
       },\r
       "runtime.any.System.Runtime.InteropServices/4.1.0": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5106,6 +4998,7 @@
         }\r
       },\r
       "runtime.any.System.Text.Encoding/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5114,6 +5007,7 @@
         }\r
       },\r
       "runtime.any.System.Text.Encoding.Extensions/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5122,6 +5016,7 @@
         }\r
       },\r
       "runtime.any.System.Threading.Tasks/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5130,6 +5025,7 @@
         }\r
       },\r
       "runtime.any.System.Threading.Timer/4.0.1": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5138,6 +5034,7 @@
         }\r
       },\r
       "runtime.native.System/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -5150,6 +5047,7 @@
         }\r
       },\r
       "runtime.native.System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -5162,6 +5060,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Http/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -5174,6 +5073,7 @@
         }\r
       },\r
       "runtime.native.System.Net.Security/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -5186,6 +5086,7 @@
         }\r
       },\r
       "runtime.native.System.Security.Cryptography/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -5198,6 +5099,7 @@
         }\r
       },\r
       "runtime.win.Microsoft.Win32.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Runtime.InteropServices": "4.1.0"\r
@@ -5210,6 +5112,7 @@
         }\r
       },\r
       "runtime.win.System.Console/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.IO.FileSystem.Primitives": "4.0.1",\r
@@ -5229,6 +5132,7 @@
         }\r
       },\r
       "runtime.win.System.Diagnostics.Debug/4.0.11": {\r
+        "type": "package",\r
         "compile": {\r
           "ref/netstandard/_._": {}\r
         },\r
@@ -5237,6 +5141,7 @@
         }\r
       },\r
       "runtime.win.System.IO.FileSystem/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.IO": "4.1.0",\r
@@ -5260,6 +5165,7 @@
         }\r
       },\r
       "runtime.win.System.Net.Primitives/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -5280,6 +5186,7 @@
         }\r
       },\r
       "runtime.win.System.Net.Sockets/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5308,6 +5215,7 @@
         }\r
       },\r
       "runtime.win.System.Runtime.Extensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Private.Uri": "4.0.1"\r
         },\r
@@ -5319,6 +5227,7 @@
         }\r
       },\r
       "System.AppContext/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -5330,6 +5239,7 @@
         }\r
       },\r
       "System.Buffers/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -5345,6 +5255,7 @@
         }\r
       },\r
       "System.Collections/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5359,6 +5270,7 @@
         }\r
       },\r
       "System.Collections.Concurrent/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5379,6 +5291,7 @@
         }\r
       },\r
       "System.Collections.Immutable/1.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5397,6 +5310,7 @@
         }\r
       },\r
       "System.ComponentModel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -5408,6 +5322,7 @@
         }\r
       },\r
       "System.ComponentModel.Annotations/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.ComponentModel": "4.0.1",\r
@@ -5429,6 +5344,7 @@
         }\r
       },\r
       "System.Console/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5442,6 +5358,7 @@
         }\r
       },\r
       "System.Diagnostics.Debug/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5456,6 +5373,7 @@
         }\r
       },\r
       "System.Diagnostics.DiagnosticSource/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Tracing": "4.1.0",\r
@@ -5471,6 +5389,7 @@
         }\r
       },\r
       "System.Diagnostics.FileVersionInfo/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -5490,6 +5409,7 @@
         }\r
       },\r
       "System.Diagnostics.Process/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -5521,6 +5441,7 @@
         }\r
       },\r
       "System.Diagnostics.StackTrace/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Immutable": "1.2.0",\r
           "System.IO.FileSystem": "4.0.1",\r
@@ -5537,6 +5458,7 @@
         }\r
       },\r
       "System.Diagnostics.Tools/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5551,6 +5473,7 @@
         }\r
       },\r
       "System.Diagnostics.Tracing/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5562,6 +5485,7 @@
         }\r
       },\r
       "System.Dynamic.Runtime/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5587,6 +5511,7 @@
         }\r
       },\r
       "System.Globalization/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5601,6 +5526,7 @@
         }\r
       },\r
       "System.Globalization.Calendars/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5613,6 +5539,7 @@
         }\r
       },\r
       "System.Globalization.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Globalization": "4.0.11",\r
@@ -5629,6 +5556,7 @@
         }\r
       },\r
       "System.IO/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5645,6 +5573,7 @@
         }\r
       },\r
       "System.IO.Compression/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -5669,6 +5598,7 @@
         }\r
       },\r
       "System.IO.Compression.ZipFile/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Buffers": "4.0.0",\r
           "System.IO": "4.1.0",\r
@@ -5688,6 +5618,7 @@
         }\r
       },\r
       "System.IO.FileSystem/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5704,6 +5635,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -5715,6 +5647,7 @@
         }\r
       },\r
       "System.IO.FileSystem.Watcher/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -5741,6 +5674,7 @@
         }\r
       },\r
       "System.IO.MemoryMappedFiles/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -5764,6 +5698,7 @@
         }\r
       },\r
       "System.IO.UnmanagedMemoryStream/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.IO.FileSystem.Primitives": "4.0.1",\r
@@ -5781,6 +5716,7 @@
         }\r
       },\r
       "System.Linq/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5796,6 +5732,7 @@
         }\r
       },\r
       "System.Linq.Expressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5823,6 +5760,7 @@
         }\r
       },\r
       "System.Linq.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -5843,6 +5781,7 @@
         }\r
       },\r
       "System.Linq.Queryable/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -5861,6 +5800,7 @@
         }\r
       },\r
       "System.Net.Http/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -5897,6 +5837,7 @@
         }\r
       },\r
       "System.Net.NameResolution/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -5921,6 +5862,7 @@
         }\r
       },\r
       "System.Net.Primitives/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -5936,6 +5878,7 @@
         }\r
       },\r
       "System.Net.Requests/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -5959,6 +5902,7 @@
         }\r
       },\r
       "System.Net.Security/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -5997,6 +5941,7 @@
         }\r
       },\r
       "System.Net.Sockets/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6011,6 +5956,7 @@
         }\r
       },\r
       "System.Net.WebHeaderCollection/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -6025,6 +5971,7 @@
         }\r
       },\r
       "System.Numerics.Vectors/4.1.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -6039,6 +5986,7 @@
         }\r
       },\r
       "System.ObjectModel/4.0.12": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6054,6 +6002,7 @@
         }\r
       },\r
       "System.Private.Uri/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1"\r
@@ -6063,6 +6012,7 @@
         }\r
       },\r
       "System.Reflection/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6079,6 +6029,7 @@
         }\r
       },\r
       "System.Reflection.DispatchProxy/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -6099,6 +6050,7 @@
         }\r
       },\r
       "System.Reflection.Emit/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -6114,6 +6066,7 @@
         }\r
       },\r
       "System.Reflection.Emit.ILGeneration/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Primitives": "4.0.1",\r
@@ -6127,6 +6080,7 @@
         }\r
       },\r
       "System.Reflection.Emit.Lightweight/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Reflection.Emit.ILGeneration": "4.0.1",\r
@@ -6141,6 +6095,7 @@
         }\r
       },\r
       "System.Reflection.Extensions/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6156,6 +6111,7 @@
         }\r
       },\r
       "System.Reflection.Metadata/1.3.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Immutable": "1.2.0",\r
@@ -6181,6 +6137,7 @@
         }\r
       },\r
       "System.Reflection.Primitives/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6195,6 +6152,7 @@
         }\r
       },\r
       "System.Reflection.TypeExtensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Reflection": "4.1.0",\r
           "System.Runtime": "4.1.0"\r
@@ -6207,6 +6165,7 @@
         }\r
       },\r
       "System.Resources.Reader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -6222,6 +6181,7 @@
         }\r
       },\r
       "System.Resources.ResourceManager/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6238,6 +6198,7 @@
         }\r
       },\r
       "System.Runtime/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6251,6 +6212,7 @@
         }\r
       },\r
       "System.Runtime.Extensions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6265,6 +6227,7 @@
         }\r
       },\r
       "System.Runtime.Handles/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6276,6 +6239,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6290,6 +6254,7 @@
         }\r
       },\r
       "System.Runtime.InteropServices.RuntimeInformation/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Reflection": "4.1.0",\r
@@ -6307,6 +6272,7 @@
         }\r
       },\r
       "System.Runtime.Loader/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.IO": "4.1.0",\r
           "System.Reflection": "4.1.0",\r
@@ -6320,6 +6286,7 @@
         }\r
       },\r
       "System.Runtime.Numerics/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Globalization": "4.0.11",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -6334,6 +6301,7 @@
         }\r
       },\r
       "System.Security.Claims/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -6351,6 +6319,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Algorithms/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -6374,6 +6343,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Cng/4.2.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -6395,6 +6365,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Csp/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.IO": "4.1.0",\r
@@ -6418,6 +6389,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Encoding/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -6440,6 +6412,7 @@
         }\r
       },\r
       "System.Security.Cryptography.OpenSsl/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.IO": "4.1.0",\r
@@ -6463,6 +6436,7 @@
         }\r
       },\r
       "System.Security.Cryptography.Primitives/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -6480,6 +6454,7 @@
         }\r
       },\r
       "System.Security.Cryptography.X509Certificates/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -6515,6 +6490,7 @@
         }\r
       },\r
       "System.Security.Principal/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -6526,6 +6502,7 @@
         }\r
       },\r
       "System.Security.Principal.Windows/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.Win32.Primitives": "4.0.1",\r
@@ -6550,6 +6527,7 @@
         }\r
       },\r
       "System.Text.Encoding/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6564,6 +6542,7 @@
         }\r
       },\r
       "System.Text.Encoding.CodePages/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Collections": "4.0.11",\r
@@ -6586,6 +6565,7 @@
         }\r
       },\r
       "System.Text.Encoding.Extensions/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6601,6 +6581,7 @@
         }\r
       },\r
       "System.Text.RegularExpressions/4.1.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Globalization": "4.0.11",\r
@@ -6617,6 +6598,7 @@
         }\r
       },\r
       "System.Threading/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Threading.Tasks": "4.0.11"\r
@@ -6629,6 +6611,7 @@
         }\r
       },\r
       "System.Threading.Overlapped/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "System.Resources.ResourceManager": "4.0.1",\r
@@ -6643,6 +6626,7 @@
         }\r
       },\r
       "System.Threading.Tasks/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6657,6 +6641,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Dataflow/4.6.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Collections.Concurrent": "4.0.12",\r
@@ -6678,6 +6663,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Extensions/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Runtime": "4.1.0",\r
@@ -6691,6 +6677,7 @@
         }\r
       },\r
       "System.Threading.Tasks.Parallel/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections.Concurrent": "4.0.12",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6709,6 +6696,7 @@
         }\r
       },\r
       "System.Threading.Thread/4.0.0": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0"\r
         },\r
@@ -6720,6 +6708,7 @@
         }\r
       },\r
       "System.Threading.ThreadPool/4.0.10": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Runtime": "4.1.0",\r
           "System.Runtime.Handles": "4.0.1"\r
@@ -6732,6 +6721,7 @@
         }\r
       },\r
       "System.Threading.Timer/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Microsoft.NETCore.Platforms": "1.0.1",\r
           "Microsoft.NETCore.Targets": "1.0.1",\r
@@ -6743,6 +6733,7 @@
         }\r
       },\r
       "System.Xml.ReaderWriter/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6768,6 +6759,7 @@
         }\r
       },\r
       "System.Xml.XDocument/4.0.11": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6790,6 +6782,7 @@
         }\r
       },\r
       "System.Xml.XmlDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6810,6 +6803,7 @@
         }\r
       },\r
       "System.Xml.XPath/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Collections": "4.0.11",\r
           "System.Diagnostics.Debug": "4.0.11",\r
@@ -6829,6 +6823,7 @@
         }\r
       },\r
       "System.Xml.XPath.XDocument/4.0.1": {\r
+        "type": "package",\r
         "dependencies": {\r
           "System.Diagnostics.Debug": "4.0.11",\r
           "System.Linq": "4.1.0",\r
@@ -6848,6 +6843,7 @@
         }\r
       },\r
       "Tizen/1.0.2": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/netstandard1.3/Tizen.dll": {}\r
         },\r
@@ -6855,7 +6851,8 @@
           "lib/netstandard1.3/Tizen.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications/1.1.0": {\r
+      "Tizen.Applications/1.2.4": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Tizen": "1.0.2"\r
         },\r
@@ -6866,198 +6863,8 @@
           "lib/netstandard1.3/Tizen.Applications.dll": {}\r
         }\r
       },\r
-      "Tizen.Applications.Badge/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Applications.Badge.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MediaContent/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MediaContent.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Content.MimeType/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Content.MimeType.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Library/1.0.0-pre2": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.1.0-beta-009",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.1.0",\r
-          "Tizen.Applications.Badge": "1.0.2",\r
-          "Tizen.Content.MediaContent": "1.0.6",\r
-          "Tizen.Content.MimeType": "1.0.2",\r
-          "Tizen.Messaging.Push": "1.0.2",\r
-          "Tizen.Multimedia": "1.0.28",\r
-          "Tizen.Network.Connection": "1.0.6",\r
-          "Tizen.Network.WiFi": "1.0.3",\r
-          "Tizen.Security": "1.0.5",\r
-          "Tizen.Security.SecureRepository": "1.0.7",\r
-          "Tizen.Sensor": "1.0.4",\r
-          "Tizen.System": "1.0.5",\r
-          "Tizen.System.MediaKey": "1.0.2",\r
-          "Tizen.Tracer": "1.0.3",\r
-          "Tizen.Uix.Stt": "1.0.0",\r
-          "Tizen.Uix.Tts": "1.0.0"\r
-        }\r
-      },\r
-      "Tizen.Messaging.Push/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.1"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Messaging.Push.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Multimedia/1.0.28": {\r
-        "dependencies": {\r
-          "ElmSharp": "1.0.14",\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Multimedia.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.Connection/1.0.6": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.Connection.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Network.WiFi/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.Network.Connection": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Network.WiFi.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen.Applications": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Security.SecureRepository/1.0.7": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Security.SecureRepository.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Sensor/1.0.4": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2",\r
-          "Tizen.System": "1.0.5"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Sensor.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System/1.0.5": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.dll": {}\r
-        }\r
-      },\r
-      "Tizen.System.MediaKey/1.0.2": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.System.MediaKey.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Tracer/1.0.3": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Tracer.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Stt/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Stt.dll": {}\r
-        }\r
-      },\r
-      "Tizen.Uix.Tts/1.0.0": {\r
-        "dependencies": {\r
-          "Tizen": "1.0.2"\r
-        },\r
-        "compile": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        },\r
-        "runtime": {\r
-          "lib/netstandard1.3/Tizen.Uix.Tts.dll": {}\r
-        }\r
-      },\r
       "Xamarin.Forms/2.3.3.175": {\r
+        "type": "package",\r
         "compile": {\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Core.dll": {},\r
           "lib/portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20/Xamarin.Forms.Platform.dll": {},\r
@@ -7070,6 +6877,7 @@
         }\r
       },\r
       "Xamarin.Forms.Platform.Tizen/2.3.3.175-beta-007": {\r
+        "type": "package",\r
         "dependencies": {\r
           "Xamarin.Forms": "2.3.3.175"\r
         },\r
@@ -7083,17 +6891,6 @@
     }\r
   },\r
   "libraries": {\r
-    "ElmSharp/1.1.0-beta-009": {\r
-      "sha512": "FEP/w6DxbqQOk2PijLi4MzUu/7tsRmsMT9bcIo169Md/ITPzZe9kgNyVYBssAWIRGa2re5h0fFzZuZct+5//yQ==",\r
-      "type": "package",\r
-      "path": "ElmSharp/1.1.0-beta-009",\r
-      "files": [\r
-        "ElmSharp.1.1.0-beta-009.nupkg.sha512",\r
-        "ElmSharp.nuspec",\r
-        "lib/net45/ElmSharp.dll",\r
-        "lib/netstandard1.3/ElmSharp.dll"\r
-      ]\r
-    },\r
     "Libuv/1.9.0": {\r
       "sha512": "9Q7AaqtQhS8JDSIvRBt6ODSLWDBI4c8YxNxyCQemWebBFUtBbc6M5Vi5Gz1ZyIUlTW3rZK9bIr5gnVyv0z7a2Q==",\r
       "type": "package",\r
@@ -12338,191 +12135,17 @@
         "lib/netstandard1.3/Tizen.dll"\r
       ]\r
     },\r
-    "Tizen.Applications/1.1.0": {\r
-      "sha512": "Uu8xKIDQk2I2VefJhpdJW7p+FjRClSfR0v+XUz0AAbV1xJ5m+QdwawyxEKdOlVhET+0NsVsFOHAEcbkdXREXrQ==",\r
+    "Tizen.Applications/1.2.4": {\r
+      "sha512": "tIYyMwl0VHnl+8kn9kKExe1sWmeJLWNZoW2T8EjrnhK2256kmh/bg6EhCb0CTjGw6hZANxeCJm8gppfKzF11kw==",\r
       "type": "package",\r
-      "path": "Tizen.Applications/1.1.0",\r
+      "path": "Tizen.Applications/1.2.4",\r
       "files": [\r
-        "Tizen.Applications.1.1.0.nupkg.sha512",\r
+        "Tizen.Applications.1.2.4.nupkg.sha512",\r
         "Tizen.Applications.nuspec",\r
         "lib/net45/Tizen.Applications.dll",\r
         "lib/netstandard1.3/Tizen.Applications.dll"\r
       ]\r
     },\r
-    "Tizen.Applications.Badge/1.0.2": {\r
-      "sha512": "5Muyyhp3Ig8N2aKVZpGR/4lduKlMCNww7AnfSVA+PyvAUG6XgBRqUlAht8IhfjLPMhUdTt+dP2rRKuZqikq4yg==",\r
-      "type": "package",\r
-      "path": "Tizen.Applications.Badge/1.0.2",\r
-      "files": [\r
-        "Tizen.Applications.Badge.1.0.2.nupkg.sha512",\r
-        "Tizen.Applications.Badge.nuspec",\r
-        "lib/net45/Tizen.Applications.Badge.dll",\r
-        "lib/netstandard1.3/Tizen.Applications.Badge.dll"\r
-      ]\r
-    },\r
-    "Tizen.Content.MediaContent/1.0.6": {\r
-      "sha512": "g+qKibMmg9DnOf+oFsyfS8smRZfBxER9lV5nySFVWDxk0n11JE1js+ddNRTR7t4x+sq06Z8LYDfdCjDxhjhW6w==",\r
-      "type": "package",\r
-      "path": "Tizen.Content.MediaContent/1.0.6",\r
-      "files": [\r
-        "Tizen.Content.MediaContent.1.0.6.nupkg.sha512",\r
-        "Tizen.Content.MediaContent.nuspec",\r
-        "lib/net45/Tizen.Content.MediaContent.dll",\r
-        "lib/netstandard1.3/Tizen.Content.MediaContent.dll"\r
-      ]\r
-    },\r
-    "Tizen.Content.MimeType/1.0.2": {\r
-      "sha512": "jCUoNCHOtxT53RqHi3rs8cGUwFH9/P4Xx1GvJKpi/+b3TP/VYwhJkBMLHxSXn03BBnoeS9OYXpi9o9Gn6B429A==",\r
-      "type": "package",\r
-      "path": "Tizen.Content.MimeType/1.0.2",\r
-      "files": [\r
-        "Tizen.Content.MimeType.1.0.2.nupkg.sha512",\r
-        "Tizen.Content.MimeType.nuspec",\r
-        "lib/net45/Tizen.Content.MimeType.dll",\r
-        "lib/netstandard1.3/Tizen.Content.MimeType.dll"\r
-      ]\r
-    },\r
-    "Tizen.Library/1.0.0-pre2": {\r
-      "sha512": "w5Hfbryi0aIHHBWx6L6j/FZjUFWcrrXc/Vg2MaLrwVLcnwmtGhY93TDfWe2l6ljubt7E2lsOL+3w+2wIFDSoVQ==",\r
-      "type": "package",\r
-      "path": "Tizen.Library/1.0.0-pre2",\r
-      "files": [\r
-        "Tizen.Library.1.0.0-pre2.nupkg.sha512",\r
-        "Tizen.Library.nuspec"\r
-      ]\r
-    },\r
-    "Tizen.Messaging.Push/1.0.2": {\r
-      "sha512": "X06f3D3kxCxUPaNewCEvktwnLEch0TV5zjRYDmKCo2KX8x4PieEay4YjtqNeErqwQHrJn7L/atY1JzVUl1Eb+Q==",\r
-      "type": "package",\r
-      "path": "Tizen.Messaging.Push/1.0.2",\r
-      "files": [\r
-        "Tizen.Messaging.Push.1.0.2.nupkg.sha512",\r
-        "Tizen.Messaging.Push.nuspec",\r
-        "lib/net45/Tizen.Messaging.Push.dll",\r
-        "lib/netstandard1.3/Tizen.Messaging.Push.dll"\r
-      ]\r
-    },\r
-    "Tizen.Multimedia/1.0.28": {\r
-      "sha512": "zD7ZZ6pT/K5NUE4qVg3RLkA/sXYWCrwWow8wexmRbT4Sc3HVlzceUJDzBenN1NF37BQkPOif6STK+kleHLU1Iw==",\r
-      "type": "package",\r
-      "path": "Tizen.Multimedia/1.0.28",\r
-      "files": [\r
-        "Tizen.Multimedia.1.0.28.nupkg.sha512",\r
-        "Tizen.Multimedia.nuspec",\r
-        "lib/net45/Tizen.Multimedia.dll",\r
-        "lib/netstandard1.3/Tizen.Multimedia.dll"\r
-      ]\r
-    },\r
-    "Tizen.Network.Connection/1.0.6": {\r
-      "sha512": "ONZgWf5yyB3B2L675IsSQfZykra76Kob1/9JmJULPvMmErtUUkeEuWKKASaCmkG+0VsbzAdzaNJ0i81QT0mujg==",\r
-      "type": "package",\r
-      "path": "Tizen.Network.Connection/1.0.6",\r
-      "files": [\r
-        "Tizen.Network.Connection.1.0.6.nupkg.sha512",\r
-        "Tizen.Network.Connection.nuspec",\r
-        "lib/net45/Tizen.Network.Connection.dll",\r
-        "lib/netstandard1.3/Tizen.Network.Connection.dll"\r
-      ]\r
-    },\r
-    "Tizen.Network.WiFi/1.0.3": {\r
-      "sha512": "/ltrE/HNKAobHKpIhdleKBJ/mlKaAD4p82THx/IEwNnOzU2ZWt9NKl5/FyVTEEo49/OsGHWkO79iOnFnZUv3ow==",\r
-      "type": "package",\r
-      "path": "Tizen.Network.WiFi/1.0.3",\r
-      "files": [\r
-        "Tizen.Network.WiFi.1.0.3.nupkg.sha512",\r
-        "Tizen.Network.WiFi.nuspec",\r
-        "lib/net45/Tizen.Network.WiFi.dll",\r
-        "lib/netstandard1.3/Tizen.Network.WiFi.dll"\r
-      ]\r
-    },\r
-    "Tizen.Security/1.0.5": {\r
-      "sha512": "1rKm7qCNoKLXGXNYw62L1/zhEnUFOpwqHSh8yOk/lDaggIrkjVrd4Ml5cxbtbVshnkoN9mO+G7spBV+HbVQ64A==",\r
-      "type": "package",\r
-      "path": "Tizen.Security/1.0.5",\r
-      "files": [\r
-        "Tizen.Security.1.0.5.nupkg.sha512",\r
-        "Tizen.Security.nuspec",\r
-        "lib/net45/Tizen.Security.dll",\r
-        "lib/netstandard1.3/Tizen.Security.dll"\r
-      ]\r
-    },\r
-    "Tizen.Security.SecureRepository/1.0.7": {\r
-      "sha512": "zRJTefzTXdZiwfS0ZbC/I/zJJz58VKsu87Ey94lXmhgKLvckMudjalRNLHX3qb99jso6sD662HbHmY2aSWEcaA==",\r
-      "type": "package",\r
-      "path": "Tizen.Security.SecureRepository/1.0.7",\r
-      "files": [\r
-        "Tizen.Security.SecureRepository.1.0.7.nupkg.sha512",\r
-        "Tizen.Security.SecureRepository.nuspec",\r
-        "lib/net45/Tizen.Security.SecureRepository.dll",\r
-        "lib/netstandard1.3/Tizen.Security.SecureRepository.dll"\r
-      ]\r
-    },\r
-    "Tizen.Sensor/1.0.4": {\r
-      "sha512": "ABkp+xsuIxFGzqH/5Uq2qDLyX8pR5x6bPtcSl1IcEdD7GrZwnbHHWNbdG1mHAHcWwuSBmYP7GZT5+V2WtKoYQQ==",\r
-      "type": "package",\r
-      "path": "Tizen.Sensor/1.0.4",\r
-      "files": [\r
-        "Tizen.Sensor.1.0.4.nupkg.sha512",\r
-        "Tizen.Sensor.nuspec",\r
-        "lib/net45/Tizen.Sensor.dll",\r
-        "lib/netstandard1.3/Tizen.Sensor.dll"\r
-      ]\r
-    },\r
-    "Tizen.System/1.0.5": {\r
-      "sha512": "XDgmMa9b/8O4TpFcSWtpovCIOTKCE/gLdStr0EFAb+9SVpa7+kqF0z0Agr4PBDf9woirFq+pSsNbdIL6YtTHbA==",\r
-      "type": "package",\r
-      "path": "Tizen.System/1.0.5",\r
-      "files": [\r
-        "Tizen.System.1.0.5.nupkg.sha512",\r
-        "Tizen.System.nuspec",\r
-        "lib/net45/Tizen.System.dll",\r
-        "lib/netstandard1.3/Tizen.System.dll"\r
-      ]\r
-    },\r
-    "Tizen.System.MediaKey/1.0.2": {\r
-      "sha512": "k0KGINGH3MPOLwXBaBObbwabDwUrtimmZ/so/02OqVrRJqfyzUAoDK7DyTCET5VcE+ONwP/CpXc1uIu3qHgE/g==",\r
-      "type": "package",\r
-      "path": "Tizen.System.MediaKey/1.0.2",\r
-      "files": [\r
-        "Tizen.System.MediaKey.1.0.2.nupkg.sha512",\r
-        "Tizen.System.MediaKey.nuspec",\r
-        "lib/net45/Tizen.System.MediaKey.dll",\r
-        "lib/netstandard1.3/Tizen.System.MediaKey.dll"\r
-      ]\r
-    },\r
-    "Tizen.Tracer/1.0.3": {\r
-      "sha512": "Rxst6xXA5rM9wcU8BU77uBNYLTn1T0vYmGtwgF+EuI3S0AQnYZeE+2cfxTvgXhDE+AdsH4UMZp2QjwzXIFudew==",\r
-      "type": "package",\r
-      "path": "Tizen.Tracer/1.0.3",\r
-      "files": [\r
-        "Tizen.Tracer.1.0.3.nupkg.sha512",\r
-        "Tizen.Tracer.nuspec",\r
-        "lib/net45/Tizen.Tracer.dll",\r
-        "lib/netstandard1.3/Tizen.Tracer.dll"\r
-      ]\r
-    },\r
-    "Tizen.Uix.Stt/1.0.0": {\r
-      "sha512": "bxdiDufX+HNcnLbfUmwXQL104TEJF3SWMwGAB6goAJT/Ue0SSQzKx7rxRxG85lAGtqeCJGut9xmpTsfabT5y/g==",\r
-      "type": "package",\r
-      "path": "Tizen.Uix.Stt/1.0.0",\r
-      "files": [\r
-        "Tizen.Uix.Stt.1.0.0.nupkg.sha512",\r
-        "Tizen.Uix.Stt.nuspec",\r
-        "lib/net45/Tizen.Uix.Stt.dll",\r
-        "lib/netstandard1.3/Tizen.Uix.Stt.dll"\r
-      ]\r
-    },\r
-    "Tizen.Uix.Tts/1.0.0": {\r
-      "sha512": "8XLESpoh8CfHxarATrdjGGqSaxYNiORbQZEl+JoY5ekk293lXa+ZlQ7SuXpLvhUzqBabY6MS93e/QWRq8NBrpA==",\r
-      "type": "package",\r
-      "path": "Tizen.Uix.Tts/1.0.0",\r
-      "files": [\r
-        "Tizen.Uix.Tts.1.0.0.nupkg.sha512",\r
-        "Tizen.Uix.Tts.nuspec",\r
-        "lib/net45/Tizen.Uix.Tts.dll",\r
-        "lib/netstandard1.3/Tizen.Uix.Tts.dll"\r
-      ]\r
-    },\r
     "Xamarin.Forms/2.3.3.175": {\r
       "sha512": "ykrHIH6of2zy1NyZ4taaz42iyVlyw/rx6wHOm2TU3/yMEe9ptPUtfZ8kkjAyxJn1nsOjzIGsU8QufMogKLWPtg==",\r
       "type": "package",\r
@@ -12700,10 +12323,12 @@
   "projectFileDependencyGroups": {\r
     "": [\r
       "Microsoft.NETCore.App >= 1.0.0",\r
-      "Tizen.Library >= 1.0.0-pre2",\r
+      "Tizen.Applications >= 1.2.4",\r
       "Xamarin.Forms >= 2.3.3.175",\r
       "Xamarin.Forms.Platform.Tizen >= 2.3.3.175-beta-007"\r
     ],\r
     ".NETCoreApp,Version=v1.0": []\r
-  }\r
+  },\r
+  "tools": {},\r
+  "projectFileToolGroups": {}\r
 }
\ No newline at end of file

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index 6b1b830..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index a4c337e..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-dali-video-player-plugin-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-dali-video-player-plugin-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index 6702bc1..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-dali-video-player-plugin-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-devel-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-devel-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index fc2e9ec..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-devel-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-integration-devel-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-integration-devel-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index 87be52b..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-adaptor-integration-devel-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-1.2.25-20170214.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-1.2.25-20170214.x86_64.rpm
deleted file mode 100755 (executable)
index ad879a5..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-1.2.25-20170214.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-devel-1.2.25-20170214.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-devel-1.2.25-20170214.x86_64.rpm
deleted file mode 100755 (executable)
index f805fea..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-csharp-binder-devel-1.2.25-20170214.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-devel-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-devel-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index 3710f3c..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-devel-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-integration-devel-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-integration-devel-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index 18605c4..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-integration-devel-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index efbf2b5..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-devel-1.2.25-1.x86_64.rpm b/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-devel-1.2.25-1.x86_64.rpm
deleted file mode 100755 (executable)
index bc3ea14..0000000
Binary files a/NUISamples/NUISamples.TizenTV/bin/Debug/dali-toolkit-devel-1.2.25-1.x86_64.rpm and /dev/null differ

diff --git a/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs b/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs
index ff1e87e..0ddd6f1 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -283,7 +283,7 @@ namespace MyCSharpExample
           text.MultiLine = true;
           text.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH);
           text.SetResizePolicy(ResizePolicyType.DIMENSION_DEPENDENCY, DimensionType.HEIGHT);
-          text.SetPadding(new RectFloat(10.0f, 10.0f, 20.0f, 0.0f));
+          text.SetPadding(new PaddingType(10.0f, 10.0f, 20.0f, 0.0f));
           _popup.SetContent(text);
           _popup.SetKeyboardFocusable(true);
           _popup.SetDisplayState(Popup.DisplayStateType.HIDDEN);

diff --git a/NUISamples/NUISamples.TizenTV/examples/custom-control.cs b/NUISamples/NUISamples.TizenTV/examples/custom-control.cs
index 20531a2..2da7ea4 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/custom-control.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/custom-control.cs
@@ -31,7 +31,21 @@ namespace MyCSharpExample
         private int _myRating;
         private bool _myDragEnabled;
 
-        public StarRating() : base(ViewWrapperImpl.CustomViewBehaviour.VIEW_BEHAVIOUR_DEFAULT)
+        // Called by DALi Builder if it finds a StarRating control in a JSON file
+        static CustomView CreateInstance()
+        {
+          return new StarRating();
+        }
+
+        // static constructor registers the control type (only runs once)
+        static StarRating()
+        {
+          // ViewRegistry registers control type with DALi type registery
+          // also uses introspection to find any properties that need to be registered with type registry
+          ViewRegistry.Instance.Register(CreateInstance, typeof(StarRating) );
+        }
+
+        public StarRating() : base(typeof(StarRating).Name, ViewWrapperImpl.CustomViewBehaviour.VIEW_BEHAVIOUR_DEFAULT)
         {
         }
 
@@ -229,6 +243,8 @@ namespace MyCSharpExample
         [STAThread]
         static void Main(string[] args)
         {
+            System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (typeof(MyCSharpExample.StarRating).TypeHandle);
+
             Example example = new Example(Application.NewApplication());
             example.MainLoop ();
         }

diff --git a/NUISamples/NUISamples.TizenTV/examples/dali-test.cs b/NUISamples/NUISamples.TizenTV/examples/dali-test.cs
index 9c02eee..ce7899b 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/dali-test.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/dali-test.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,338 +21,412 @@ using Dali;
 
 namespace MyCSharpExample
 {
-  class Example
-  {
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate void CallbackDelegate(IntPtr appPtr); // void, void delgate
-
-    private Dali.Application _application;
-
-    public Example(Dali.Application application)
-    {
-      _application = application;
-      Console.WriteLine( "InitSignal connection count = " + _application.InitSignal().GetConnectionCount() );
-
-      _application.Initialized += Initialize;
-      Console.WriteLine( "InitSignal connection count = " + _application.InitSignal().GetConnectionCount() );
-    }
-
-    public void Initialize(object source, NUIApplicationInitEventArgs e)
-    {
-
-      OperatorTests();
-
-      Handle handle = new Handle();
-      int myPropertyIndex = handle.RegisterProperty("myProperty", new Property.Value(10.0f), Property.AccessMode.READ_WRITE);
-      float myProperty = 0.0f;
-      handle.GetProperty(myPropertyIndex).Get(ref myProperty);
-      Console.WriteLine( "myProperty value: " + myProperty );
-
-      int myPropertyIndex2 = handle.RegisterProperty("myProperty2", new Property.Value(new Size(5.0f, 5.0f)), Property.AccessMode.READ_WRITE);
-      Size myProperty2 = new Size(0.0f, 0.0f);
-      handle.GetProperty(myPropertyIndex2).Get(myProperty2);
-      Console.WriteLine( "myProperty2 value: " + myProperty2.W + ", " + myProperty2.H );
-
-      Actor actor = new Actor();
-      actor.Size = new Position(200.0f, 200.0f, 0.0f);
-      actor.Name = "MyActor";
-      actor.Color = new Color(1.0f, 0.0f, 1.0f, 0.8f);
-      Console.WriteLine("Actor id: {0}", actor.GetId());
-      Console.WriteLine("Actor size: " + actor.Size.X + ", " + actor.Size.Y);
-      Console.WriteLine("Actor name: " + actor.Name);
-
-      Stage stage = Stage.GetCurrent();
-      stage.BackgroundColor = Color.White;
-
-      Size stageSize = stage.Size;
-      Console.WriteLine("Stage size: " + stageSize.W + ", " + stageSize.H);
-      stage.Add(actor);
-
-      TextLabel text = new TextLabel("Hello Mono World");
-      text.ParentOrigin = NDalic.ParentOriginCenter;
-      text.AnchorPoint = NDalic.AnchorPointCenter;
-      text.HorizontalAlignment = "CENTER";
-      stage.Add(text);
-
-      Console.WriteLine( "Text label text:  " + text.Text );
-
-      Console.WriteLine( "Text label point size:  " + text.PointSize );
-      text.PointSize = 32.0f;
-      Console.WriteLine( "Text label new point size:  " + text.PointSize );
-
-      using (RectInteger ri = new RectInteger(02,05,20,30))
-      {
-        Console.WriteLine( "    Created " + ri );
-        Console.WriteLine( "    IsEmpty() =  " + ri.IsEmpty() );
-        Console.WriteLine( "    Left =  " + ri.Left() );
-        Console.WriteLine( "    Right =  " + ri.Right() );
-        Console.WriteLine( "    Top  = " + ri.Top() );
-        Console.WriteLine( "    Bottom  = " + ri.Bottom() );
-        Console.WriteLine( "    Area  = " + ri.Area() );
-      }
-      Console.WriteLine( " *************************" );
-      using (RectInteger ri2 = new RectInteger(02,05,20,30))
-      {
-        Console.WriteLine( "    Created " + ri2 );
-        ri2.Set(1,1,40,40);
-        Console.WriteLine( "    IsEmpty() =  " + ri2.IsEmpty() );
-        Console.WriteLine( "    Left =  " + ri2.Left() );
-        Console.WriteLine( "    Right =  " + ri2.Right() );
-        Console.WriteLine( "    Top  = " + ri2.Top() );
-        Console.WriteLine( "    Bottom  = " + ri2.Bottom() );
-        Console.WriteLine( "    Area  = " + ri2.Area() );
-      }
-      Console.WriteLine( " *************************" );
-      using (RectDouble rd = new RectDouble(02,05,20.5,30.5))
-      {
-        Console.WriteLine( "    Created " + rd );
-        Console.WriteLine( "    IsEmpty() =  " + rd.IsEmpty() );
-        Console.WriteLine( "    Left =  " + rd.Left() );
-        Console.WriteLine( "    Right =  " + rd.Right() );
-        Console.WriteLine( "    Top  = " + rd.Top() );
-        Console.WriteLine( "    Bottom  = " + rd.Bottom() );
-        Console.WriteLine( "    Area  = " + rd.Area() );
-      }
-      Console.WriteLine( " *************************" );
-      RectDouble rd2 = new RectDouble();
-      rd2.x = 10;
-      rd2.y = 10;
-      rd2.width = 20;
-      rd2.height = 20;
-      Console.WriteLine( "    Created " + rd2 );
-      Console.WriteLine( "    IsEmpty() =  " + rd2.IsEmpty() );
-      Console.WriteLine( "    Left =  " + rd2.Left() );
-      Console.WriteLine( "    Right =  " + rd2.Right() );
-      Console.WriteLine( "    Top  = " + rd2.Top() );
-      Console.WriteLine( "    Bottom  = " + rd2.Bottom() );
-      Console.WriteLine( "    Area  = " + rd2.Area() );
-
-      Console.WriteLine( " *************************" );
-      Size Size = new Size(100, 50);
-      Console.WriteLine( "    Created " + Size );
-      Console.WriteLine( "    Size x =  " + Size.W + ", y = " + Size.H );
-      Size += new Size(20, 20);
-      Console.WriteLine( "    Size x =  " + Size.W + ", y = " + Size.H );
-      Size.W += 10;
-      Size.H += 10;
-      Console.WriteLine( "    Size width =  " + Size.W + ", height = " + Size.H );
-
-      Console.WriteLine( " *************************" );
-      Position Position = new Position(20, 100, 50);
-      Console.WriteLine( "    Created " + Position );
-      Console.WriteLine( "    Position x =  " + Position.X + ", y = " + Position.Y + ", z = " + Position.Z );
-      Position += new Position(20, 20, 20);
-      Console.WriteLine( "    Position x =  " + Position.X + ", y = " + Position.Y + ", z = " + Position.Z );
-      Position.X += 10;
-      Position.Y += 10;
-      Position.Z += 10;
-      Console.WriteLine( "    Position width =  " + Position.X + ", height = " + Position.Y + ", depth = " + Position.Z );
-      Position parentOrigin = new Dali.Position(NDalic.ParentOriginBottomRight);
-      Console.WriteLine( "    parentOrigin x =  " + parentOrigin.X + ", y = " + parentOrigin.Y + ", z = " + parentOrigin.Z );
-
-      Console.WriteLine( " *************************" );
-      Color color = new Color(20, 100, 50, 200);
-      Console.WriteLine( "    Created " + color );
-      Console.WriteLine( "    Color R =  " + color.R + ", G = " + color.G + ", B = " + color.B + ", A = " + color.A );
-      color += new Color(20, 20, 20, 20);
-      Console.WriteLine( "    Color R =  " + color.R + ", G = " + color.G + ", B = " + color.B + ", A = " + color.A );
-      color.R += 10;
-      color.G += 10;
-      color.B += 10;
-      color.A += 10;
-      Console.WriteLine( "    Color r =  " + color.R + ", g = " + color.G + ", b = " + color.B + ", a = " + color.A );
-    }
-
-
-  public void OperatorTests()
-  {
-    Actor actor = new Actor();
-    Actor differentActor = new Actor();
-    Actor actorSame = actor;
-    Actor nullActor = null;
-
-      // test the true operator
-    if ( actor )
-    {
-      Console.WriteLine ("BaseHandle Operator true (actor) : test passed ");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator true (actor): test failed ");
-    }
-
-    Actor parent = actor.GetParent ();
-
-    if ( parent )
-    {
-      Console.WriteLine ("Handle with Empty body  :failed ");
-    }
-    else
-    {
-      Console.WriteLine ("Valid with Empty body  :passed ");
-    }
-
-    actor.Add( differentActor );
-    // here we test two different C# objects, which on the native side have the same body/ ref-object
-    if ( actor == differentActor.GetParent() )
-    {
-       Console.WriteLine ("actor == differentActor.GetParent() :passed ");
-    }
-    else
-    {
-      Console.WriteLine ("actor == differentActor.GetParent() :failed ");
-    }
-
-    if ( differentActor == differentActor.GetParent() )
-    {
-       Console.WriteLine ("differentActor == differentActor.GetParent() :failed ");
-    }
-    else
-    {
-      Console.WriteLine ("differentActor == differentActor.GetParent() :passed ");
-    }
-
-
-    if ( nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator true (nullActor) : test failed ");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator true (nullActor): test passed ");
-    }
-
-    // ! operator
-    if ( !actor )
-    {
-      Console.WriteLine ("BaseHandle Operator !(actor) : test failed ");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator !(actor): test passed ");
-    }
-
-    if ( !nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator !(nullActor) : test passed ");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator !(nullActor): test failed ");
-    }
-
-    // Note: operator false only used inside & operator
-    // test equality operator ==
-    if ( actor == actorSame )
-    {
-      Console.WriteLine ("BaseHandle Operator  (actor == actorSame) : test passed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator  (actor == actorSame) : test failed");
+    class Example
+    {
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        delegate void CallbackDelegate(IntPtr appPtr); // void, void delgate
+
+        private Dali.Application _application;
+
+        public Example(Dali.Application application)
+        {
+            _application = application;
+            Console.WriteLine( "InitSignal connection count = " + _application.InitSignal().GetConnectionCount() );
+
+            _application.Initialized += Initialize;
+            Console.WriteLine( "InitSignal connection count = " + _application.InitSignal().GetConnectionCount() );
+        }
+
+        public void Initialize(object source, NUIApplicationInitEventArgs e)
+        {
+            OperatorTests();
+
+            CustomViewPropertyTest();
+
+            Handle handle = new Handle();
+            int myPropertyIndex = handle.RegisterProperty("myProperty", new Property.Value(10.0f), Property.AccessMode.READ_WRITE);
+            float myProperty = 0.0f;
+            handle.GetProperty(myPropertyIndex).Get(ref myProperty);
+            Console.WriteLine( "myProperty value: " + myProperty );
+
+            int myPropertyIndex2 = handle.RegisterProperty("myProperty2", new Property.Value(new Size(5.0f, 5.0f)), Property.AccessMode.READ_WRITE);
+            Size myProperty2 = new Size(0.0f, 0.0f);
+            handle.GetProperty(myPropertyIndex2).Get(myProperty2);
+            Console.WriteLine( "myProperty2 value: " + myProperty2.W + ", " + myProperty2.H );
+
+            Actor actor = new Actor();
+            actor.Size = new Position(200.0f, 200.0f, 0.0f);
+            actor.Name = "MyActor";
+            actor.Color = new Color(1.0f, 0.0f, 1.0f, 0.8f);
+            Console.WriteLine("Actor id: {0}", actor.GetId());
+            Console.WriteLine("Actor size: " + actor.Size.X + ", " + actor.Size.Y);
+            Console.WriteLine("Actor name: " + actor.Name);
+
+            Stage stage = Stage.GetCurrent();
+            stage.BackgroundColor = Color.White;
+            Size stageSize = stage.Size;
+            Console.WriteLine("Stage size: " + stageSize.W + ", " + stageSize.H);
+            stage.Add(actor);
+
+            TextLabel text = new TextLabel("Hello Mono World");
+            text.ParentOrigin = NDalic.ParentOriginCenter;
+            text.AnchorPoint = NDalic.AnchorPointCenter;
+            text.HorizontalAlignment = "CENTER";
+            stage.Add(text);
+
+            Console.WriteLine( "Text label text:  " + text.Text );
+
+            Console.WriteLine( "Text label point size:  " + text.PointSize );
+            text.PointSize = 32.0f;
+            Console.WriteLine( "Text label new point size:  " + text.PointSize );
+
+            RectanglePaddingClassTest();
+
+            Console.WriteLine( " *************************" );
+            Size Size = new Size(100, 50);
+            Console.WriteLine( "    Created " + Size );
+            Console.WriteLine( "    Size x =  " + Size.W + ", y = " + Size.H );
+            Size += new Size(20, 20);
+            Console.WriteLine( "    Size x =  " + Size.W + ", y = " + Size.H );
+            Size.W += 10;
+            Size.H += 10;
+            Console.WriteLine( "    Size width =  " + Size.W + ", height = " + Size.H );
+
+            Console.WriteLine( " *************************" );
+            Position Position = new Position(20, 100, 50);
+            Console.WriteLine( "    Created " + Position );
+            Console.WriteLine( "    Position x =  " + Position.X + ", y = " + Position.Y + ", z = " + Position.Z );
+            Position += new Position(20, 20, 20);
+            Console.WriteLine( "    Position x =  " + Position.X + ", y = " + Position.Y + ", z = " + Position.Z );
+            Position.X += 10;
+            Position.Y += 10;
+            Position.Z += 10;
+            Console.WriteLine( "    Position width =  " + Position.X + ", height = " + Position.Y + ", depth = " + Position.Z );
+            Position parentOrigin = new Dali.Position(NDalic.ParentOriginBottomRight);
+            Console.WriteLine( "    parentOrigin x =  " + parentOrigin.X + ", y = " + parentOrigin.Y + ", z = " + parentOrigin.Z );
+
+            Console.WriteLine( " *************************" );
+            Color color = new Color(20, 100, 50, 200);
+            Console.WriteLine( "    Created " + color );
+            Console.WriteLine( "    Color R =  " + color.R + ", G = " + color.G + ", B = " + color.B + ", A = " + color.A );
+            color += new Color(20, 20, 20, 20);
+            Console.WriteLine( "    Color R =  " + color.R + ", G = " + color.G + ", B = " + color.B + ", A = " + color.A );
+            color.R += 10;
+            color.G += 10;
+            color.B += 10;
+            color.A += 10;
+            Console.WriteLine( "    Color r =  " + color.R + ", g = " + color.G + ", b = " + color.B + ", a = " + color.A );
+        }
+
+        public void RectanglePaddingClassTest()
+        {
+            using (Rectangle r1 = new Rectangle(2, 5, 20, 30))
+            {
+                Console.WriteLine( "    Created " + r1 );
+                Console.WriteLine( "    IsEmpty() =  " + r1.IsEmpty() );
+                Console.WriteLine( "    Left =  " + r1.Left() );
+                Console.WriteLine( "    Right =  " + r1.Right() );
+                Console.WriteLine( "    Top  = " + r1.Top() );
+                Console.WriteLine( "    Bottom  = " + r1.Bottom() );
+                Console.WriteLine( "    Area  = " + r1.Area() );
+            }
+
+            Console.WriteLine( " *************************" );
+
+            using (Rectangle r2 = new Rectangle(2, 5, 20, 30))
+            {
+                Console.WriteLine( "    Created " + r2 );
+                r2.Set(1,1,40,40);
+                Console.WriteLine( "    IsEmpty() =  " + r2.IsEmpty() );
+                Console.WriteLine( "    Left =  " + r2.Left() );
+                Console.WriteLine( "    Right =  " + r2.Right() );
+                Console.WriteLine( "    Top  = " + r2.Top() );
+                Console.WriteLine( "    Bottom  = " + r2.Bottom() );
+                Console.WriteLine( "    Area  = " + r2.Area() );
+            }
+
+            Console.WriteLine( " *************************" );
+
+            Rectangle r3 = new Rectangle(10, 10, 20, 20);
+            Rectangle r4 = new Rectangle(10, 10, 20, 20);
+
+            if (r3 == r4)
+            {
+                Console.WriteLine("r3 == r4");
+            }
+            else
+            {
+                Console.WriteLine("r3 != r4");
+            }
+
+            r4 = new Rectangle(12, 10, 20, 20);
+
+            if (r3 == r4)
+            {
+                Console.WriteLine("r3 == r4");
+            }
+            else
+            {
+                Console.WriteLine("r3 != r4");
+            }
+
+            PaddingType p1 = new PaddingType(10.5f, 10.7f, 20.8f, 20.8f);
+            PaddingType p2 = new PaddingType(10.5f, 10.7f, 20.8f, 20.8f);
+
+            if (p1 == p2)
+            {
+                Console.WriteLine("p1 == p2");
+            }
+            else
+            {
+                Console.WriteLine("p1 != p2");
+            }
+
+            p2 = new PaddingType(12.0f, 10.7f, 20.2f, 20.0f);
+
+            if (p1 == p2)
+            {
+                Console.WriteLine("p1 == p2");
+            }
+            else
+            {
+                Console.WriteLine("p1 != p2");
+            }
+        }
+
+        public void OperatorTests()
+        {
+            Actor actor = new Actor();
+            Actor differentActor = new Actor();
+            Actor actorSame = actor;
+            Actor nullActor = null;
+
+            // test the true operator
+            if ( actor )
+            {
+                Console.WriteLine ("BaseHandle Operator true (actor) : test passed ");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator true (actor): test failed ");
+            }
+
+            Actor parent = actor.GetParent ();
+
+            if ( parent )
+            {
+                Console.WriteLine ("Handle with Empty body  :failed ");
+            }
+            else
+            {
+                Console.WriteLine ("Valid with Empty body  :passed ");
+            }
+
+            actor.Add( differentActor );
+
+            // here we test two different C# objects, which on the native side have the same body/ ref-object
+            if ( actor == differentActor.GetParent() )
+            {
+                Console.WriteLine ("actor == differentActor.GetParent() :passed ");
+            }
+            else
+            {
+                Console.WriteLine ("actor == differentActor.GetParent() :failed ");
+            }
+
+            if ( differentActor == differentActor.GetParent() )
+            {
+                Console.WriteLine ("differentActor == differentActor.GetParent() :failed ");
+            }
+            else
+            {
+                Console.WriteLine ("differentActor == differentActor.GetParent() :passed ");
+            }
+
+            if ( nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator true (nullActor) : test failed ");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator true (nullActor): test passed ");
+            }
+
+            // ! operator
+            if ( !actor )
+            {
+                Console.WriteLine ("BaseHandle Operator !(actor) : test failed ");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator !(actor): test passed ");
+            }
+
+            if ( !nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator !(nullActor) : test passed ");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator !(nullActor): test failed ");
+            }
+
+            // Note: operator false only used inside & operator
+            // test equality operator ==
+            if ( actor == actorSame )
+            {
+                Console.WriteLine ("BaseHandle Operator  (actor == actorSame) : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator  (actor == actorSame) : test failed");
+            }
+
+            if ( actor == differentActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor == differentActor) : test failed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor == differentActor) : test passed");
+            }
+
+            if ( actor == nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor == nullActor) : test failed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor == nullActor) : test passed");
+            }
+
+            if ( nullActor == nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor == nullActor) : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor == nullActor) : test failed");
+            }
+
+            // test || operator
+            if ( actor || actorSame )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor || actorSame) : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor || actorSame) : test failed");
+            }
+
+            if ( actor || nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor || nullActor) : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor || nullActor) : test failed");
+            }
+
+            if ( nullActor || nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor || nullActor) : test failed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor || nullActor) : test passed");
+            }
+
+            // test && operator
+            if ( actor && actorSame )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor && actorSame) : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor && actorSame) : test failed");
+            }
+
+            if ( actor && nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (actor && nullActor) : test failed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (actor && nullActor) : test passed");
+            }
+
+            if ( nullActor && nullActor )
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor && nullActor) : test failed");
+            }
+            else
+            {
+                Console.WriteLine ("BaseHandle Operator (nullActor && nullActor) : test passed");
+            }
+        }
+
+        public void CustomViewPropertyTest()
+        {
+            // Create a Spin control
+            Spin spin = new Spin();
+
+            // Background property
+            Property.Map background = new Property.Map();
+            background.Add( Dali.Constants.Visual.Property.Type, new Property.Value((int)Dali.Constants.Visual.Type.Color) )
+                .Add( Dali.Constants.ColorVisualProperty.MixColor, new Property.Value(Color.Red) );
+            spin.Background = background;
+
+            background = spin.Background;
+            Vector4 backgroundColor = new Vector4();
+            background.Find(Dali.Constants.ColorVisualProperty.MixColor).Get(backgroundColor);
+            if( backgroundColor == Color.Red )
+            {
+                Console.WriteLine ("Custom View Background property : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("Custom View Background property : test failed");
+            }
+
+            // BackgroundColor property
+            spin.BackgroundColor = Color.Yellow;
+            if(spin.BackgroundColor == Color.Yellow)
+            {
+                Console.WriteLine ("Custom View BackgroundColor property : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("Custom View BackgroundColor property : test failed");
+            }
+
+            // StyleName property
+            spin.StyleName = "MyCustomStyle";
+            if(spin.StyleName == "MyCustomStyle")
+            {
+                Console.WriteLine ("Custom View StyleName property : test passed");
+            }
+            else
+            {
+                Console.WriteLine ("Custom View StyleName property : test failed");
+            }
+        }
+
+        public void MainLoop()
+        {
+            _application.MainLoop ();
+        }
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Console.WriteLine ("Hello Mono World");
+
+            Example example = new Example(Application.NewApplication());
+            example.MainLoop ();
+        }
     }
-
-    if ( actor == differentActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor == differentActor) : test failed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor == differentActor) : test passed");
-    }
-
-    if ( actor == nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor == nullActor) : test failed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor == nullActor) : test passed");
-    }
-
-    if ( nullActor == nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor == nullActor) : test passed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor == nullActor) : test failed");
-    }
-
-    // test || operator
-    if ( actor || actorSame )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor || actorSame) : test passed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor || actorSame) : test failed");
-    }
-
-    if ( actor || nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor || nullActor) : test passed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor || nullActor) : test failed");
-    }
-
-    if ( nullActor || nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor || nullActor) : test failed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor || nullActor) : test passed");
-    }
-
-
-    // test && operator
-    if ( actor && actorSame )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor && actorSame) : test passed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor && actorSame) : test failed");
-    }
-
-    if ( actor && nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (actor && nullActor) : test failed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (actor && nullActor) : test passed");
-    }
-
-    if ( nullActor && nullActor )
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor && nullActor) : test failed");
-    }
-    else
-    {
-      Console.WriteLine ("BaseHandle Operator (nullActor && nullActor) : test passed");
-    }
-
-  }
-
-    public void MainLoop()
-    {
-      _application.MainLoop ();
-    }
-
-    /// <summary>
-    /// The main entry point for the application.
-    /// </summary>
-    [STAThread]
-      static void Main(string[] args)
-      {
-        Console.WriteLine ("Hello Mono World");
-
-        Example example = new Example(Application.NewApplication());
-        example.MainLoop ();
-      }
-  }
 }

diff --git a/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json.cs b/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json.cs
index dbc388c..415e53b 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json.cs
@@ -17,7 +17,7 @@
 
 using System;
 using System.Runtime.InteropServices;
-using Dali;
+using Tizen.NUI;
 
 namespace MyCSharpExample
 {
@@ -25,13 +25,13 @@ namespace MyCSharpExample
 
     class Example
     {
-        private Dali.Application _application;
+        private Application _application;
         private Spin _spinYear;  // spin control for year
         private Spin _spinMonth; // spin control for month
         private Spin _spinDay;   // spin control for day
         private Builder _builder; // DALi Builder
 
-        public Example(Dali.Application application)
+        public Example(Application application)
         {
             _application = application;
             _application.Initialized += Initialize;
@@ -40,7 +40,7 @@ namespace MyCSharpExample
         public void Initialize(object source, NUIApplicationInitEventArgs e)
         {
 
-            Stage stage = Stage.GetCurrent();
+            Stage stage = Stage.Instance;
             stage.BackgroundColor = Color.White;
 
             // load date JSON template...
@@ -49,18 +49,18 @@ namespace MyCSharpExample
 
             // Optional constant to see logging information coming out
             // of DALi JSON parser (builder)
-            Property.Map constants = new  Property.Map();
-            constants.Insert( "CONFIG_SCRIPT_LOG_LEVEL",  new Property.Value( "Verbose") );
+            PropertyMap constants = new  PropertyMap();
+            constants.Insert( "CONFIG_SCRIPT_LOG_LEVEL",  new PropertyValue( "Verbose") );
             _builder.AddConstants( constants );
 
-            _builder.LoadFromFile( "./json/date-picker.json" );
+            _builder.LoadFromFile("/home/owner/apps_rw/NUISamples.TizenTV/res/json/date-picker-template.json");
 
             // create the date-picker from the template in the json file
             BaseHandle handle =  _builder.Create( "date-picker");
 
             Actor actorTree =  Actor.DownCast( handle );
 
-            stage.Add( actorTree );
+            stage.GetDefaultLayer().Add( actorTree );
 
             Actor year  = actorTree.FindChildByName("Year");
             Actor month  =  actorTree.FindChildByName("Month" );
@@ -76,46 +76,46 @@ namespace MyCSharpExample
             _spinDay.Value = 23;
 
 
-            _spinYear.SetKeyboardFocusable(true);
-            _spinMonth.SetKeyboardFocusable(true);
-            _spinDay.SetKeyboardFocusable(true);
+            _spinYear.Focusable = (true);
+            _spinMonth.Focusable = (true);
+            _spinDay.Focusable = (true);
 
 
             FocusManager keyboardFocusManager = FocusManager.Instance;
             keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange;
-            keyboardFocusManager.FocusedActorEnterKeyPressed += OnFocusedActorEnterKeyPressed;
+            keyboardFocusManager.FocusedViewEnterKeyPressed += OnFocusedActorEnterKeyPressed;
 
         }
 
-        private Actor OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e)
+        private View OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e)
         {
-            Actor nextFocusActor = e.Proposed;
+            View nextFocusActor = e.ProposedView;
 
             // When nothing has been focused initially, focus the text field in the first spin
-            if (!e.Current && !e.Proposed)
+            if (!e.CurrentView && !e.ProposedView)
             {
                 nextFocusActor = _spinYear.SpinText;
             }
-            else if(e.Direction == View.KeyboardFocus.Direction.LEFT)
+            else if(e.Direction == View.FocusDirection.Left)
             {
                 // Move the focus to the spin in the left of the current focused spin
-                if(e.Current == _spinMonth.SpinText)
+                if(e.CurrentView == _spinMonth.SpinText)
                 {
                     nextFocusActor = _spinYear.SpinText;
                 }
-                else if(e.Current == _spinDay.SpinText)
+                else if(e.CurrentView == _spinDay.SpinText)
                 {
                     nextFocusActor = _spinMonth.SpinText;
                 }
             }
-            else if(e.Direction == View.KeyboardFocus.Direction.RIGHT)
+            else if(e.Direction == View.FocusDirection.Right)
             {
                 // Move the focus to the spin in the right of the current focused spin
-                if(e.Current == _spinYear.SpinText)
+                if(e.CurrentView == _spinYear.SpinText)
                 {
                     nextFocusActor = _spinMonth.SpinText;
                 }
-                else if(e.Current == _spinMonth.SpinText)
+                else if(e.CurrentView == _spinMonth.SpinText)
                 {
                     nextFocusActor = _spinDay.SpinText;
                 }
@@ -124,26 +124,26 @@ namespace MyCSharpExample
             return nextFocusActor;
         }
 
-        private void OnFocusedActorEnterKeyPressed(object source, FocusManager.FocusedActorEnterKeyEventArgs e)
+        private void OnFocusedActorEnterKeyPressed(object source, FocusManager.FocusedViewEnterKeyEventArgs e)
         {
             // Make the text field in the current focused spin to take the key input
             KeyInputFocusManager manager = KeyInputFocusManager.Get();
 
-            if (e.Actor == _spinYear.SpinText)
+            if (e.View == _spinYear.SpinText)
             {
                 if (manager.GetCurrentFocusControl() != _spinYear.SpinText)
                 {
                     manager.SetFocus(_spinYear.SpinText);
                 }
             }
-            else if (e.Actor == _spinMonth.SpinText)
+            else if (e.View == _spinMonth.SpinText)
             {
                 if (manager.GetCurrentFocusControl() != _spinMonth.SpinText)
                 {
                     manager.SetFocus(_spinMonth.SpinText);
                 }
             }
-            else if (e.Actor == _spinDay.SpinText)
+            else if (e.View == _spinDay.SpinText)
             {
                 if (manager.GetCurrentFocusControl() != _spinDay.SpinText)
                 {

diff --git a/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
index 314c9a8..a392996 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
@@ -81,14 +81,14 @@ namespace MyCSharpExample
           StartTime = 0,
           EndTime = 500,
           TargetProperty = "Orientation",
-          Destination = new Quaternion( new Radian( new Degree( 180.0f ) ), Vect3.Xaxis)
+          Destination = new Rotation( new Radian( new Degree( 180.0f ) ), Vect3.Xaxis)
         };
         _animation.AnimateTo(_text);
 
         _animation.StartTime = 500;
         _animation.EndTime = 1000;
         _animation.TargetProperty = "Orientation";
-        _animation.Destination = new Quaternion( new Radian( new Degree( 0.0f ) ), Vect3.Xaxis );
+        _animation.Destination = new Rotation( new Radian( new Degree( 0.0f ) ), Vect3.Xaxis );
         _animation.AnimateTo(_text);
 
         _animation.StartTime = 1000;

diff --git a/NUISamples/NUISamples.TizenTV/examples/json-loader.cs b/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
index db00c9e..388b077 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/json-loader.cs
@@ -85,11 +85,8 @@ namespace MyExampleApp
       {
           fileName = args[0];
       }
- 
-      Console.WriteLine("arguments = " + args.Length);
-
-     fileName = "./json/date-picker.json";
 
+      Console.WriteLine("arguments = " + args.Length);
       Example example = new Example(Application.NewApplication(), fileName);
       example.MainLoop ();
     }

diff --git a/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
index 834c4bd..cc42168 100755 (executable)
--- a/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
+++ b/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
@@ -115,7 +115,7 @@ namespace MyCSharpExample
       _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft;
       _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH);
       _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT);
-      _scrollBar.Orientation = new Quaternion( new Radian( new Degree( 270.0f ) ), Vector3.ZAXIS );
+      _scrollBar.Orientation = new Rotation( new Radian( new Degree( 270.0f ) ), Vector3.ZAXIS );
       _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal);
       _scrollView.Add(_scrollBar);
 
@@ -165,8 +165,8 @@ namespace MyCSharpExample
 
         _animation = new Animation(1.0f); // 1 second of duration
 
-        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 180.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.Linear), new TimePeriod(0.0f, 0.5f));
-        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 0.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.Linear), new TimePeriod(0.5f, 0.5f));
+        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Rotation( new Radian( new Degree( 180.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.Linear), new TimePeriod(0.0f, 0.5f));
+        _animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Rotation( new Radian( new Degree( 0.0f ) ), Vector3.XAXIS )), new AlphaFunction(AlphaFunction.BuiltinFunction.Linear), new TimePeriod(0.5f, 0.5f));
 
         // Connect the signal callback for animaiton finished signal
         _animation.Finished += AnimationFinished;

diff --git a/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 686ad83..c137382 100755 (executable)
Binary files a/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/NUISamples/NUISamples.TizenTV/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ

diff --git a/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index d2be2ab..6118a73 100755 (executable)
Binary files a/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ

diff --git a/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 39cf9c8..669a161 100755 (executable)
Binary files a/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/NUISamples/NUISamples/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ

diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj
index 2b3fc17..dddcd65 100755 (executable)
--- a/Tizen.NUI/Tizen.NUI.csproj
+++ b/Tizen.NUI/Tizen.NUI.csproj
@@ -86,18 +86,18 @@
     <Compile Include="src\internal\ControlOrientationType.cs" />\r
     <Compile Include="src\internal\CustomActor.cs" />\r
     <Compile Include="src\internal\CustomActorImpl.cs" />\r
-    <Compile Include="src\internal\DaliApplication.cs" />\r
     <Compile Include="src\internal\DaliEnumConstants.cs" />\r
     <Compile Include="src\internal\DaliEventHandler.cs" />\r
     <Compile Include="src\internal\DaliException.cs" />\r
     <Compile Include="src\internal\DefaultItemLayoutProperty.cs" />\r
     <Compile Include="src\internal\DefaultItemLayoutType.cs" />\r
     <Compile Include="src\internal\DefaultRuler.cs" />\r
-    <Compile Include="src\internal\Degree.cs" />\r
+    <Compile Include="src\public\Degree.cs" />\r
     <Compile Include="src\internal\DepthFunctionType.cs" />\r
     <Compile Include="src\internal\DepthTestModeType.cs" />\r
     <Compile Include="src\internal\DepthWriteModeType.cs" />\r
     <Compile Include="src\internal\DirectionBias.cs" />\r
+    <Compile Include="src\internal\DirectionType.cs" />\r
     <Compile Include="src\internal\DisposeQueue.cs" />\r
     <Compile Include="src\internal\doublep.cs" />\r
     <Compile Include="src\internal\DragAndDropDetector.cs" />\r
@@ -115,7 +115,6 @@
     <Compile Include="src\internal\GaussianBlurView.cs" />\r
     <Compile Include="src\internal\GaussianBlurViewSignal.cs" />\r
     <Compile Include="src\internal\Geometry.cs" />\r
-    <Compile Include="src\internal\Gesture.cs" />\r
     <Compile Include="src\internal\GestureDetector.cs" />\r
     <Compile Include="src\internal\GradientVisualSpreadMethodType.cs" />\r
     <Compile Include="src\internal\GradientVisualUnitsType.cs" />\r
@@ -136,7 +135,6 @@
     <Compile Include="src\internal\KeyInputFocusManager.cs" />\r
     <Compile Include="src\internal\KeyInputFocusSignal.cs" />\r
     <Compile Include="src\internal\LoadingState.cs" />\r
-    <Compile Include="src\internal\LongPressGesture.cs" />\r
     <Compile Include="src\internal\LongPressGestureDetectedSignal.cs" />\r
     <Compile Include="src\internal\LongPressGestureDetector.cs" />\r
     <Compile Include="src\internal\ManualPINVOKE.cs" />\r
@@ -153,16 +151,15 @@
     <Compile Include="src\internal\ObjectCreatedSignal.cs" />\r
     <Compile Include="src\internal\ObjectDestroyedSignal.cs" />\r
     <Compile Include="src\internal\ObjectRegistry.cs" />\r
+    <Compile Include="src\internal\PaddingType.cs" />\r
     <Compile Include="src\internal\PageFactory.cs" />\r
     <Compile Include="src\internal\PagePanSignal.cs" />\r
     <Compile Include="src\internal\PageTurnLandscapeView.cs" />\r
     <Compile Include="src\internal\PageTurnPortraitView.cs" />\r
     <Compile Include="src\internal\PageTurnSignal.cs" />\r
     <Compile Include="src\internal\PageTurnView.cs" />\r
-    <Compile Include="src\internal\PanGesture.cs" />\r
     <Compile Include="src\internal\PanGestureDetectedSignal.cs" />\r
     <Compile Include="src\internal\PanGestureDetector.cs" />\r
-    <Compile Include="src\internal\PinchGesture.cs" />\r
     <Compile Include="src\internal\PinchGestureDetectedSignal.cs" />\r
     <Compile Include="src\internal\PinchGestureDetector.cs" />\r
     <Compile Include="src\internal\PixelData.cs" />\r
@@ -176,12 +173,7 @@
     <Compile Include="src\internal\PropertyRangeManager.cs" />\r
     <Compile Include="src\internal\PropertyRanges.cs" />\r
     <Compile Include="src\internal\PropertyRegistration.cs" />\r
-    <Compile Include="src\internal\Quaternion.cs" />\r
-    <Compile Include="src\internal\Radian.cs" />\r
-    <Compile Include="src\internal\RectDouble.cs" />\r
-    <Compile Include="src\internal\RectFloat.cs" />\r
-    <Compile Include="src\internal\RectInteger.cs" />\r
-    <Compile Include="src\internal\RectUnsignedInteger.cs" />\r
+    <Compile Include="src\public\Radian.cs" />\r
     <Compile Include="src\internal\RefObject.cs" />\r
     <Compile Include="src\internal\RenderBufferFormat.cs" />\r
     <Compile Include="src\internal\Renderer.cs" />\r
@@ -210,7 +202,6 @@
     <Compile Include="src\internal\SliderValueChangedSignal.cs" />\r
     <Compile Include="src\internal\SlotObserver.cs" />\r
     <Compile Include="src\internal\SnapType.cs" />\r
-    <Compile Include="src\internal\spin.cs" />\r
     <Compile Include="src\internal\StageWheelSignal.cs" />\r
     <Compile Include="src\internal\StencilFunctionType.cs" />\r
     <Compile Include="src\internal\StencilOperationType.cs" />\r
@@ -224,6 +215,7 @@
     <Compile Include="src\internal\SWIGTYPE_p_Dali__FunctorDelegate.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_Dali__Internal__TypeRegistry.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs" />\r
+    <Compile Include="src\internal\SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs" />\r
@@ -260,7 +252,7 @@
     <Compile Include="src\internal\SWIGTYPE_p_unsigned_char.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_unsigned_int.cs" />\r
     <Compile Include="src\internal\SWIGTYPE_p_unsigned_short.cs" />\r
-    <Compile Include="src\internal\TapGesture.cs" />\r
+    <Compile Include="src\public\TapGesture.cs" />\r
     <Compile Include="src\internal\TapGestureDetectedSignal.cs" />\r
     <Compile Include="src\internal\TapGestureDetector.cs" />\r
     <Compile Include="src\internal\TextEditorSignal.cs" />\r
@@ -310,24 +302,32 @@
     <Compile Include="src\public\CustomView.cs" />\r
     <Compile Include="src\public\FlexContainer.cs" />\r
     <Compile Include="src\public\FocusManager.cs" />\r
+    <Compile Include="src\public\Gesture.cs" />\r
     <Compile Include="src\public\Hover.cs" />\r
     <Compile Include="src\public\ImageView.cs" />\r
     <Compile Include="src\public\Key.cs" />\r
     <Compile Include="src\public\KeyFrames.cs" />\r
     <Compile Include="src\public\Layer.cs" />\r
-    <Compile Include="src\public\LinearConstrainer.cs" />\r
+    <Compile Include="src\internal\LinearConstrainer.cs" />\r
+    <Compile Include="src\public\LongPressGesture.cs" />\r
+    <Compile Include="src\public\NUIApplication.cs" />\r
+    <Compile Include="src\public\PanGesture.cs" />\r
     <Compile Include="src\public\Path.cs" />\r
-    <Compile Include="src\public\PathConstrainer.cs" />\r
+    <Compile Include="src\internal\PathConstrainer.cs" />\r
+    <Compile Include="src\public\PinchGesture.cs" />\r
     <Compile Include="src\public\Popup.cs" />\r
     <Compile Include="src\public\Position.cs" />\r
     <Compile Include="src\public\ProgressBar.cs" />\r
     <Compile Include="src\public\Property.cs" />\r
     <Compile Include="src\public\PushButton.cs" />\r
     <Compile Include="src\public\RadioButton.cs" />\r
+    <Compile Include="src\public\Rectangle.cs" />\r
     <Compile Include="src\public\RelayoutContainer.cs" />\r
+    <Compile Include="src\public\Rotation.cs" />\r
     <Compile Include="src\public\ScrollBar.cs" />\r
     <Compile Include="src\public\Size.cs" />\r
     <Compile Include="src\public\Slider.cs" />\r
+    <Compile Include="src\public\spin.cs" />\r
     <Compile Include="src\public\Stage.cs" />\r
     <Compile Include="src\public\StyleManager.cs" />\r
     <Compile Include="src\public\TableView.cs" />\r
@@ -382,4 +382,4 @@
       </FlavorProperties>\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/Tizen.NUI/Tizen.NUI.nuspec b/Tizen.NUI/Tizen.NUI.nuspec
index 7c5055b..80ea2ff 100755 (executable)
--- a/Tizen.NUI/Tizen.NUI.nuspec
+++ b/Tizen.NUI/Tizen.NUI.nuspec
@@ -6,7 +6,7 @@
                <authors>Tizen Developers</authors>
                <description>Tizen NUI dll (dali c#) </description>
     <dependencies>
-      <dependency id="Tizen" version="1.0.1" />
+      <dependency id="Tizen.Applications" version="1.0.3"/>
     </dependencies>
        </metadata>
   <files>

diff --git a/Tizen.NUI/bin/Debug/Tizen.Applications.dll b/Tizen.NUI/bin/Debug/Tizen.Applications.dll
index 3a9c4cd..265122a 100755 (executable)
Binary files a/Tizen.NUI/bin/Debug/Tizen.Applications.dll and b/Tizen.NUI/bin/Debug/Tizen.Applications.dll differ

diff --git a/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 14e1eed..813a40c 100755 (executable)
Binary files a/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ

diff --git a/Tizen.NUI/src/internal/AccessibilityActionSignal.cs b/Tizen.NUI/src/internal/AccessibilityActionSignal.cs
index e087fa5..38fd528 100755 (executable)
--- a/Tizen.NUI/src/internal/AccessibilityActionSignal.cs
+++ b/Tizen.NUI/src/internal/AccessibilityActionSignal.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AccessibilityActionSignal : global::System.IDisposable {
+internal class AccessibilityActionSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs b/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs
index 69329e3..7571e6b 100755 (executable)
--- a/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs
+++ b/Tizen.NUI/src/internal/AccessibilityFocusOvershotSignal.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AccessibilityFocusOvershotSignal : global::System.IDisposable {
+internal class AccessibilityFocusOvershotSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/AccessibilityManager.cs b/Tizen.NUI/src/internal/AccessibilityManager.cs
index dcfe800..52109cf 100755 (executable)
--- a/Tizen.NUI/src/internal/AccessibilityManager.cs
+++ b/Tizen.NUI/src/internal/AccessibilityManager.cs
@@ -12,8 +12,8 @@ namespace Tizen.NUI {
 
     using System;
     using System.Runtime.InteropServices;
-    \r
-    public class AccessibilityManager : BaseHandle {
+
+internal class AccessibilityManager : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal AccessibilityManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AccessibilityManager_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ActorContainer.cs b/Tizen.NUI/src/internal/ActorContainer.cs
index debd8eb..524a943 100755 (executable)
--- a/Tizen.NUI/src/internal/ActorContainer.cs
+++ b/Tizen.NUI/src/internal/ActorContainer.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+internal class ActorContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<Actor>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
@@ -26,10 +26,15 @@ public class ActorContainer : global::System.IDisposable, global::System.Collect
   }
 
   ~ActorContainer() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -42,6 +47,7 @@ public class ActorContainer : global::System.IDisposable, global::System.Collect
     }
   }
 
+
   public ActorContainer(global::System.Collections.ICollection c) : this() {
     if (c == null)
       throw new global::System.ArgumentNullException("c");

diff --git a/Tizen.NUI/src/internal/ActorHoverSignal.cs b/Tizen.NUI/src/internal/ActorHoverSignal.cs
index 11ea3ec..d5091a3 100755 (executable)
--- a/Tizen.NUI/src/internal/ActorHoverSignal.cs
+++ b/Tizen.NUI/src/internal/ActorHoverSignal.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorHoverSignal : global::System.IDisposable {
+internal class ActorHoverSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ActorHoverSignal : global::System.IDisposable {
   }
 
   ~ActorHoverSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ActorHoverSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ActorHoverSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ActorSignal.cs b/Tizen.NUI/src/internal/ActorSignal.cs
index bc12edc..3720a95 100755 (executable)
--- a/Tizen.NUI/src/internal/ActorSignal.cs
+++ b/Tizen.NUI/src/internal/ActorSignal.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorSignal : global::System.IDisposable {
+internal class ActorSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ActorTouchDataSignal.cs b/Tizen.NUI/src/internal/ActorTouchDataSignal.cs
index f0fc274..245be9f 100755 (executable)
--- a/Tizen.NUI/src/internal/ActorTouchDataSignal.cs
+++ b/Tizen.NUI/src/internal/ActorTouchDataSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ActorTouchDataSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ActorTouchDataSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ActorTouchDataSignal : global::System.IDisposable {
   }
 
   ~ActorTouchDataSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ActorTouchDataSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ActorTouchDataSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ActorWheelSignal.cs b/Tizen.NUI/src/internal/ActorWheelSignal.cs
index cf7f8db..2f0be3b 100755 (executable)
--- a/Tizen.NUI/src/internal/ActorWheelSignal.cs
+++ b/Tizen.NUI/src/internal/ActorWheelSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ActorWheelSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ActorWheelSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ActorWheelSignal : global::System.IDisposable {
   }
 
   ~ActorWheelSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ActorWheelSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ActorWheelSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/Alignment.cs b/Tizen.NUI/src/internal/Alignment.cs
index 5acc2cd..429b74f 100755 (executable)
--- a/Tizen.NUI/src/internal/Alignment.cs
+++ b/Tizen.NUI/src/internal/Alignment.cs
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Alignment : View {
+internal class Alignment : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Alignment(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Alignment_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/AngleAxis.cs b/Tizen.NUI/src/internal/AngleAxis.cs
index a5c79cc..34293d6 100755 (executable)
--- a/Tizen.NUI/src/internal/AngleAxis.cs
+++ b/Tizen.NUI/src/internal/AngleAxis.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AngleAxis : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class AngleAxis : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/AngleThresholdPair.cs b/Tizen.NUI/src/internal/AngleThresholdPair.cs
index 186f190..d7bfa22 100755 (executable)
--- a/Tizen.NUI/src/internal/AngleThresholdPair.cs
+++ b/Tizen.NUI/src/internal/AngleThresholdPair.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AngleThresholdPair : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class AngleThresholdPair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs b/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs
index 9d4c53b..62b76aa 100755 (executable)
--- a/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs
+++ b/Tizen.NUI/src/internal/AnimatablePropertyComponentRegistration.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AnimatablePropertyComponentRegistration : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class AnimatablePropertyComponentRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class AnimatablePropertyComponentRegistration : global::System.IDisposabl
   }
 
   ~AnimatablePropertyComponentRegistration() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class AnimatablePropertyComponentRegistration : global::System.IDisposabl
     }
   }
 
+
   public AnimatablePropertyComponentRegistration(TypeRegistration registered, string name, int index, int baseIndex, uint componentIndex) : this(NDalicPINVOKE.new_AnimatablePropertyComponentRegistration(TypeRegistration.getCPtr(registered), name, index, baseIndex, componentIndex), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs b/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs
index 29e44c5..5107477 100755 (executable)
--- a/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs
+++ b/Tizen.NUI/src/internal/AnimatablePropertyRegistration.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AnimatablePropertyRegistration : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class AnimatablePropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class AnimatablePropertyRegistration : global::System.IDisposable {
   }
 
   ~AnimatablePropertyRegistration() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class AnimatablePropertyRegistration : global::System.IDisposable {
     }
   }
 
+
   public AnimatablePropertyRegistration(TypeRegistration registered, string name, int index, PropertyType type) : this(NDalicPINVOKE.new_AnimatablePropertyRegistration__SWIG_0(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/AnimationSignal.cs b/Tizen.NUI/src/internal/AnimationSignal.cs
index 52f3ed0..374dd69 100755 (executable)
--- a/Tizen.NUI/src/internal/AnimationSignal.cs
+++ b/Tizen.NUI/src/internal/AnimationSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AnimationSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class AnimationSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Any.cs b/Tizen.NUI/src/internal/Any.cs
index fe00c2b..a5837c2 100755 (executable)
--- a/Tizen.NUI/src/internal/Any.cs
+++ b/Tizen.NUI/src/internal/Any.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Any : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class Any : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Application.cs b/Tizen.NUI/src/internal/Application.cs
index bca2be3..d9244e8 100755 (executable)
--- a/Tizen.NUI/src/internal/Application.cs
+++ b/Tizen.NUI/src/internal/Application.cs
@@ -8,7 +8,8 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI\r
+{
 
     using System;
     using System.Runtime.InteropServices;
@@ -18,24 +19,24 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationInitEventArgs : EventArgs
-    {
-    private Application _application;
-
-      /**
-        * @brief Application - is the application that is being initialized
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+\r
+        /**
+          * @brief Application - is the application that is being initialized
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -43,23 +44,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationTerminateEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Terminated
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being Terminated
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -67,23 +68,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationPauseEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Paused
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being Paused
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -91,23 +92,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationResumeEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Resumed
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being Resumed
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -115,23 +116,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationResetEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Reset
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being Reset
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -139,23 +140,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationResizeEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Resized
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being Resized
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -163,23 +164,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationLanguageChangedEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected with Device's language change
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being affected with Device's language change
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -187,23 +188,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationRegionChangedEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected with Device's region change
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being affected with Device's region change
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -211,23 +212,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationBatteryLowEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected when the battery level of the device is low
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being affected when the battery level of the device is low
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -235,23 +236,23 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationMemoryLowEventArgs : EventArgs
-    {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected when the memory level of the device is low
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
+    {\r
+        private Application _application;\r
+        /**
+          * @brief Application - is the application that is being affected when the memory level of the device is low
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
         }
-      }
     }
 
     /**
@@ -259,989 +260,1035 @@ namespace Tizen.NUI {
       *
       */
     public class NUIApplicationAppControlEventArgs : EventArgs
-    {
-    private Application _application;
-    private IntPtr _voidp;
-      /**
-        * @brief Application - is the application that is receiving the launch request from another application
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
-        {
-          _application = value;
-        }
-      }
-      /**
-        * @brief VoidP - contains the information about why the application is launched
-        *
-        */
-    public IntPtr VoidP
-      {
-        get
-        {
-          return _voidp;
+    {\r
+        private Application _application;\r
+        private IntPtr _voidp;\r
+        /**
+          * @brief Application - is the application that is receiving the launch request from another application
+          *
+          */\r
+        public Application Application\r
+        {\r
+            get\r
+            {\r
+                return _application;\r
+            }\r
+            set\r
+            {\r
+                _application = value;\r
+            }\r
+        }\r
+        /**
+          * @brief VoidP - contains the information about why the application is launched
+          *
+          */\r
+        public IntPtr VoidP\r
+        {\r
+            get\r
+            {\r
+                return _voidp;\r
+            }\r
+            set\r
+            {\r
+                _voidp = value;\r
+            }\r
         }
-        set
-        {
-          _voidp = value;
-        }
-      }
-    }
-
-public class Application : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Application(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Application_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Application obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Application() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Application(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationInitEventArgs> _applicationInitEventHandler;
-    private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate;
-
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;
-    private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
-
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationPauseEventArgs> _applicationPauseEventHandler;
-    private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResumeEventArgs> _applicationResumeEventHandler;
-    private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResetEventArgs> _applicationResetEventHandler;
-    private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResizeEventArgs> _applicationResizeEventHandler;
-    private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs> _applicationLanguageChangedEventHandler;
-    private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate;
-
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationRegionChangedEventArgs> _applicationRegionChangedEventHandler;
-    private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationBatteryLowEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationBatteryLowEventArgs> _applicationBatteryLowEventHandler;
-    private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationMemoryLowEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationMemoryLowEventArgs> _applicationMemoryLowEventHandler;
-    private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate;
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp);
-    private DaliEventHandler<object,NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;
-    private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;
-
-    /**
-      * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)
-      *  provided by the user. Initialized signal is emitted when application is initialised
-      */
-    public event DaliEventHandler<object,NUIApplicationInitEventArgs> Initialized
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationInitEventHandler == null)
-          {
-            _applicationInitEventHandler += value;
-
-            _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);
-            this.InitSignal().Connect(_applicationInitEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationInitEventHandler != null)
-          {
-            this.InitSignal().Disconnect(_applicationInitEventCallbackDelegate);
-          }
-
-          _applicationInitEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application InitSignal
-    private void OnApplicationInit(IntPtr data)
-    {
-      NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs();
-
-      // Populate all members of "e" (NUIApplicationInitEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationInitEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationInitEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
-      *  provided by the user. Terminated signal is emitted when application is terminated
-      */
-    public event DaliEventHandler<object,NUIApplicationTerminateEventArgs> Terminated
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationTerminateEventHandler == null)
-          {
-            _applicationTerminateEventHandler += value;
-
-            _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);
-            this.TerminateSignal().Connect(_applicationTerminateEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationTerminateEventHandler != null)
-          {
-            this.TerminateSignal().Disconnect(_applicationTerminateEventCallbackDelegate);
-          }
-
-          _applicationTerminateEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application TerminateSignal
-    private void OnNUIApplicationTerminate(IntPtr data)
-    {
-      NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();
-
-      // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationTerminateEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationTerminateEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
-      * provided by the user. Paused signal is emitted when application is paused
-      */
-    public event DaliEventHandler<object,NUIApplicationPauseEventArgs> Paused
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationPauseEventHandler == null)
-          {
-            _applicationPauseEventHandler += value;
-
-            _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);
-            this.PauseSignal().Connect(_applicationPauseEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationPauseEventHandler != null)
-          {
-            this.PauseSignal().Disconnect(_applicationPauseEventCallbackDelegate);
-          }
-
-          _applicationPauseEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application PauseSignal
-    private void OnNUIApplicationPause(IntPtr data)
-    {
-      NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();
-
-      // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationPauseEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationPauseEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
-      *  provided by the user. Resumed signal is emitted when application is resumed
-      */
-    public event DaliEventHandler<object,NUIApplicationResumeEventArgs> Resumed
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationResumeEventHandler == null)
-          {
-            _applicationResumeEventHandler += value;
-
-            _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);
-            this.ResumeSignal().Connect(_applicationResumeEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationResumeEventHandler != null)
-          {
-            this.ResumeSignal().Disconnect(_applicationResumeEventCallbackDelegate);
-          }
-
-          _applicationResumeEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application ResumeSignal
-    private void OnNUIApplicationResume(IntPtr data)
-    {
-      NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();
-
-      // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationResumeEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResumeEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)
-      *  provided by the user. Reset signal is emitted when application is reset
-      */
-    public event DaliEventHandler<object,NUIApplicationResetEventArgs> Reset
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationResetEventHandler == null)
-          {
-            _applicationResetEventHandler += value;
-
-            _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);
-            this.ResetSignal().Connect(_applicationResetEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationResetEventHandler != null)
-          {
-            this.ResetSignal().Disconnect(_applicationResetEventCallbackDelegate);
-          }
-
-          _applicationResetEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application ResetSignal
-    private void OnNUIApplicationReset(IntPtr data)
-    {
-      NUIApplicationResetEventArgs e = new NUIApplicationResetEventArgs();
-
-      // Populate all members of "e" (NUIApplicationResetEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationResetEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResetEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
-      *  provided by the user. Resized signal is emitted when application is resized
-      */
-    public event DaliEventHandler<object,NUIApplicationResizeEventArgs> Resized
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationResizeEventHandler == null)
-          {
-            _applicationResizeEventHandler += value;
-
-            _applicationResizeEventCallbackDelegate = new NUIApplicationResizeEventCallbackDelegate(OnNUIApplicationResize);
-            this.ResizeSignal().Connect(_applicationResizeEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationResizeEventHandler != null)
-          {
-            this.ResizeSignal().Disconnect(_applicationResizeEventCallbackDelegate);
-          }
-
-          _applicationResizeEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application ResizeSignal
-    private void OnNUIApplicationResize(IntPtr data)
-    {
-      NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();
-
-      // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationResizeEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResizeEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)
-      *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.
-      */
-    public event DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs> LanguageChanged
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationLanguageChangedEventHandler == null)
-          {
-            _applicationLanguageChangedEventHandler += value;
-
-            _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);
-            this.LanguageChangedSignal().Connect(_applicationLanguageChangedEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationLanguageChangedEventHandler != null)
-          {
-            this.LanguageChangedSignal().Disconnect(_applicationLanguageChangedEventCallbackDelegate);
-          }
-
-          _applicationLanguageChangedEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application LanguageChangedSignal
-    private void OnNUIApplicationLanguageChanged(IntPtr data)
-    {
-      NUIApplicationLanguageChangedEventArgs e = new NUIApplicationLanguageChangedEventArgs();
-
-      // Populate all members of "e" (NUIApplicationLanguageChangedEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationLanguageChangedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationLanguageChangedEventHandler(this, e);
-      }
+    }\r
+\r
+    public class Application : BaseHandle\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal Application(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Application_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Application obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        ~Application()\r
+        {\r
+            DisposeQueue.Instance.Add(this);\r
+        }\r
+\r
+        public override void Dispose()\r
+        {\r
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
+\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_Application(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+                base.Dispose();\r
+            }\r
+        }\r
+\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationInitEventArgs> _applicationInitEventHandler;\r
+        private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate;\r
+\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;\r
+        private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;\r
+\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationPauseEventArgs> _applicationPauseEventHandler;\r
+        private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationResumeEventArgs> _applicationResumeEventHandler;\r
+        private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationResetEventArgs> _applicationResetEventHandler;\r
+        private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationResizeEventArgs> _applicationResizeEventHandler;\r
+        private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> _applicationLanguageChangedEventHandler;\r
+        private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate;\r
+\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> _applicationRegionChangedEventHandler;\r
+        private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationBatteryLowEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> _applicationBatteryLowEventHandler;\r
+        private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationMemoryLowEventCallbackDelegate(IntPtr application);\r
+        private DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> _applicationMemoryLowEventHandler;\r
+        private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate;\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp);\r
+        private DaliEventHandler<object, NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;\r
+        private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;\r
+\r
+        /**
+          * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)
+          *  provided by the user. Initialized signal is emitted when application is initialised
+          */\r
+        public event DaliEventHandler<object, NUIApplicationInitEventArgs> Initialized\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationInitEventHandler == null)\r
+                    {\r
+                        _applicationInitEventHandler += value;\r
+\r
+                        _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);\r
+                        this.InitSignal().Connect(_applicationInitEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationInitEventHandler != null)\r
+                    {\r
+                        this.InitSignal().Disconnect(_applicationInitEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationInitEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application InitSignal\r
+        private void OnApplicationInit(IntPtr data)\r
+        {\r
+            NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationInitEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationInitEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationInitEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
+          *  provided by the user. Terminated signal is emitted when application is terminated
+          */\r
+        public event DaliEventHandler<object, NUIApplicationTerminateEventArgs> Terminated\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationTerminateEventHandler == null)\r
+                    {\r
+                        _applicationTerminateEventHandler += value;\r
+\r
+                        _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);\r
+                        this.TerminateSignal().Connect(_applicationTerminateEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationTerminateEventHandler != null)\r
+                    {\r
+                        this.TerminateSignal().Disconnect(_applicationTerminateEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationTerminateEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application TerminateSignal\r
+        private void OnNUIApplicationTerminate(IntPtr data)\r
+        {\r
+            NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationTerminateEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationTerminateEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
+          * provided by the user. Paused signal is emitted when application is paused
+          */\r
+        public event DaliEventHandler<object, NUIApplicationPauseEventArgs> Paused\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationPauseEventHandler == null)\r
+                    {\r
+                        _applicationPauseEventHandler += value;\r
+\r
+                        _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);\r
+                        this.PauseSignal().Connect(_applicationPauseEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationPauseEventHandler != null)\r
+                    {\r
+                        this.PauseSignal().Disconnect(_applicationPauseEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationPauseEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application PauseSignal\r
+        private void OnNUIApplicationPause(IntPtr data)\r
+        {\r
+            NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationPauseEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationPauseEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
+          *  provided by the user. Resumed signal is emitted when application is resumed
+          */\r
+        public event DaliEventHandler<object, NUIApplicationResumeEventArgs> Resumed\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationResumeEventHandler == null)\r
+                    {\r
+                        _applicationResumeEventHandler += value;\r
+\r
+                        _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);\r
+                        this.ResumeSignal().Connect(_applicationResumeEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationResumeEventHandler != null)\r
+                    {\r
+                        this.ResumeSignal().Disconnect(_applicationResumeEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationResumeEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application ResumeSignal\r
+        private void OnNUIApplicationResume(IntPtr data)\r
+        {\r
+            NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationResumeEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationResumeEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)
+          *  provided by the user. Reset signal is emitted when application is reset
+          */\r
+        public event DaliEventHandler<object, NUIApplicationResetEventArgs> Reset\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationResetEventHandler == null)\r
+                    {\r
+                        _applicationResetEventHandler += value;\r
+\r
+                        _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);\r
+                        this.ResetSignal().Connect(_applicationResetEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationResetEventHandler != null)\r
+                    {\r
+                        this.ResetSignal().Disconnect(_applicationResetEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationResetEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application ResetSignal\r
+        private void OnNUIApplicationReset(IntPtr data)\r
+        {\r
+            NUIApplicationResetEventArgs e = new NUIApplicationResetEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationResetEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationResetEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationResetEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
+          *  provided by the user. Resized signal is emitted when application is resized
+          */\r
+        public event DaliEventHandler<object, NUIApplicationResizeEventArgs> Resized\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationResizeEventHandler == null)\r
+                    {\r
+                        _applicationResizeEventHandler += value;\r
+\r
+                        _applicationResizeEventCallbackDelegate = new NUIApplicationResizeEventCallbackDelegate(OnNUIApplicationResize);\r
+                        this.ResizeSignal().Connect(_applicationResizeEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationResizeEventHandler != null)\r
+                    {\r
+                        this.ResizeSignal().Disconnect(_applicationResizeEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationResizeEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application ResizeSignal\r
+        private void OnNUIApplicationResize(IntPtr data)\r
+        {\r
+            NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationResizeEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationResizeEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)
+          *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.
+          */\r
+        public event DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> LanguageChanged\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationLanguageChangedEventHandler == null)\r
+                    {\r
+                        _applicationLanguageChangedEventHandler += value;\r
+\r
+                        _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);\r
+                        this.LanguageChangedSignal().Connect(_applicationLanguageChangedEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationLanguageChangedEventHandler != null)\r
+                    {\r
+                        this.LanguageChangedSignal().Disconnect(_applicationLanguageChangedEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationLanguageChangedEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application LanguageChangedSignal\r
+        private void OnNUIApplicationLanguageChanged(IntPtr data)\r
+        {\r
+            NUIApplicationLanguageChangedEventArgs e = new NUIApplicationLanguageChangedEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationLanguageChangedEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationLanguageChangedEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationLanguageChangedEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)
+          *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.
+          */\r
+        public event DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> RegionChanged\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationRegionChangedEventHandler == null)\r
+                    {\r
+                        _applicationRegionChangedEventHandler += value;\r
+\r
+                        _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);\r
+                        this.RegionChangedSignal().Connect(_applicationRegionChangedEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationRegionChangedEventHandler != null)\r
+                    {\r
+                        this.RegionChangedSignal().Disconnect(_applicationRegionChangedEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationRegionChangedEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application RegionChangedSignal\r
+        private void OnNUIApplicationRegionChanged(IntPtr data)\r
+        {\r
+            NUIApplicationRegionChangedEventArgs e = new NUIApplicationRegionChangedEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationRegionChangedEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationRegionChangedEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationRegionChangedEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
+          * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
+          */\r
+        public event DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> BatteryLow\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationBatteryLowEventHandler == null)\r
+                    {\r
+                        _applicationBatteryLowEventHandler += value;\r
+\r
+                        _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);\r
+                        this.BatteryLowSignal().Connect(_applicationBatteryLowEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationBatteryLowEventHandler != null)\r
+                    {\r
+                        this.BatteryLowSignal().Disconnect(_applicationBatteryLowEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationBatteryLowEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application BatteryLowSignal\r
+        private void OnNUIApplicationBatteryLow(IntPtr data)\r
+        {\r
+            NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationBatteryLowEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationBatteryLowEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)
+          *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.
+          */\r
+        public event DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> MemoryLow\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationMemoryLowEventHandler == null)\r
+                    {\r
+                        _applicationMemoryLowEventHandler += value;\r
+\r
+                        _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);\r
+                        this.MemoryLowSignal().Connect(_applicationMemoryLowEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationMemoryLowEventHandler != null)\r
+                    {\r
+                        this.MemoryLowSignal().Disconnect(_applicationMemoryLowEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationMemoryLowEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application MemoryLowSignal\r
+        private void OnNUIApplicationMemoryLow(IntPtr data)\r
+        {\r
+            NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(data);\r
+\r
+            if (_applicationMemoryLowEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationMemoryLowEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        /**
+          * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)
+          *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.
+          */\r
+        public event DaliEventHandler<object, NUIApplicationAppControlEventArgs> AppControl\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_applicationAppControlEventHandler == null)\r
+                    {\r
+                        _applicationAppControlEventHandler += value;\r
+\r
+                        _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);\r
+                        this.AppControlSignal().Connect(_applicationAppControlEventCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_applicationAppControlEventHandler != null)\r
+                    {\r
+                        this.AppControlSignal().Disconnect(_applicationAppControlEventCallbackDelegate);\r
+                    }\r
+\r
+                    _applicationAppControlEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        // Callback for Application AppControlSignal\r
+        private void OnNUIApplicationAppControl(IntPtr application, IntPtr voidp)\r
+        {\r
+            NUIApplicationAppControlEventArgs e = new NUIApplicationAppControlEventArgs();\r
+\r
+            // Populate all members of "e" (NUIApplicationAppControlEventArgs) with real data\r
+            e.Application = Application.GetApplicationFromPtr(application);\r
+            e.VoidP = voidp;\r
+\r
+            if (_applicationAppControlEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _applicationAppControlEventHandler(this, e);\r
+            }\r
+        }\r
+\r
+        private static Application _instance; // singleton\r
+\r
+        public delegate void InitDelegate();\r
+\r
+        public delegate void TerminateDelegate();\r
+\r
+        public delegate void PauseDelegate();\r
+\r
+        public delegate void ResumeDelegate();\r
+\r
+        public delegate void ResizeDelegate();\r
+\r
+        public delegate void AppControlDelegate();\r
+\r
+        public delegate void LanguageChangedDelegate();\r
+\r
+        public delegate void RegionChangedDelegate();\r
+\r
+        public delegate void BatteryLowDelegate();\r
+\r
+        public delegate void MemoryLowDelegate();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void InitDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void TerminateDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void PauseDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void ResumeDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void ResizeDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void AppControlDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void LanguageChangedDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void RegionChangedDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void BatteryLowDelegateInternal();\r
+\r
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]\r
+        internal delegate void MemoryLowDelegateInternal();\r
+\r
+        static void Initialize()\r
+        {\r
+            // instance.InitDelegate();\r
+        }\r
+\r
+        public static Application Instance\r
+        {\r
+            get\r
+            {\r
+                return _instance;\r
+            }\r
+        }\r
+\r
+        public static Application GetApplicationFromPtr(global::System.IntPtr cPtr)\r
+        {\r
+            Application ret = new Application(cPtr, false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void SetupDelegates()\r
+        {\r
+            InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialize);\r
+            System.Console.WriteLine("InitSignal connection count");\r
+\r
+            this.InitSignal().Connect(initializeCallback);\r
+            //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() );\r
+        }\r
+\r
+        public static Application NewApplication()\r
+        {\r
+            _instance = NewApplication("", Application.WINDOW_MODE.OPAQUE);\r
+            return _instance;\r
+        }\r
+\r
+        public static Application NewApplication(string stylesheet)\r
+        {\r
+            _instance = NewApplication(stylesheet, Application.WINDOW_MODE.OPAQUE);\r
+            return _instance;\r
+        }\r
+\r
+        public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode)\r
+        {\r
+\r
+            // register all Views with the type registry, so that can be created / styled via JSON\r
+            ViewRegistryHelper.Initialize();\r
+\r
+            Application ret = New(1, stylesheet, windowMode);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+            // we've got an application now connect the signals\r
+            ret.SetupDelegates();\r
+            // set the singleton\r
+            _instance = ret;\r
+            return ret;\r
+        }\r
+\r
+        public bool AddIdle(System.Delegate func)\r
+        {\r
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);\r
+            System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));\r
+\r
+            bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));\r
+\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+\r
+\r
+        /**
+        * Outer::outer_method(int)
+        */\r
+        public static Application New()\r
+        {\r
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_0(), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public static Application New(int argc)\r
+        {\r
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_1(argc), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public static Application New(int argc, string stylesheet)\r
+        {\r
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_2(argc, stylesheet), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public static Application New(int argc, string stylesheet, Application.WINDOW_MODE windowMode)\r
+        {\r
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public Application() : this(NDalicPINVOKE.new_Application__SWIG_0(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public Application(Application application) : this(NDalicPINVOKE.new_Application__SWIG_1(Application.getCPtr(application)), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public Application Assign(Application application)\r
+        {\r
+            Application ret = new Application(NDalicPINVOKE.Application_Assign(swigCPtr, Application.getCPtr(application)), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void MainLoop()\r
+        {\r
+            NDalicPINVOKE.Application_MainLoop__SWIG_0(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration)\r
+        {\r
+            NDalicPINVOKE.Application_MainLoop__SWIG_1(swigCPtr, SWIGTYPE_p_Configuration__ContextLoss.getCPtr(configuration));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void Lower()\r
+        {\r
+            NDalicPINVOKE.Application_Lower(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void Quit()\r
+        {\r
+            NDalicPINVOKE.Application_Quit(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback)\r
+        {\r
+            bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public Window GetWindow()\r
+        {\r
+            Window ret = new Window(NDalicPINVOKE.Application_GetWindow(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void ReplaceWindow(Rectangle windowPosition, string name)\r
+        {\r
+            NDalicPINVOKE.Application_ReplaceWindow(swigCPtr, Rectangle.getCPtr(windowPosition), name);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public static string GetResourcePath()\r
+        {\r
+            string ret = NDalicPINVOKE.Application_GetResourcePath();\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void SetViewMode(ViewMode viewMode)\r
+        {\r
+            NDalicPINVOKE.Application_SetViewMode(swigCPtr, (int)viewMode);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal ViewMode GetViewMode()\r
+        {\r
+            ViewMode ret = (ViewMode)NDalicPINVOKE.Application_GetViewMode(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetStereoBase(float stereoBase)\r
+        {\r
+            NDalicPINVOKE.Application_SetStereoBase(swigCPtr, stereoBase);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public float GetStereoBase()\r
+        {\r
+            float ret = NDalicPINVOKE.Application_GetStereoBase(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal InitSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_InitSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal TerminateSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_TerminateSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal PauseSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_PauseSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal ResumeSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResumeSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal ResetSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResetSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal ResizeSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResizeSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationControlSignal AppControlSignal()\r
+        {\r
+            ApplicationControlSignal ret = new ApplicationControlSignal(NDalicPINVOKE.Application_AppControlSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal LanguageChangedSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_LanguageChangedSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal RegionChangedSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_RegionChangedSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal BatteryLowSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal ApplicationSignal MemoryLowSignal()\r
+        {\r
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public enum WINDOW_MODE\r
+        {\r
+            OPAQUE = 0,\r
+            TRANSPARENT = 1\r
+        }\r
+\r
     }
 
-    /**
-      * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)
-      *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.
-      */
-    public event DaliEventHandler<object,NUIApplicationRegionChangedEventArgs> RegionChanged
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationRegionChangedEventHandler == null)
-          {
-            _applicationRegionChangedEventHandler += value;
-
-            _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);
-            this.RegionChangedSignal().Connect(_applicationRegionChangedEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationRegionChangedEventHandler != null)
-          {
-            this.RegionChangedSignal().Disconnect(_applicationRegionChangedEventCallbackDelegate);
-          }
-
-          _applicationRegionChangedEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application RegionChangedSignal
-    private void OnNUIApplicationRegionChanged(IntPtr data)
-    {
-      NUIApplicationRegionChangedEventArgs e = new NUIApplicationRegionChangedEventArgs();
-
-      // Populate all members of "e" (NUIApplicationRegionChangedEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationRegionChangedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationRegionChangedEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
-      * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
-      */
-    public event DaliEventHandler<object,NUIApplicationBatteryLowEventArgs> BatteryLow
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationBatteryLowEventHandler == null)
-          {
-            _applicationBatteryLowEventHandler += value;
-
-            _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);
-            this.BatteryLowSignal().Connect(_applicationBatteryLowEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationBatteryLowEventHandler != null)
-          {
-            this.BatteryLowSignal().Disconnect(_applicationBatteryLowEventCallbackDelegate);
-          }
-
-          _applicationBatteryLowEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application BatteryLowSignal
-    private void OnNUIApplicationBatteryLow(IntPtr data)
-    {
-      NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
-
-      // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationBatteryLowEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationBatteryLowEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)
-      *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.
-      */
-    public event DaliEventHandler<object,NUIApplicationMemoryLowEventArgs> MemoryLow
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationMemoryLowEventHandler == null)
-          {
-            _applicationMemoryLowEventHandler += value;
-
-            _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);
-            this.MemoryLowSignal().Connect(_applicationMemoryLowEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationMemoryLowEventHandler != null)
-          {
-            this.MemoryLowSignal().Disconnect(_applicationMemoryLowEventCallbackDelegate);
-          }
-
-          _applicationMemoryLowEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application MemoryLowSignal
-    private void OnNUIApplicationMemoryLow(IntPtr data)
-    {
-      NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
-
-      // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
-
-      if (_applicationMemoryLowEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationMemoryLowEventHandler(this, e);
-      }
-    }
-
-    /**
-      * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)
-      *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.
-      */
-    public event DaliEventHandler<object,NUIApplicationAppControlEventArgs> AppControl
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationAppControlEventHandler == null)
-          {
-            _applicationAppControlEventHandler += value;
-
-            _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);
-            this.AppControlSignal().Connect(_applicationAppControlEventCallbackDelegate);
-          }
-        }
-      }
-
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationAppControlEventHandler != null)
-          {
-            this.AppControlSignal().Disconnect(_applicationAppControlEventCallbackDelegate);
-          }
-
-          _applicationAppControlEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Application AppControlSignal
-    private void OnNUIApplicationAppControl(IntPtr application, IntPtr voidp)
-    {
-      NUIApplicationAppControlEventArgs e = new NUIApplicationAppControlEventArgs();
-
-      // Populate all members of "e" (NUIApplicationAppControlEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(application);
-      e.VoidP = voidp;
-
-      if (_applicationAppControlEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationAppControlEventHandler(this, e);
-      }
-    }
-
-    private static Application _instance; // singleton
-
-    public delegate void InitDelegate();
-
-    public delegate void TerminateDelegate();
-
-    public delegate void PauseDelegate();
-
-    public delegate void ResumeDelegate();
-
-    public delegate void ResizeDelegate();
-
-    public delegate void AppControlDelegate();
-
-    public delegate void LanguageChangedDelegate();
-
-    public delegate void RegionChangedDelegate();
-
-    public delegate void BatteryLowDelegate();
-
-    public delegate void MemoryLowDelegate();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void InitDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void TerminateDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void PauseDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void ResumeDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void ResizeDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void AppControlDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void LanguageChangedDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void RegionChangedDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void BatteryLowDelegateInternal();
-
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void MemoryLowDelegateInternal();
-
-    static void Initialize()
-    {
-      //       instance.InitDelegate();
-    }
-
-    public static Application Instance
-    {
-       get
-       {
-            return _instance;
-       }
-    }
-
-    public static Application GetApplicationFromPtr(global::System.IntPtr cPtr) {
-      Application ret = new Application(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-    internal void SetupDelegates() {
-      InitDelegateInternal initializeCallback = new InitDelegateInternal( Initialize );
-      System.Console.WriteLine( "InitSignal connection count");
-
-      this.InitSignal().Connect( initializeCallback );
-      //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() );
-    }
-
-    public static Application NewApplication() {
-     _instance = NewApplication("", Application.WINDOW_MODE.OPAQUE);
-     return _instance;
-    }
-
-    public static Application NewApplication(string stylesheet) {
-      _instance = NewApplication(stylesheet, Application.WINDOW_MODE.OPAQUE);
-      return _instance;
-    }
-
-    public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode) {
-
-      // register all Views with the type registry, so that can be created / styled via JSON
-      ViewRegistryHelper.Initialize();
-
-      Application ret = New(1, stylesheet, windowMode);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-      // we've got an application now connect the signals
-      ret.SetupDelegates();
-      // set the singleton
-      _instance = ret;
-      return ret;
-    }
-
-    public bool AddIdle(System.Delegate func) {
-      System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
-      System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));
-
-      bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));
-
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-    
-  
-  /**
-  * Outer::outer_method(int)
-  */
-  public static Application New() {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_0(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_1(argc), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc, string stylesheet) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_2(argc, stylesheet), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc, string stylesheet, Application.WINDOW_MODE windowMode) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Application() : this(NDalicPINVOKE.new_Application__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Application(Application application) : this(NDalicPINVOKE.new_Application__SWIG_1(Application.getCPtr(application)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Application Assign(Application application) {
-    Application ret = new Application(NDalicPINVOKE.Application_Assign(swigCPtr, Application.getCPtr(application)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void MainLoop() {
-    NDalicPINVOKE.Application_MainLoop__SWIG_0(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration) {
-    NDalicPINVOKE.Application_MainLoop__SWIG_1(swigCPtr, SWIGTYPE_p_Configuration__ContextLoss.getCPtr(configuration));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Lower() {
-    NDalicPINVOKE.Application_Lower(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Quit() {
-    NDalicPINVOKE.Application_Quit(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback) {
-    bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Window GetWindow() {
-    Window ret = new Window(NDalicPINVOKE.Application_GetWindow(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ReplaceWindow(RectInteger windowPosition, string name) {
-    NDalicPINVOKE.Application_ReplaceWindow(swigCPtr, RectInteger.getCPtr(windowPosition), name);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static string GetResourcePath() {
-    string ret = NDalicPINVOKE.Application_GetResourcePath();
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetViewMode(ViewMode viewMode) {
-    NDalicPINVOKE.Application_SetViewMode(swigCPtr, (int)viewMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ViewMode GetViewMode() {
-    ViewMode ret = (ViewMode)NDalicPINVOKE.Application_GetViewMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetStereoBase(float stereoBase) {
-    NDalicPINVOKE.Application_SetStereoBase(swigCPtr, stereoBase);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetStereoBase() {
-    float ret = NDalicPINVOKE.Application_GetStereoBase(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal InitSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_InitSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal TerminateSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_TerminateSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal PauseSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_PauseSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResumeSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResumeSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResetSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResetSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResizeSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResizeSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationControlSignal AppControlSignal() {
-    ApplicationControlSignal ret = new ApplicationControlSignal(NDalicPINVOKE.Application_AppControlSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal LanguageChangedSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_LanguageChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal RegionChangedSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_RegionChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal BatteryLowSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal MemoryLowSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum WINDOW_MODE {
-    OPAQUE = 0,
-    TRANSPARENT = 1
-  }
-
-}
-
 }

diff --git a/Tizen.NUI/src/internal/ApplicationControlSignal.cs b/Tizen.NUI/src/internal/ApplicationControlSignal.cs
index 0ea3b37..aabe2bb 100755 (executable)
--- a/Tizen.NUI/src/internal/ApplicationControlSignal.cs
+++ b/Tizen.NUI/src/internal/ApplicationControlSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ApplicationControlSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ApplicationControlSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ApplicationExtensions.cs b/Tizen.NUI/src/internal/ApplicationExtensions.cs
index 02de13f..a05b7cd 100755 (executable)
--- a/Tizen.NUI/src/internal/ApplicationExtensions.cs
+++ b/Tizen.NUI/src/internal/ApplicationExtensions.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ApplicationExtensions : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ApplicationExtensions : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ApplicationExtensions : global::System.IDisposable {
   }
 
   ~ApplicationExtensions() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ApplicationExtensions : global::System.IDisposable {
     }
   }
 
+
   public ApplicationExtensions() : this(NDalicPINVOKE.new_ApplicationExtensions__SWIG_0(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/ApplicationSignal.cs b/Tizen.NUI/src/internal/ApplicationSignal.cs
index 363e732..8fe029a 100755 (executable)
--- a/Tizen.NUI/src/internal/ApplicationSignal.cs
+++ b/Tizen.NUI/src/internal/ApplicationSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ApplicationSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ApplicationSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/AsyncImageLoader.cs b/Tizen.NUI/src/internal/AsyncImageLoader.cs
index 535b1dc..a9eda60 100755 (executable)
--- a/Tizen.NUI/src/internal/AsyncImageLoader.cs
+++ b/Tizen.NUI/src/internal/AsyncImageLoader.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class AsyncImageLoader : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class AsyncImageLoader : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal AsyncImageLoader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AsyncImageLoader_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -38,10 +38,15 @@ public class AsyncImageLoader : BaseHandle {
   }
 
   ~AsyncImageLoader() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public override void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -55,6 +60,7 @@ public class AsyncImageLoader : BaseHandle {
     }
   }
 
+
   public AsyncImageLoader () : this (NDalicPINVOKE.AsyncImageLoader_New(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 

diff --git a/Tizen.NUI/src/internal/BaseHandle.cs b/Tizen.NUI/src/internal/BaseHandle.cs
index 39407df..fbe5cdc 100755 (executable)
--- a/Tizen.NUI/src/internal/BaseHandle.cs
+++ b/Tizen.NUI/src/internal/BaseHandle.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class BaseHandle : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    public class BaseHandle : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -158,7 +158,7 @@ public class BaseHandle : global::System.IDisposable {
   }
 
 
-  public BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) {
+  internal BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -194,7 +194,7 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  public BaseObject GetBaseObject() {
+  internal BaseObject GetBaseObject() {
     BaseObject ret = new BaseObject(NDalicPINVOKE.BaseHandle_GetBaseObject__SWIG_0(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -217,7 +217,7 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  public RefObject GetObjectPtr() {
+  internal RefObject GetObjectPtr() {
     global::System.IntPtr cPtr = NDalicPINVOKE.BaseHandle_GetObjectPtr(swigCPtr);
     RefObject ret = (cPtr == global::System.IntPtr.Zero) ? null : new RefObject(cPtr, false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/BaseObject.cs b/Tizen.NUI/src/internal/BaseObject.cs
index 36e2f86..e3a3a19 100755 (executable)
--- a/Tizen.NUI/src/internal/BaseObject.cs
+++ b/Tizen.NUI/src/internal/BaseObject.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class BaseObject : RefObject {
+namespace Tizen.NUI {\r
+\r
+    internal class BaseObject : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal BaseObject(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BaseObject_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -53,7 +53,7 @@ public class BaseObject : RefObject {
     return ret;
   }
 
-  public bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) {
+  internal bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) {
     bool ret = NDalicPINVOKE.BaseObject_DoConnectSignal(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), signalName, SWIGTYPE_p_FunctorDelegate.getCPtr(functorDelegate));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/BlendEquationType.cs b/Tizen.NUI/src/internal/BlendEquationType.cs
index 515df7d..9e2a5bb 100755 (executable)
--- a/Tizen.NUI/src/internal/BlendEquationType.cs
+++ b/Tizen.NUI/src/internal/BlendEquationType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum BlendEquationType {
+namespace Tizen.NUI {\r
+\r
+    internal enum BlendEquationType {
   ADD = 0x8006,
   SUBTRACT = 0x800A,
   REVERSE_SUBTRACT = 0x800B

diff --git a/Tizen.NUI/src/internal/BlendFactorType.cs b/Tizen.NUI/src/internal/BlendFactorType.cs
index a2c2b4d..84d4ba6 100755 (executable)
--- a/Tizen.NUI/src/internal/BlendFactorType.cs
+++ b/Tizen.NUI/src/internal/BlendFactorType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum BlendFactorType {
+namespace Tizen.NUI {\r
+\r
+    internal enum BlendFactorType {
   ZERO = 0,
   ONE = 1,
   SRC_COLOR = 0x0300,

diff --git a/Tizen.NUI/src/internal/BlendModeType.cs b/Tizen.NUI/src/internal/BlendModeType.cs
index 1066d9b..63488c9 100755 (executable)
--- a/Tizen.NUI/src/internal/BlendModeType.cs
+++ b/Tizen.NUI/src/internal/BlendModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum BlendModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum BlendModeType {
   OFF,
   AUTO,
   ON

diff --git a/Tizen.NUI/src/internal/BoolSignal.cs b/Tizen.NUI/src/internal/BoolSignal.cs
index 15ab8ad..0031b65 100755 (executable)
--- a/Tizen.NUI/src/internal/BoolSignal.cs
+++ b/Tizen.NUI/src/internal/BoolSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class BoolSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class BoolSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/BufferImage.cs b/Tizen.NUI/src/internal/BufferImage.cs
index 69c3e4b..d663f1c 100755 (executable)
--- a/Tizen.NUI/src/internal/BufferImage.cs
+++ b/Tizen.NUI/src/internal/BufferImage.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class BufferImage : Image {
+namespace Tizen.NUI {\r
+\r
+    internal class BufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal BufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BufferImage_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -133,8 +133,8 @@ public class BufferImage : Image {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Update(RectUnsignedInteger updateArea) {
-    NDalicPINVOKE.BufferImage_Update__SWIG_1(swigCPtr, RectUnsignedInteger.getCPtr(updateArea));
+  public void Update(SWIGTYPE_p_Dali__RectT_unsigned_int_t updateArea) {
+    NDalicPINVOKE.BufferImage_Update__SWIG_1(swigCPtr, SWIGTYPE_p_Dali__RectT_unsigned_int_t.getCPtr(updateArea));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/Tizen.NUI/src/internal/Builder.cs b/Tizen.NUI/src/internal/Builder.cs
index 653e25c..4dffa65 100755 (executable)
--- a/Tizen.NUI/src/internal/Builder.cs
+++ b/Tizen.NUI/src/internal/Builder.cs
@@ -27,10 +27,10 @@
 namespace Tizen.NUI {
 
     using System;
-    using System.Runtime.InteropServices;
-
-
-public class Builder : BaseHandle {
+    using System.Runtime.InteropServices;\r
+\r
+\r
+    public class Builder : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Builder(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Builder_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -247,7 +247,7 @@ public class Builder : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public FrameBufferImage GetFrameBufferImage(string name) {
+  internal FrameBufferImage GetFrameBufferImage(string name) {
     FrameBufferImage ret = new FrameBufferImage(NDalicPINVOKE.Builder_GetFrameBufferImage(swigCPtr, name), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -259,19 +259,19 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public PathConstrainer GetPathConstrainer(string pathConstrainerName) {
+  internal PathConstrainer GetPathConstrainer(string pathConstrainerName) {
     PathConstrainer ret = new PathConstrainer(NDalicPINVOKE.Builder_GetPathConstrainer(swigCPtr, pathConstrainerName), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public LinearConstrainer GetLinearConstrainer(string linearConstrainerName) {
+  internal LinearConstrainer GetLinearConstrainer(string linearConstrainerName) {
     LinearConstrainer ret = new LinearConstrainer(NDalicPINVOKE.Builder_GetLinearConstrainer(swigCPtr, linearConstrainerName), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public VoidSignal QuitSignal() {
+  internal VoidSignal QuitSignal() {
     VoidSignal ret = new VoidSignal(NDalicPINVOKE.Builder_QuitSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/ButtonSignal.cs b/Tizen.NUI/src/internal/ButtonSignal.cs
index da42891..714cdc3 100755 (executable)
--- a/Tizen.NUI/src/internal/ButtonSignal.cs
+++ b/Tizen.NUI/src/internal/ButtonSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ButtonSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ButtonSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ChildPropertyRegistration.cs b/Tizen.NUI/src/internal/ChildPropertyRegistration.cs
index c986c64..c88af81 100755 (executable)
--- a/Tizen.NUI/src/internal/ChildPropertyRegistration.cs
+++ b/Tizen.NUI/src/internal/ChildPropertyRegistration.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ChildPropertyRegistration : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ChildPropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ChildPropertyRegistration : global::System.IDisposable {
   }
 
   ~ChildPropertyRegistration() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ChildPropertyRegistration : global::System.IDisposable {
     }
   }
 
+
   public ChildPropertyRegistration(TypeRegistration registered, string name, int index, PropertyType type) : this(NDalicPINVOKE.new_ChildPropertyRegistration(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/ClampState.cs b/Tizen.NUI/src/internal/ClampState.cs
index ef4588a..573dfc6 100755 (executable)
--- a/Tizen.NUI/src/internal/ClampState.cs
+++ b/Tizen.NUI/src/internal/ClampState.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum ClampState {
+namespace Tizen.NUI {\r
+\r
+    internal enum ClampState {
   NotClamped,
   ClampedToMin,
   ClampedToMax

diff --git a/Tizen.NUI/src/internal/ClampState2D.cs b/Tizen.NUI/src/internal/ClampState2D.cs
index e975843..d01fd83 100755 (executable)
--- a/Tizen.NUI/src/internal/ClampState2D.cs
+++ b/Tizen.NUI/src/internal/ClampState2D.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ClampState2D : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ClampState2D : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ClampState2D : global::System.IDisposable {
   }
 
   ~ClampState2D() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ClampState2D : global::System.IDisposable {
     }
   }
 
+
   public ClampState x {
     set {
       NDalicPINVOKE.ClampState2D_x_set(swigCPtr, (int)value);

diff --git a/Tizen.NUI/src/internal/ConnectionTracker.cs b/Tizen.NUI/src/internal/ConnectionTracker.cs
index f7d2cd5..e593de7 100755 (executable)
--- a/Tizen.NUI/src/internal/ConnectionTracker.cs
+++ b/Tizen.NUI/src/internal/ConnectionTracker.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ConnectionTracker : ConnectionTrackerInterface {
+namespace Tizen.NUI {\r
+\r
+    internal class ConnectionTracker : ConnectionTrackerInterface {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ConnectionTracker(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTracker_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs b/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
index 7b2cfd8..81a1473 100755 (executable)
--- a/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
+++ b/Tizen.NUI/src/internal/ConnectionTrackerInterface.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ConnectionTrackerInterface : SignalObserver {
+namespace Tizen.NUI {\r
+\r
+    internal class ConnectionTrackerInterface : SignalObserver {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ConnectionTrackerInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTrackerInterface_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ControlKeySignal.cs b/Tizen.NUI/src/internal/ControlKeySignal.cs
index 82dc439..c229bb1 100755 (executable)
--- a/Tizen.NUI/src/internal/ControlKeySignal.cs
+++ b/Tizen.NUI/src/internal/ControlKeySignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ControlKeySignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ControlKeySignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ControlKeySignal : global::System.IDisposable {
   }
 
   ~ControlKeySignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ControlKeySignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ControlKeySignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ControlOrientationType.cs b/Tizen.NUI/src/internal/ControlOrientationType.cs
index f0490d3..5d98c55 100755 (executable)
--- a/Tizen.NUI/src/internal/ControlOrientationType.cs
+++ b/Tizen.NUI/src/internal/ControlOrientationType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum ControlOrientationType {
+namespace Tizen.NUI {\r
+\r
+    internal enum ControlOrientationType {
   Up,
   Left,
   Down,

diff --git a/Tizen.NUI/src/internal/CustomActor.cs b/Tizen.NUI/src/internal/CustomActor.cs
index 268eab2..05dd5b1 100755 (executable)
--- a/Tizen.NUI/src/internal/CustomActor.cs
+++ b/Tizen.NUI/src/internal/CustomActor.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class CustomActor : Actor {
+namespace Tizen.NUI {\r
+\r
+    public class CustomActor : Actor {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal CustomActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActor_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/CustomActorImpl.cs b/Tizen.NUI/src/internal/CustomActorImpl.cs
index b9e71ec..a5d3f5d 100755 (executable)
--- a/Tizen.NUI/src/internal/CustomActorImpl.cs
+++ b/Tizen.NUI/src/internal/CustomActorImpl.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class CustomActorImpl : RefObject {
+namespace Tizen.NUI {\r
+\r
+    public class CustomActorImpl : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal CustomActorImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActorImpl_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -35,7 +35,7 @@ public class CustomActorImpl : RefObject {
     }
   }
 
-  public CustomActor Self() {
+  internal CustomActor Self() {
     CustomActor ret = new CustomActor(NDalicPINVOKE.CustomActorImpl_Self(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -76,7 +76,7 @@ public class CustomActorImpl : RefObject {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
+  internal virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
     bool ret = NDalicPINVOKE.CustomActorImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/DaliEnumConstants.cs b/Tizen.NUI/src/internal/DaliEnumConstants.cs
index 3f991b5..3ff9514 100755 (executable)
--- a/Tizen.NUI/src/internal/DaliEnumConstants.cs
+++ b/Tizen.NUI/src/internal/DaliEnumConstants.cs
@@ -15,172 +15,180 @@
  */
 using System;
 
-namespace Tizen.NUI\r
-{\r
-    namespace Constants\r
-    {\r
-\r
-        public enum TextureType\r
-        {\r
-            Texture2D = Tizen.NUI.TextureType.TEXTURE_2D,   ///< One 2D image                            @SINCE_1_1.43
-            TextureCube = Tizen.NUI.TextureType.TEXTURE_CUBE  ///< Six 2D images arranged in a cube-shape  @SINCE_1_1.43
-        }\r
-\r
-        public enum ViewMode\r
-        {\r
-            Mono = Tizen.NUI.ViewMode.MONO,                          ///< Monoscopic (single camera). This is the default @SINCE_1_0.0
-            StereoHorizontal = Tizen.NUI.ViewMode.STEREO_HORIZONTAL, ///< Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0
-            StereoVertical = Tizen.NUI.ViewMode.STEREO_VERTICAL,     ///< Stereoscopic. Frame buffer is split vertically with the left camera view at the top and the right camera view at the bottom. @SINCE_1_0.0
-            StereoInterlaced = Tizen.NUI.ViewMode.STEREO_INTERLACED  ///< @DEPRECATED_1_1.19 @brief Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames. @SINCE_1_0.0
-        }\r
-\r
-        public enum MeshVisualShadingModeValue\r
-        {\r
-            TexturelessWithDiffuseLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURELESS_WITH_DIFFUSE_LIGHTING,       ///< *Simplest*. One color that is lit by ambient and diffuse lighting. @SINCE_1_1.45
-            TexturedWithSpecularLigting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_SPECULAR_LIGHTING,         ///< Uses only the visual image textures provided with specular lighting in addition to ambient and diffuse lighting. @SINCE_1_1.45
-            TexturedWithDetailedSpecularLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING ///< Uses all textures provided including a gloss, normal and texture map along with specular, ambient and diffuse lighting. @SINCE_1_1.45
-        }\r
-\r
-        public struct Visual\r
-        {\r
-            public enum Type\r
-            {\r
-                Border = Tizen.NUI.VisualType.BORDER,\r
-                Color = Tizen.NUI.VisualType.COLOR,\r
-                Gradient = Tizen.NUI.VisualType.GRADIENT,\r
-                Image = Tizen.NUI.VisualType.IMAGE,\r
-                Mesh = Tizen.NUI.VisualType.MESH,\r
-                Primitive = Tizen.NUI.VisualType.PRIMITIVE,\r
-                WireFrame = Tizen.NUI.VisualType.WIREFRAME,\r
-                Text = Tizen.NUI.VisualType.TEXT\r
-            }\r
-\r
-            public struct Property\r
-            {\r
-                public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE;\r
-                public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER;\r
-                public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM;\r
-                public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA;\r
-                public static readonly int MixCOlor = NDalic.VISUAL_PROPERTY_MIX_COLOR;\r
-            }\r
-\r
-            public struct ShaderProperty\r
-            {\r
-                public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX;\r
-                public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT;\r
-                public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X;\r
-                public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y;\r
-                public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS;\r
-            }\r
-        }\r
-\r
-        public struct BorderVisualProperty\r
-        {\r
-            public static readonly int Color = NDalic.BORDER_VISUAL_COLOR;\r
-            public static readonly int Size = NDalic.BORDER_VISUAL_SIZE;\r
-            public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING;\r
-        }\r
-\r
-        public struct ColorVisualProperty\r
-        {\r
-            public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR;\r
-        }\r
-\r
-        public struct GradientVisualProperty\r
-        {\r
-            public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION;\r
-            public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION;\r
-            public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER;\r
-            public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS;\r
-            public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET;\r
-            public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR;\r
-            public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS;\r
-            public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD;\r
-        }\r
-\r
-        public struct ImageVisualProperty\r
-        {\r
-            public static readonly int URL = NDalic.IMAGE_VISUAL_URL;\r
-            public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE;\r
-            public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE;\r
-            public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH;\r
-            public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT;\r
-            public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING;\r
-            public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY;\r
-            public static readonly int BatchingEnabled = NDalic.IMAGE_VISUAL_BATCHING_ENABLED;\r
-            public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA;\r
-            public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U;\r
-            public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V;\r
-        }\r
-\r
-        public struct MeshVisualProperty\r
-        {\r
-            public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL;\r
-            public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL;\r
-            public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH;\r
-            public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE;\r
-            public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING;\r
-            public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS;\r
-            public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION;\r
-        }\r
-\r
-        public struct PrimitiveVisualProperty\r
-        {\r
-            public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE;\r
-            public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR;\r
-            public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES;\r
-            public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS;\r
-            public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS;\r
-            public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS;\r
-            public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT;\r
-            public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS;\r
-            public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS;\r
-            public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE;\r
-            public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS;\r
-            public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION;\r
-        }\r
-\r
-        public struct TextVisualProperty\r
-        {\r
-            public static readonly int Text = NDalic.TEXT_VISUAL_TEXT;\r
-            public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY;\r
-            public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE;\r
-            public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE;\r
-            public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE;\r
-            public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT;\r
-            public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT;\r
-            public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR;\r
-            public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP;\r
-        }\r
-\r
-        public struct Tooltip\r
-        {\r
-            public struct Property\r
-            {\r
-                public static readonly int Content = NDalic.TOOLTIP_CONTENT;\r
-                public static readonly int Layout = NDalic.TOOLTIP_LAYOUT;\r
-                public static readonly int WaitTime = NDalic.TOOLTIP_WAIT_TIME;\r
-                public static readonly int Background = NDalic.TOOLTIP_BACKGROUND;\r
-                public static readonly int Tail = NDalic.TOOLTIP_TAIL;\r
-                public static readonly int Position = NDalic.TOOLTIP_POSITION;\r
-                public static readonly int HoverPointOffset = NDalic.TOOLTIP_HOVER_POINT_OFFSET;\r
-                public static readonly int MovementThreshold = NDalic.TOOLTIP_MOVEMENT_THRESHOLD;\r
-                public static readonly int DisappearOnMovement = NDalic.TOOLTIP_DISAPPEAR_ON_MOVEMENT;\r
-            }\r
-\r
-            public struct BackgroundProperty\r
-            {\r
-                public static readonly int Visual = NDalic.TOOLTIP_BACKGROUND_VISUAL;\r
-                public static readonly int Border = NDalic.TOOLTIP_BACKGROUND_BORDER;\r
-            }\r
-\r
-            public struct TailProperty\r
-            {\r
-                public static readonly int Visibility = NDalic.TOOLTIP_TAIL_VISIBILITY;\r
-                public static readonly int AboveVisual = NDalic.TOOLTIP_TAIL_ABOVE_VISUAL;\r
-                public static readonly int BelowVisual = NDalic.TOOLTIP_TAIL_BELOW_VISUAL;\r
-            }\r
-        }\r
-\r
-    } // namespace Constants
+namespace Tizen.NUI
+{
+  namespace Constants
+  {
+    public enum TextureType
+    {
+      Texture2D     = Tizen.NUI.TextureType.TEXTURE_2D,   ///< One 2D image                            @SINCE_1_1.43
+      TextureCube   = Tizen.NUI.TextureType.TEXTURE_CUBE  ///< Six 2D images arranged in a cube-shape  @SINCE_1_1.43
+    }
+
+    public enum ViewMode
+    {
+      Mono              = Tizen.NUI.ViewMode.MONO,                          ///< Monoscopic (single camera). This is the default @SINCE_1_0.0
+      StereoHorizontal  = Tizen.NUI.ViewMode.STEREO_HORIZONTAL, ///< Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0
+      StereoVertical    = Tizen.NUI.ViewMode.STEREO_VERTICAL,     ///< Stereoscopic. Frame buffer is split vertically with the left camera view at the top and the right camera view at the bottom. @SINCE_1_0.0
+      StereoInterlaced  = Tizen.NUI.ViewMode.STEREO_INTERLACED  ///< @DEPRECATED_1_1.19 @brief Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames. @SINCE_1_0.0
+    }
+
+    public enum MeshVisualShadingModeValue
+    {
+      TexturelessWithDiffuseLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURELESS_WITH_DIFFUSE_LIGHTING,       ///< *Simplest*. One color that is lit by ambient and diffuse lighting. @SINCE_1_1.45
+      TexturedWithSpecularLigting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_SPECULAR_LIGHTING,         ///< Uses only the visual image textures provided with specular lighting in addition to ambient and diffuse lighting. @SINCE_1_1.45
+      TexturedWithDetailedSpecularLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING ///< Uses all textures provided including a gloss, normal and texture map along with specular, ambient and diffuse lighting. @SINCE_1_1.45
+    }
+
+
+
+    public struct Direction
+    {
+      public enum Type
+      {
+        LeftToRight = Tizen.NUI.DirectionType.LEFT_TO_RIGHT,
+        RightToLeft = Tizen.NUI.DirectionType.RIGHT_TO_LEFT
+      }
+    }
+
+    public struct Visual
+    {
+      public enum Type
+      {
+        Border = Tizen.NUI.VisualType.BORDER,
+        Color = Tizen.NUI.VisualType.COLOR,
+        Gradient = Tizen.NUI.VisualType.GRADIENT,
+        Image = Tizen.NUI.VisualType.IMAGE,
+        Mesh = Tizen.NUI.VisualType.MESH,
+        Primitive = Tizen.NUI.VisualType.PRIMITIVE,
+        WireFrame = Tizen.NUI.VisualType.WIREFRAME,
+        Text = Tizen.NUI.VisualType.TEXT
+      }
+
+      public struct Property
+      {
+        public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE;
+        public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER;
+        public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM;
+        public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA;
+        public static readonly int MixColor = NDalic.VISUAL_PROPERTY_MIX_COLOR;
+      }
+
+      public struct ShaderProperty
+      {
+        public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX;
+        public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT;
+        public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X;
+        public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y;
+        public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS;
+      }
+    }
+
+    public struct BorderVisualProperty
+    {
+      public static readonly int Color = NDalic.BORDER_VISUAL_COLOR;
+      public static readonly int Size = NDalic.BORDER_VISUAL_SIZE;
+      public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING;
+    }
+
+    public struct ColorVisualProperty
+    {
+      public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR;
+    }
+
+    public struct GradientVisualProperty
+    {
+      public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION;
+      public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION;
+      public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER;
+      public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS;
+      public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET;
+      public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR;
+      public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS;
+      public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD;
+    }
+
+    public struct ImageVisualProperty
+    {
+      public static readonly int URL = NDalic.IMAGE_VISUAL_URL;
+      public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE;
+      public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE;
+      public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH;
+      public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT;
+      public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING;
+      public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY;
+      public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA;
+      public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U;
+      public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V;
+    }
+
+    public struct MeshVisualProperty
+    {
+      public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL;
+      public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL;
+      public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH;
+      public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE;
+      public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING;
+      public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS;
+      public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION;
+    }
+
+    public struct PrimitiveVisualProperty
+    {
+      public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE;
+      public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR;
+      public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES;
+      public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS;
+      public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS;
+      public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS;
+      public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT;
+      public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS;
+      public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS;
+      public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE;
+      public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS;
+      public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION;
+    }
+
+    public struct TextVisualProperty
+    {
+      public static readonly int Text = NDalic.TEXT_VISUAL_TEXT;
+      public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY;
+      public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE;
+      public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE;
+      public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE;
+      public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT;
+      public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT;
+      public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR;
+      public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP;
+    }
+
+    public struct Tooltip
+    {
+      public struct Property
+      {
+        public static readonly int Content = NDalic.TOOLTIP_CONTENT;
+        public static readonly int Layout = NDalic.TOOLTIP_LAYOUT;
+        public static readonly int WaitTime = NDalic.TOOLTIP_WAIT_TIME;
+        public static readonly int Background = NDalic.TOOLTIP_BACKGROUND;
+        public static readonly int Tail = NDalic.TOOLTIP_TAIL;
+        public static readonly int Position = NDalic.TOOLTIP_POSITION;
+        public static readonly int HoverPointOffset = NDalic.TOOLTIP_HOVER_POINT_OFFSET;
+        public static readonly int MovementThreshold = NDalic.TOOLTIP_MOVEMENT_THRESHOLD;
+        public static readonly int DisappearOnMovement = NDalic.TOOLTIP_DISAPPEAR_ON_MOVEMENT;
+      }
+
+      public struct BackgroundProperty
+      {
+        public static readonly int Visual = NDalic.TOOLTIP_BACKGROUND_VISUAL;
+        public static readonly int Border = NDalic.TOOLTIP_BACKGROUND_BORDER;
+      }
+
+      public struct TailProperty
+      {
+        public static readonly int Visibility = NDalic.TOOLTIP_TAIL_VISIBILITY;
+        public static readonly int AboveVisual = NDalic.TOOLTIP_TAIL_ABOVE_VISUAL;
+        public static readonly int BelowVisual = NDalic.TOOLTIP_TAIL_BELOW_VISUAL;
+      }
+    }
+  } // namespace Constants
 } // namesapce Dali

diff --git a/Tizen.NUI/src/internal/DaliEventHandler.cs b/Tizen.NUI/src/internal/DaliEventHandler.cs
index ab9733e..d23cb17 100755 (executable)
--- a/Tizen.NUI/src/internal/DaliEventHandler.cs
+++ b/Tizen.NUI/src/internal/DaliEventHandler.cs
@@ -13,29 +13,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- */\r
-
+ */
 namespace Tizen.NUI {
 
     using System;
     using System.Runtime.InteropServices;
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    public delegate R DaliEventHandlerWithReturnType<T,U,R>(T source, U e);
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void EventCallbackDelegateType0();
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+    public delegate R DaliEventHandlerWithReturnType<T, U, R>(T source, U e);\r
+\r
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+    internal delegate void EventCallbackDelegateType0();\r
+\r
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+    internal delegate void EventCallbackDelegateType1(IntPtr arg1);\r
+\r
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+    internal delegate void EventCallbackDelegateType2<T, U>(T arg1, U arg2);\r
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void EventCallbackDelegateType1(IntPtr arg1);
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void EventCallbackDelegateType2<T,U>(T arg1, U arg2);
 
 
-    //this should be removed with EventHandler from .NET
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    public delegate void DaliEventHandler<T,U>(T source, U e);\r
+    //this should be removed with EventHandler from .NET\r
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+    public delegate void DaliEventHandler<T, U>(T source, U e);\r
 \r
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
     public delegate R EventHandlerWithReturnType<T, U, R>(T source, U e);\r

diff --git a/Tizen.NUI/src/internal/DaliException.cs b/Tizen.NUI/src/internal/DaliException.cs
index 34f0482..7737d78 100755 (executable)
--- a/Tizen.NUI/src/internal/DaliException.cs
+++ b/Tizen.NUI/src/internal/DaliException.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class DaliException : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class DaliException : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class DaliException : global::System.IDisposable {
   }
 
   ~DaliException() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class DaliException : global::System.IDisposable {
     }
   }
 
+
   public DaliException(string location, string condition) : this(NDalicPINVOKE.new_DaliException(location, condition), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs b/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
index 3906eaa..0c1901a 100755 (executable)
--- a/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
+++ b/Tizen.NUI/src/internal/DefaultItemLayoutProperty.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DefaultItemLayoutProperty {
+namespace Tizen.NUI {\r
+\r
+    internal enum DefaultItemLayoutProperty {
   TYPE = 0,
   ITEM_SIZE,
   ORIENTATION,

diff --git a/Tizen.NUI/src/internal/DefaultItemLayoutType.cs b/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
index ee0c0d9..659d5fe 100755 (executable)
--- a/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
+++ b/Tizen.NUI/src/internal/DefaultItemLayoutType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DefaultItemLayoutType {
+namespace Tizen.NUI {\r
+\r
+    internal enum DefaultItemLayoutType {
   DEPTH,
   GRID,
   LIST,

diff --git a/Tizen.NUI/src/internal/DefaultRuler.cs b/Tizen.NUI/src/internal/DefaultRuler.cs
index ff9f4f0..b0ca5ef 100755 (executable)
--- a/Tizen.NUI/src/internal/DefaultRuler.cs
+++ b/Tizen.NUI/src/internal/DefaultRuler.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class DefaultRuler : Ruler {
+namespace Tizen.NUI {\r
+\r
+    internal class DefaultRuler : Ruler {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal DefaultRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DefaultRuler_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/DepthFunctionType.cs b/Tizen.NUI/src/internal/DepthFunctionType.cs
index 8bc54eb..0bebeaf 100755 (executable)
--- a/Tizen.NUI/src/internal/DepthFunctionType.cs
+++ b/Tizen.NUI/src/internal/DepthFunctionType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DepthFunctionType {
+namespace Tizen.NUI {\r
+\r
+    internal enum DepthFunctionType {
   NEVER,
   ALWAYS,
   LESS,

diff --git a/Tizen.NUI/src/internal/DepthTestModeType.cs b/Tizen.NUI/src/internal/DepthTestModeType.cs
index f66f1cf..8ca5f39 100755 (executable)
--- a/Tizen.NUI/src/internal/DepthTestModeType.cs
+++ b/Tizen.NUI/src/internal/DepthTestModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DepthTestModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum DepthTestModeType {
   OFF,
   AUTO,
   ON

diff --git a/Tizen.NUI/src/internal/DepthWriteModeType.cs b/Tizen.NUI/src/internal/DepthWriteModeType.cs
index 9ac3d6b..94a17aa 100755 (executable)
--- a/Tizen.NUI/src/internal/DepthWriteModeType.cs
+++ b/Tizen.NUI/src/internal/DepthWriteModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DepthWriteModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum DepthWriteModeType {
   OFF,
   AUTO,
   ON

diff --git a/Tizen.NUI/src/internal/DirectionBias.cs b/Tizen.NUI/src/internal/DirectionBias.cs
index 3cead2a..61acc6d 100755 (executable)
--- a/Tizen.NUI/src/internal/DirectionBias.cs
+++ b/Tizen.NUI/src/internal/DirectionBias.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum DirectionBias {
+namespace Tizen.NUI {\r
+\r
+    internal enum DirectionBias {
   DirectionBiasLeft = -1,
   DirectionBiasNone = 0,
   DirectionBiasRight = 1

diff --git a/Tizen.NUI/src/internal/DirectionType.cs b/Tizen.NUI/src/internal/DirectionType.cs
new file mode 100755 (executable)
index 0000000..f9c724a
--- /dev/null
+++ b/Tizen.NUI/src/internal/DirectionType.cs
@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI {\r
+\r
+    internal enum DirectionType {
+  LEFT_TO_RIGHT = 0,
+  RIGHT_TO_LEFT
+}
+
+}

diff --git a/Tizen.NUI/src/internal/DisposeQueue.cs b/Tizen.NUI/src/internal/DisposeQueue.cs
index 2035a34..2531371 100755 (executable)
--- a/Tizen.NUI/src/internal/DisposeQueue.cs
+++ b/Tizen.NUI/src/internal/DisposeQueue.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
 namespace Tizen.NUI
 {
 
-    public class DisposeQueue
+    internal class DisposeQueue
     {
         private static DisposeQueue _disposableQueue = new DisposeQueue();
         private List<IDisposable> _disposables = new List<IDisposable>();

diff --git a/Tizen.NUI/src/internal/DragAndDropDetector.cs b/Tizen.NUI/src/internal/DragAndDropDetector.cs
index 40fd90b..4cc7523 100755 (executable)
--- a/Tizen.NUI/src/internal/DragAndDropDetector.cs
+++ b/Tizen.NUI/src/internal/DragAndDropDetector.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class DragAndDropDetector : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class DragAndDropDetector : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal DragAndDropDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DragAndDropDetector_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/EncodedBufferImage.cs b/Tizen.NUI/src/internal/EncodedBufferImage.cs
index 02e934a..c8612b0 100755 (executable)
--- a/Tizen.NUI/src/internal/EncodedBufferImage.cs
+++ b/Tizen.NUI/src/internal/EncodedBufferImage.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class EncodedBufferImage : Image {
+namespace Tizen.NUI {\r
+\r
+    internal class EncodedBufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal EncodedBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.EncodedBufferImage_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/FaceCullingModeType.cs b/Tizen.NUI/src/internal/FaceCullingModeType.cs
index 635547d..2711741 100755 (executable)
--- a/Tizen.NUI/src/internal/FaceCullingModeType.cs
+++ b/Tizen.NUI/src/internal/FaceCullingModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum FaceCullingModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum FaceCullingModeType {
   NONE,
   FRONT,
   BACK,

diff --git a/Tizen.NUI/src/internal/FilterModeType.cs b/Tizen.NUI/src/internal/FilterModeType.cs
index 4f1f612..325e834 100755 (executable)
--- a/Tizen.NUI/src/internal/FilterModeType.cs
+++ b/Tizen.NUI/src/internal/FilterModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum FilterModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum FilterModeType {
   NONE = 0,
   DEFAULT,
   NEAREST,

diff --git a/Tizen.NUI/src/internal/FittingModeType.cs b/Tizen.NUI/src/internal/FittingModeType.cs
index 6b818d5..bc6e76a 100755 (executable)
--- a/Tizen.NUI/src/internal/FittingModeType.cs
+++ b/Tizen.NUI/src/internal/FittingModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum FittingModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum FittingModeType {
   SHRINK_TO_FIT,
   SCALE_TO_FILL,
   FIT_WIDTH,

diff --git a/Tizen.NUI/src/internal/FixedRuler.cs b/Tizen.NUI/src/internal/FixedRuler.cs
index f1bab8e..e75abec 100755 (executable)
--- a/Tizen.NUI/src/internal/FixedRuler.cs
+++ b/Tizen.NUI/src/internal/FixedRuler.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FixedRuler : Ruler {
+namespace Tizen.NUI {\r
+\r
+    internal class FixedRuler : Ruler {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FixedRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FixedRuler_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/FloatSignal.cs b/Tizen.NUI/src/internal/FloatSignal.cs
index b2a803d..be8df29 100755 (executable)
--- a/Tizen.NUI/src/internal/FloatSignal.cs
+++ b/Tizen.NUI/src/internal/FloatSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FloatSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class FloatSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class FloatSignal : global::System.IDisposable {
   }
 
   ~FloatSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class FloatSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.FloatSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/FocusChangedSignal.cs b/Tizen.NUI/src/internal/FocusChangedSignal.cs
index c764f9c..42d95f2 100755 (executable)
--- a/Tizen.NUI/src/internal/FocusChangedSignal.cs
+++ b/Tizen.NUI/src/internal/FocusChangedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FocusChangedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class FocusChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class FocusChangedSignal : global::System.IDisposable {
   }
 
   ~FocusChangedSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class FocusChangedSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.FocusChangedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs b/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs
index 4237230..b259d3d 100755 (executable)
--- a/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs
+++ b/Tizen.NUI/src/internal/FocusGroupChangedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FocusGroupChangedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class FocusGroupChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class FocusGroupChangedSignal : global::System.IDisposable {
   }
 
   ~FocusGroupChangedSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class FocusGroupChangedSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.FocusGroupChangedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/FrameBuffer.cs b/Tizen.NUI/src/internal/FrameBuffer.cs
index e58d1b1..5de61b3 100755 (executable)
--- a/Tizen.NUI/src/internal/FrameBuffer.cs
+++ b/Tizen.NUI/src/internal/FrameBuffer.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FrameBuffer : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class FrameBuffer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FrameBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBuffer_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/FrameBufferImage.cs b/Tizen.NUI/src/internal/FrameBufferImage.cs
index da58c67..8160db4 100755 (executable)
--- a/Tizen.NUI/src/internal/FrameBufferImage.cs
+++ b/Tizen.NUI/src/internal/FrameBufferImage.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class FrameBufferImage : Image {
+namespace Tizen.NUI {\r
+\r
+    internal class FrameBufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FrameBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBufferImage_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/GaussianBlurView.cs b/Tizen.NUI/src/internal/GaussianBlurView.cs
index 3aa191a..7817827 100755 (executable)
--- a/Tizen.NUI/src/internal/GaussianBlurView.cs
+++ b/Tizen.NUI/src/internal/GaussianBlurView.cs
@@ -27,10 +27,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class GaussianBlurView : View {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class GaussianBlurView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal GaussianBlurView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GaussianBlurView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs b/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs
index 0ca3832..8ce1ef6 100755 (executable)
--- a/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs
+++ b/Tizen.NUI/src/internal/GaussianBlurViewSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class GaussianBlurViewSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class GaussianBlurViewSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class GaussianBlurViewSignal : global::System.IDisposable {
   }
 
   ~GaussianBlurViewSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class GaussianBlurViewSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.GaussianBlurViewSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/Geometry.cs b/Tizen.NUI/src/internal/Geometry.cs
index 819a960..179f42a 100755 (executable)
--- a/Tizen.NUI/src/internal/Geometry.cs
+++ b/Tizen.NUI/src/internal/Geometry.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Geometry : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class Geometry : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Geometry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Geometry_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/GestureDetector.cs b/Tizen.NUI/src/internal/GestureDetector.cs
index 2998717..169845c 100755 (executable)
--- a/Tizen.NUI/src/internal/GestureDetector.cs
+++ b/Tizen.NUI/src/internal/GestureDetector.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class GestureDetector : Handle {
+namespace Tizen.NUI {\r
+\r
+    public class GestureDetector : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal GestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GestureDetector_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs b/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs
index 5e61b32..c886916 100755 (executable)
--- a/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs
+++ b/Tizen.NUI/src/internal/GradientVisualSpreadMethodType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum GradientVisualSpreadMethodType {
+namespace Tizen.NUI {\r
+\r
+    internal enum GradientVisualSpreadMethodType {
   PAD,
   REFLECT,
   REPEAT

diff --git a/Tizen.NUI/src/internal/GradientVisualUnitsType.cs b/Tizen.NUI/src/internal/GradientVisualUnitsType.cs
index 98cf03e..9f63473 100755 (executable)
--- a/Tizen.NUI/src/internal/GradientVisualUnitsType.cs
+++ b/Tizen.NUI/src/internal/GradientVisualUnitsType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum GradientVisualUnitsType {
+namespace Tizen.NUI {\r
+\r
+    internal enum GradientVisualUnitsType {
   OBJECT_BOUNDING_BOX,
   USER_SPACE
 }

diff --git a/Tizen.NUI/src/internal/Handle.cs b/Tizen.NUI/src/internal/Handle.cs
index ac57095..665db6a 100755 (executable)
--- a/Tizen.NUI/src/internal/Handle.cs
+++ b/Tizen.NUI/src/internal/Handle.cs
@@ -24,175 +24,209 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Handle : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Handle(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Handle obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Handle() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
+namespace Tizen.NUI\r
+{\r
+\r
+    public class Handle : BaseHandle\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal Handle(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Handle_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Handle obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        ~Handle()\r
+        {\r
+            DisposeQueue.Instance.Add(this);\r
+        }\r
+\r
+        public override void Dispose()\r
+        {\r
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
+\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_Handle(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+                base.Dispose();\r
+            }\r
+        }\r
+\r
+\r
+        public Handle() : this(NDalicPINVOKE.Handle_New(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+        }\r
+        public Handle(Handle handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Handle.getCPtr(handle)), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public Handle Assign(Handle rhs)\r
+        {\r
+            Handle ret = new Handle(NDalicPINVOKE.Handle_Assign(swigCPtr, Handle.getCPtr(rhs)), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public static Handle DownCast(BaseHandle handle)\r
+        {\r
+            Handle ret = new Handle(NDalicPINVOKE.Handle_DownCast(BaseHandle.getCPtr(handle)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public bool Supports(Handle.Capability capability)\r
+        {\r
+            bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public uint GetPropertyCount()\r
+        {\r
+            uint ret = NDalicPINVOKE.Handle_GetPropertyCount(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public string GetPropertyName(int index)\r
+        {\r
+            string ret = NDalicPINVOKE.Handle_GetPropertyName(swigCPtr, index);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public int GetPropertyIndex(string name)\r
+        {\r
+            int ret = NDalicPINVOKE.Handle_GetPropertyIndex(swigCPtr, name);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public bool IsPropertyWritable(int index)\r
+        {\r
+            bool ret = NDalicPINVOKE.Handle_IsPropertyWritable(swigCPtr, index);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public bool IsPropertyAnimatable(int index)\r
+        {\r
+            bool ret = NDalicPINVOKE.Handle_IsPropertyAnimatable(swigCPtr, index);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public bool IsPropertyAConstraintInput(int index)\r
+        {\r
+            bool ret = NDalicPINVOKE.Handle_IsPropertyAConstraintInput(swigCPtr, index);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public PropertyType GetPropertyType(int index)\r
+        {\r
+            PropertyType ret = (PropertyType)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetProperty(int index, PropertyValue propertyValue)\r
+        {\r
+            NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, PropertyValue.getCPtr(propertyValue));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public int RegisterProperty(string name, PropertyValue propertyValue)\r
+        {\r
+            int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_0(swigCPtr, name, PropertyValue.getCPtr(propertyValue));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public int RegisterProperty(string name, PropertyValue propertyValue, PropertyAccessMode accessMode)\r
+        {\r
+            int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_1(swigCPtr, name, PropertyValue.getCPtr(propertyValue), (int)accessMode);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public PropertyValue GetProperty(int index)\r
+        {\r
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void GetPropertyIndices(VectorInteger indices)\r
+        {\r
+            NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal PropertyNotification AddPropertyNotification(int index, PropertyCondition condition)\r
+        {\r
+            PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition)\r
+        {\r
+            PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void RemovePropertyNotification(PropertyNotification propertyNotification)\r
+        {\r
+            NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void RemovePropertyNotifications()\r
+        {\r
+            NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void RemoveConstraints()\r
+        {\r
+            NDalicPINVOKE.Handle_RemoveConstraints__SWIG_0(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void RemoveConstraints(uint tag)\r
+        {\r
+            NDalicPINVOKE.Handle_RemoveConstraints__SWIG_1(swigCPtr, tag);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public enum Capability\r
+        {\r
+            DYNAMIC_PROPERTIES = 0x01\r
+        }\r
+\r
     }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Handle(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-  public Handle () : this (NDalicPINVOKE.Handle_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Handle(Handle handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Handle.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Handle Assign(Handle rhs) {
-    Handle ret = new Handle(NDalicPINVOKE.Handle_Assign(swigCPtr, Handle.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Handle DownCast(BaseHandle handle) {
-    Handle ret = new Handle(NDalicPINVOKE.Handle_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Supports(Handle.Capability capability) {
-    bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetPropertyCount() {
-    uint ret = NDalicPINVOKE.Handle_GetPropertyCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public string GetPropertyName(int index) {
-    string ret = NDalicPINVOKE.Handle_GetPropertyName(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int GetPropertyIndex(string name) {
-    int ret = NDalicPINVOKE.Handle_GetPropertyIndex(swigCPtr, name);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsPropertyWritable(int index) {
-    bool ret = NDalicPINVOKE.Handle_IsPropertyWritable(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsPropertyAnimatable(int index) {
-    bool ret = NDalicPINVOKE.Handle_IsPropertyAnimatable(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsPropertyAConstraintInput(int index) {
-    bool ret = NDalicPINVOKE.Handle_IsPropertyAConstraintInput(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PropertyType GetPropertyType(int index) {
-    PropertyType ret = (PropertyType)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetProperty(int index, PropertyValue propertyValue) {
-    NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, PropertyValue.getCPtr(propertyValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public int RegisterProperty(string name, PropertyValue propertyValue) {
-    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_0(swigCPtr, name, PropertyValue.getCPtr(propertyValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int RegisterProperty(string name, PropertyValue propertyValue, PropertyAccessMode accessMode) {
-    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_1(swigCPtr, name, PropertyValue.getCPtr(propertyValue), (int)accessMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PropertyValue GetProperty(int index) {
-    PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void GetPropertyIndices(VectorInteger indices) {
-    NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) {
-    PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) {
-    PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void RemovePropertyNotification(PropertyNotification propertyNotification) {
-    NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemovePropertyNotifications() {
-    NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveConstraints() {
-    NDalicPINVOKE.Handle_RemoveConstraints__SWIG_0(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveConstraints(uint tag) {
-    NDalicPINVOKE.Handle_RemoveConstraints__SWIG_1(swigCPtr, tag);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public enum Capability {
-    DYNAMIC_PROPERTIES = 0x01
-  }
-
-}
-
 }

diff --git a/Tizen.NUI/src/internal/Image.cs b/Tizen.NUI/src/internal/Image.cs
index 46ad000..3f9c1f6 100755 (executable)
--- a/Tizen.NUI/src/internal/Image.cs
+++ b/Tizen.NUI/src/internal/Image.cs
@@ -11,10 +11,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class Image : BaseHandle {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class Image : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Image(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Image_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ImageSignal.cs b/Tizen.NUI/src/internal/ImageSignal.cs
index 5414e1e..88f338c 100755 (executable)
--- a/Tizen.NUI/src/internal/ImageSignal.cs
+++ b/Tizen.NUI/src/internal/ImageSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ImageSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ImageSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Item.cs b/Tizen.NUI/src/internal/Item.cs
index 88ca512..35ed180 100755 (executable)
--- a/Tizen.NUI/src/internal/Item.cs
+++ b/Tizen.NUI/src/internal/Item.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Item : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class Item : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ItemContainer.cs b/Tizen.NUI/src/internal/ItemContainer.cs
index 1a2b5ba..dc2d2a9 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemContainer.cs
+++ b/Tizen.NUI/src/internal/ItemContainer.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+namespace Tizen.NUI {\r
+\r
+    internal class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<Item>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;

diff --git a/Tizen.NUI/src/internal/ItemFactory.cs b/Tizen.NUI/src/internal/ItemFactory.cs
index 15e04ff..6e97869 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemFactory.cs
+++ b/Tizen.NUI/src/internal/ItemFactory.cs
@@ -8,122 +8,127 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-#if true
 using System.Reflection;
-#endif
 
-namespace Tizen.NUI {
-
-public class ItemFactory : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal ItemFactory(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ItemFactory obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~ItemFactory() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ItemFactory(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public virtual uint GetNumberOfItems() {
-    uint ret = NDalicPINVOKE.ItemFactory_GetNumberOfItems(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual Actor NewItem(uint itemId) {
-    Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void ItemReleased(uint itemId, Actor actor) {
-    if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, Actor.getCPtr(actor)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, Actor.getCPtr(actor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ItemFactory() : this(NDalicPINVOKE.new_ItemFactory(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    SwigDirectorConnect();
-  }
-
-  private void SwigDirectorConnect() {
-    if (SwigDerivedClassHasMethod("GetNumberOfItems", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateItemFactory_0(SwigDirectorGetNumberOfItems);
-    if (SwigDerivedClassHasMethod("NewItem", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateItemFactory_1(SwigDirectorNewItem);
-    if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateItemFactory_2(SwigDirectorItemReleased);
-    NDalicPINVOKE.ItemFactory_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2);
-  }\r
+namespace Tizen.NUI\r
+{\r
+\r
+    internal class ItemFactory : global::System.IDisposable\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+        protected bool swigCMemOwn;\r
+\r
+        internal ItemFactory(global::System.IntPtr cPtr, bool cMemoryOwn)\r
+        {\r
+            swigCMemOwn = cMemoryOwn;\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ItemFactory obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        ~ItemFactory()\r
+        {\r
+            DisposeQueue.Instance.Add(this);\r
+        }\r
+\r
+        public virtual void Dispose()\r
+        {\r
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
+\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_ItemFactory(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+            }\r
+        }\r
+\r
+\r
+        public virtual uint GetNumberOfItems()\r
+        {\r
+            uint ret = NDalicPINVOKE.ItemFactory_GetNumberOfItems(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual Actor NewItem(uint itemId)\r
+        {\r
+            Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual void ItemReleased(uint itemId, Actor actor)\r
+        {\r
+            if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, Actor.getCPtr(actor)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, Actor.getCPtr(actor));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public ItemFactory() : this(NDalicPINVOKE.new_ItemFactory(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            SwigDirectorConnect();\r
+        }\r
 \r
+        private void SwigDirectorConnect()\r
+        {\r
+            if (SwigDerivedClassHasMethod("GetNumberOfItems", swigMethodTypes0))\r
+                swigDelegate0 = new SwigDelegateItemFactory_0(SwigDirectorGetNumberOfItems);\r
+            if (SwigDerivedClassHasMethod("NewItem", swigMethodTypes1))\r
+                swigDelegate1 = new SwigDelegateItemFactory_1(SwigDirectorNewItem);\r
+            if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2))\r
+                swigDelegate2 = new SwigDelegateItemFactory_2(SwigDirectorItemReleased);\r
+            NDalicPINVOKE.ItemFactory_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2);\r
+        }\r
 \r
 \r
-#if true
         private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)\r
         {\r
             global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);\r
             bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ItemFactory));\r
             return hasDerivedMethod;\r
         }\r
-#else
-//original
-   private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
-    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ItemFactory));
-    return hasDerivedMethod;
-  }
-#endif
-\r
-\r
-        private uint SwigDirectorGetNumberOfItems() {
-    return GetNumberOfItems();
-  }
-
-  private global::System.IntPtr SwigDirectorNewItem(uint itemId) {
-    return Actor.getCPtr(NewItem(itemId)).Handle;
-  }
-
-  private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor) {
-    ItemReleased(itemId, new Actor(actor, true));
-  }
-
-  public delegate uint SwigDelegateItemFactory_0();
-  public delegate global::System.IntPtr SwigDelegateItemFactory_1(uint itemId);
-  public delegate void SwigDelegateItemFactory_2(uint itemId, global::System.IntPtr actor);
-
-  private SwigDelegateItemFactory_0 swigDelegate0;
-  private SwigDelegateItemFactory_1 swigDelegate1;
-  private SwigDelegateItemFactory_2 swigDelegate2;
-
-  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { typeof(uint) };
-  private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(Actor) };
-}
+\r
+        private uint SwigDirectorGetNumberOfItems()\r
+        {\r
+            return GetNumberOfItems();\r
+        }\r
+\r
+        private global::System.IntPtr SwigDirectorNewItem(uint itemId)\r
+        {\r
+            return Actor.getCPtr(NewItem(itemId)).Handle;\r
+        }\r
+\r
+        private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor)\r
+        {\r
+            ItemReleased(itemId, new Actor(actor, true));\r
+        }\r
+\r
+        public delegate uint SwigDelegateItemFactory_0();\r
+        public delegate global::System.IntPtr SwigDelegateItemFactory_1(uint itemId);\r
+        public delegate void SwigDelegateItemFactory_2(uint itemId, global::System.IntPtr actor);\r
+\r
+        private SwigDelegateItemFactory_0 swigDelegate0;\r
+        private SwigDelegateItemFactory_1 swigDelegate1;\r
+        private SwigDelegateItemFactory_2 swigDelegate2;\r
+\r
+        private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { typeof(uint) };\r
+        private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(Actor) };\r
+    }
 
 }

diff --git a/Tizen.NUI/src/internal/ItemIdContainer.cs b/Tizen.NUI/src/internal/ItemIdContainer.cs
index 63f3e3e..1a09aac 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemIdContainer.cs
+++ b/Tizen.NUI/src/internal/ItemIdContainer.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+namespace Tizen.NUI {\r
+\r
+    internal class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IList<uint>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
@@ -26,10 +26,15 @@ public class ItemIdContainer : global::System.IDisposable, global::System.Collec
   }
 
   ~ItemIdContainer() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -42,6 +47,7 @@ public class ItemIdContainer : global::System.IDisposable, global::System.Collec
     }
   }
 
+
   public ItemIdContainer(global::System.Collections.ICollection c) : this() {
     if (c == null)
       throw new global::System.ArgumentNullException("c");

diff --git a/Tizen.NUI/src/internal/ItemLayout.cs b/Tizen.NUI/src/internal/ItemLayout.cs
index cc023e1..5f88b15 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemLayout.cs
+++ b/Tizen.NUI/src/internal/ItemLayout.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ItemLayout : RefObject {
+namespace Tizen.NUI {\r
+\r
+    internal class ItemLayout : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ItemLayout(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemLayout_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ItemRange.cs b/Tizen.NUI/src/internal/ItemRange.cs
index 1c46776..f35666d 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemRange.cs
+++ b/Tizen.NUI/src/internal/ItemRange.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ItemRange : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ItemRange : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ItemView.cs b/Tizen.NUI/src/internal/ItemView.cs
index 4b524ca..5972adb 100755 (executable)
--- a/Tizen.NUI/src/internal/ItemView.cs
+++ b/Tizen.NUI/src/internal/ItemView.cs
@@ -27,10 +27,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class ItemView : Scrollable {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class ItemView : Scrollable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ItemView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/KeyEventSignal.cs b/Tizen.NUI/src/internal/KeyEventSignal.cs
index 41e24f3..252f05a 100755 (executable)
--- a/Tizen.NUI/src/internal/KeyEventSignal.cs
+++ b/Tizen.NUI/src/internal/KeyEventSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class KeyEventSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class KeyEventSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class KeyEventSignal : global::System.IDisposable {
   }
 
   ~KeyEventSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class KeyEventSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.KeyEventSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/KeyInputFocusManager.cs b/Tizen.NUI/src/internal/KeyInputFocusManager.cs
index 14cca34..5fd46da 100755 (executable)
--- a/Tizen.NUI/src/internal/KeyInputFocusManager.cs
+++ b/Tizen.NUI/src/internal/KeyInputFocusManager.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class KeyInputFocusManager : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    public class KeyInputFocusManager : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal KeyInputFocusManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.KeyInputFocusManager_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -71,13 +71,13 @@ public class KeyInputFocusManager : BaseHandle {
     return ret;
   }
 
-  public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() {
+  internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() {
     SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(NDalicPINVOKE.KeyInputFocusManager_KeyInputFocusChangedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public KeyEventSignal UnhandledKeyEventSignal() {
+  internal KeyEventSignal UnhandledKeyEventSignal() {
     KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.KeyInputFocusManager_UnhandledKeyEventSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/KeyInputFocusSignal.cs b/Tizen.NUI/src/internal/KeyInputFocusSignal.cs
index e11383c..9ffd9c1 100755 (executable)
--- a/Tizen.NUI/src/internal/KeyInputFocusSignal.cs
+++ b/Tizen.NUI/src/internal/KeyInputFocusSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class KeyInputFocusSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class KeyInputFocusSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class KeyInputFocusSignal : global::System.IDisposable {
   }
 
   ~KeyInputFocusSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class KeyInputFocusSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.KeyInputFocusSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/public/LinearConstrainer.cs b/Tizen.NUI/src/internal/LinearConstrainer.cs
similarity index 96%
rename from Tizen.NUI/src/public/LinearConstrainer.cs
rename to Tizen.NUI/src/internal/LinearConstrainer.cs
index 9f51997..634a560 100755 (executable)
--- a/Tizen.NUI/src/public/LinearConstrainer.cs
+++ b/Tizen.NUI/src/internal/LinearConstrainer.cs
@@ -32,7 +32,7 @@
 namespace Tizen.NUI\r
 {\r
 \r
-    public class LinearConstrainer : Handle\r
+    internal class LinearConstrainer : Handle\r
     {\r
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
 \r
@@ -160,7 +160,7 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public void Remove(Handle target)\r
+        internal void Remove(Handle target)\r
         {\r
             NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Handle.getCPtr(target));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r

diff --git a/Tizen.NUI/src/internal/LoadingState.cs b/Tizen.NUI/src/internal/LoadingState.cs
index 959d97f..a028219 100755 (executable)
--- a/Tizen.NUI/src/internal/LoadingState.cs
+++ b/Tizen.NUI/src/internal/LoadingState.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum LoadingState {
+namespace Tizen.NUI {\r
+\r
+    internal enum LoadingState {
   ResourceLoading,
   ResourceLoadingSucceeded,
   ResourceLoadingFailed

diff --git a/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs b/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs
index 55efff4..a336804 100755 (executable)
--- a/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs
+++ b/Tizen.NUI/src/internal/LongPressGestureDetectedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class LongPressGestureDetectedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class LongPressGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class LongPressGestureDetectedSignal : global::System.IDisposable {
   }
 
   ~LongPressGestureDetectedSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class LongPressGestureDetectedSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.LongPressGestureDetectedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/LongPressGestureDetector.cs b/Tizen.NUI/src/internal/LongPressGestureDetector.cs
index 68adf64..3c824c1 100755 (executable)
--- a/Tizen.NUI/src/internal/LongPressGestureDetector.cs
+++ b/Tizen.NUI/src/internal/LongPressGestureDetector.cs
@@ -27,9 +27,9 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-public class LongPressGestureDetector : GestureDetector {
+using System.Runtime.InteropServices;\r
+\r
+    public class LongPressGestureDetector : GestureDetector {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal LongPressGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LongPressGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -207,7 +207,7 @@ public static LongPressGestureDetector GetLongPressGestureDetectorFromPtr(global
     return ret;
   }
 
-  public LongPressGestureDetectedSignal DetectedSignal() {
+  internal LongPressGestureDetectedSignal DetectedSignal() {
     LongPressGestureDetectedSignal ret = new LongPressGestureDetectedSignal(NDalicPINVOKE.LongPressGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/ManualPINVOKE.cs b/Tizen.NUI/src/internal/ManualPINVOKE.cs
index a14142e..f38f57a 100755 (executable)
--- a/Tizen.NUI/src/internal/ManualPINVOKE.cs
+++ b/Tizen.NUI/src/internal/ManualPINVOKE.cs
@@ -104,7 +104,7 @@ namespace Tizen.NUI
         public static extern global::System.IntPtr new_ViewWrapperImpl(int jarg1);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewWrapperImpl_New")]
-        public static extern global::System.IntPtr ViewWrapperImpl_New(global::System.Runtime.InteropServices.HandleRef jarg1);
+        public static extern global::System.IntPtr ViewWrapperImpl_New(string jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ViewWrapperImpl")]
         public static extern void delete_ViewWrapperImpl(global::System.Runtime.InteropServices.HandleRef jarg1);
@@ -116,7 +116,7 @@ namespace Tizen.NUI
         public static extern global::System.IntPtr GetControlWrapperImpl__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ViewWrapper_New")]
-        public static extern global::System.IntPtr ViewWrapper_New(global::System.Runtime.InteropServices.HandleRef jarg1);
+        public static extern global::System.IntPtr ViewWrapper_New(string jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_ViewWrapper__SWIG_0")]
         public static extern global::System.IntPtr new_ViewWrapper__SWIG_0();
@@ -187,18 +187,21 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_MakeCallback")]
         public static extern global::System.IntPtr MakeCallback(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_BATCH_PARENT_get")]
-        public static extern int Actor_Property_BATCH_PARENT_get();
-        
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_SIBLING_ORDER_get")]
         public static extern int Actor_Property_SIBLING_ORDER_get();
 
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Renderer_Property_BATCHING_ENABLED_get")]
-        public static extern int Renderer_Property_BATCHING_ENABLED_get();
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_OPACITY_get")]
+        public static extern int Actor_Property_OPACITY_get();
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_TOOLTIP_get")]
         public static extern int View_Property_TOOLTIP_get();
 
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_STATE_get")]
+        public static extern int View_Property_STATE_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_SUB_STATE_get")]
+        public static extern int View_Property_SUB_STATE_get();
+
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_ItemView_Property_LAYOUT_get")]
         public static extern int ItemView_Property_LAYOUT_get();
 

diff --git a/Tizen.NUI/src/internal/Matrix.cs b/Tizen.NUI/src/internal/Matrix.cs
index 41c8f7c..cb63132 100755 (executable)
--- a/Tizen.NUI/src/internal/Matrix.cs
+++ b/Tizen.NUI/src/internal/Matrix.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Matrix : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class Matrix : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -62,7 +62,7 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Matrix(Quaternion rotation) : this(NDalicPINVOKE.new_Matrix__SWIG_3(Quaternion.getCPtr(rotation)), true) {
+  public Matrix(Rotation rotation) : this(NDalicPINVOKE.new_Matrix__SWIG_3(Rotation.getCPtr(rotation)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -183,8 +183,8 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void Multiply(Matrix result, Matrix lhs, Quaternion rhs) {
-    NDalicPINVOKE.Matrix_Multiply__SWIG_1(Matrix.getCPtr(result), Matrix.getCPtr(lhs), Quaternion.getCPtr(rhs));
+  public static void Multiply(Matrix result, Matrix lhs, Rotation rhs) {
+    NDalicPINVOKE.Matrix_Multiply__SWIG_1(Matrix.getCPtr(result), Matrix.getCPtr(lhs), Rotation.getCPtr(rhs));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -206,13 +206,13 @@ public class Matrix : global::System.IDisposable {
     return ret;
   }
 
-  public void SetTransformComponents(Vector3 scale, Quaternion rotation, Vector3 translation) {
-    NDalicPINVOKE.Matrix_SetTransformComponents(swigCPtr, Vector3.getCPtr(scale), Quaternion.getCPtr(rotation), Vector3.getCPtr(translation));
+  public void SetTransformComponents(Vector3 scale, Rotation rotation, Vector3 translation) {
+    NDalicPINVOKE.Matrix_SetTransformComponents(swigCPtr, Vector3.getCPtr(scale), Rotation.getCPtr(rotation), Vector3.getCPtr(translation));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetInverseTransformComponents(Vector3 scale, Quaternion rotation, Vector3 translation) {
-    NDalicPINVOKE.Matrix_SetInverseTransformComponents__SWIG_0(swigCPtr, Vector3.getCPtr(scale), Quaternion.getCPtr(rotation), Vector3.getCPtr(translation));
+  public void SetInverseTransformComponents(Vector3 scale, Rotation rotation, Vector3 translation) {
+    NDalicPINVOKE.Matrix_SetInverseTransformComponents__SWIG_0(swigCPtr, Vector3.getCPtr(scale), Rotation.getCPtr(rotation), Vector3.getCPtr(translation));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -221,8 +221,8 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void GetTransformComponents(Vector3 position, Quaternion rotation, Vector3 scale) {
-    NDalicPINVOKE.Matrix_GetTransformComponents(swigCPtr, Vector3.getCPtr(position), Quaternion.getCPtr(rotation), Vector3.getCPtr(scale));
+  public void GetTransformComponents(Vector3 position, Rotation rotation, Vector3 scale) {
+    NDalicPINVOKE.Matrix_GetTransformComponents(swigCPtr, Vector3.getCPtr(position), Rotation.getCPtr(rotation), Vector3.getCPtr(scale));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/Tizen.NUI/src/internal/Matrix3.cs b/Tizen.NUI/src/internal/Matrix3.cs
index 84d2111..d317375 100755 (executable)
--- a/Tizen.NUI/src/internal/Matrix3.cs
+++ b/Tizen.NUI/src/internal/Matrix3.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Matrix3 : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class Matrix3 : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs b/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs
index 9150d64..75486af 100755 (executable)
--- a/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs
+++ b/Tizen.NUI/src/internal/MeshVisualShadingModeValue.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum MeshVisualShadingModeValue {
+namespace Tizen.NUI {\r
+\r
+    internal enum MeshVisualShadingModeValue {
   TEXTURELESS_WITH_DIFFUSE_LIGHTING,
   TEXTURED_WITH_SPECULAR_LIGHTING,
   TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING

diff --git a/Tizen.NUI/src/internal/Meta.cs b/Tizen.NUI/src/internal/Meta.cs
index ecacfd5..3d059c4 100755 (executable)
--- a/Tizen.NUI/src/internal/Meta.cs
+++ b/Tizen.NUI/src/internal/Meta.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum Meta {
+namespace Tizen.NUI {\r
+\r
+    internal enum Meta {
   DIMENSION_COUNT = 2
 }
 

diff --git a/Tizen.NUI/src/internal/Model3dView.cs b/Tizen.NUI/src/internal/Model3dView.cs
index efddc5c..3aace0c 100755 (executable)
--- a/Tizen.NUI/src/internal/Model3dView.cs
+++ b/Tizen.NUI/src/internal/Model3dView.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Model3dView : View {
+namespace Tizen.NUI {\r
+\r
+    internal class Model3dView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Model3dView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Model3dView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/NDalic.cs b/Tizen.NUI/src/internal/NDalic.cs
index d848e65..e037ec0 100755 (executable)
--- a/Tizen.NUI/src/internal/NDalic.cs
+++ b/Tizen.NUI/src/internal/NDalic.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class NDalic {
+namespace Tizen.NUI {\r
+\r
+    internal class NDalic {
   public static uint int_to_uint(int x) {
     uint ret = NDalicPINVOKE.int_to_uint(x);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -315,6 +315,60 @@ public class NDalic {
     return ret;
   }
 
+  public static uint NextPowerOfTwo(uint i) {
+    uint ret = NDalicPINVOKE.NextPowerOfTwo(i);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static bool IsPowerOfTwo(uint i) {
+    bool ret = NDalicPINVOKE.IsPowerOfTwo(i);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float GetRangedEpsilon(float a, float b) {
+    float ret = NDalicPINVOKE.GetRangedEpsilon(a, b);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static bool EqualsZero(float value) {
+    bool ret = NDalicPINVOKE.EqualsZero(value);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static bool Equals(float a, float b) {
+    bool ret = NDalicPINVOKE.Equals__SWIG_0(a, b);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static bool Equals(float a, float b, float epsilon) {
+    bool ret = NDalicPINVOKE.Equals__SWIG_1(a, b, epsilon);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float Round(float value, int pos) {
+    float ret = NDalicPINVOKE.Round(value, pos);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float WrapInDomain(float x, float start, float end) {
+    float ret = NDalicPINVOKE.WrapInDomain(x, start, end);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float ShortestDistanceInDomain(float a, float b, float start, float end) {
+    float ret = NDalicPINVOKE.ShortestDistanceInDomain(a, b, start, end);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
   public static string GetName(PropertyType type) {
     string ret = NDalicPINVOKE.GetName((int)type);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1020,7 +1074,6 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
   public static readonly int IMAGE_VISUAL_DESIRED_HEIGHT = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_HEIGHT_get();
   public static readonly int IMAGE_VISUAL_SYNCHRONOUS_LOADING = NDalicPINVOKE.IMAGE_VISUAL_SYNCHRONOUS_LOADING_get();
   public static readonly int IMAGE_VISUAL_BORDER_ONLY = NDalicPINVOKE.IMAGE_VISUAL_BORDER_ONLY_get();
-  public static readonly int IMAGE_VISUAL_BATCHING_ENABLED = NDalicPINVOKE.IMAGE_VISUAL_BATCHING_ENABLED_get();
   public static readonly int IMAGE_VISUAL_PIXEL_AREA = NDalicPINVOKE.IMAGE_VISUAL_PIXEL_AREA_get();
   public static readonly int IMAGE_VISUAL_WRAP_MODE_U = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_U_get();
   public static readonly int IMAGE_VISUAL_WRAP_MODE_V = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_V_get();

diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
index 3f42ef1..42087f0 100755 (executable)
--- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -1079,149 +1079,110 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Clamp__SWIG_4")]
   public static extern global::System.IntPtr Clamp__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_0")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_0();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rotation__SWIG_0")]
+  public static extern global::System.IntPtr new_Rotation__SWIG_0();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_1")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rotation__SWIG_1")]
+  public static extern global::System.IntPtr new_Rotation__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_2")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_Rotation")]
+  public static extern void delete_Rotation(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_3")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_IDENTITY_get")]
+  public static extern global::System.IntPtr Rotation_IDENTITY_get();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_4")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_IsIdentity")]
+  public static extern bool Rotation_IsIdentity(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_5")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_5(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_GetAxisAngle")]
+  public static extern bool Rotation_GetAxisAngle(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_6")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_6(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Add")]
+  public static extern global::System.IntPtr Rotation_Add(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_7")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_7(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Subtract__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Subtract__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_Quaternion")]
-  public static extern void delete_Quaternion(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_IDENTITY_get")]
-  public static extern global::System.IntPtr Quaternion_IDENTITY_get();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_IsIdentity")]
-  public static extern bool Quaternion_IsIdentity(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Divide__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Divide__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_ToAxisAngle")]
-  public static extern bool Quaternion_ToAxisAngle(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_2")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AsVector")]
-  public static extern global::System.IntPtr Quaternion_AsVector(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Divide__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Divide__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SetEuler")]
-  public static extern void Quaternion_SetEuler(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Subtract__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Subtract__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_EulerAngles")]
-  public static extern global::System.IntPtr Quaternion_EulerAngles(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_AddAssign")]
+  public static extern global::System.IntPtr Rotation_AddAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Add")]
-  public static extern global::System.IntPtr Quaternion_Add(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_SubtractAssign")]
+  public static extern global::System.IntPtr Rotation_SubtractAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Subtract__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Subtract__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_MultiplyAssign__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_MultiplyAssign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_MultiplyAssign__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_MultiplyAssign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_DivideAssign")]
+  public static extern global::System.IntPtr Rotation_DivideAssign(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Divide__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Divide__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_EqualTo")]
+  public static extern bool Rotation_EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_2")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_NotEqualTo")]
+  public static extern bool Rotation_NotEqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Divide__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Divide__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Length")]
+  public static extern float Rotation_Length(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Subtract__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Subtract__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_LengthSquared")]
+  public static extern float Rotation_LengthSquared(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AddAssign")]
-  public static extern global::System.IntPtr Quaternion_AddAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Normalize")]
+  public static extern void Rotation_Normalize(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SubtractAssign")]
-  public static extern global::System.IntPtr Quaternion_SubtractAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Normalized")]
+  public static extern global::System.IntPtr Rotation_Normalized(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_MultiplyAssign__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_MultiplyAssign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Conjugate")]
+  public static extern void Rotation_Conjugate(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_MultiplyAssign__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_MultiplyAssign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Invert")]
+  public static extern void Rotation_Invert(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_DivideAssign")]
-  public static extern global::System.IntPtr Quaternion_DivideAssign(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Log")]
+  public static extern global::System.IntPtr Rotation_Log(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_EqualTo")]
-  public static extern bool Quaternion_EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Exp")]
+  public static extern global::System.IntPtr Rotation_Exp(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_NotEqualTo")]
-  public static extern bool Quaternion_NotEqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Dot")]
+  public static extern float Rotation_Dot(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Length")]
-  public static extern float Quaternion_Length(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Lerp")]
+  public static extern global::System.IntPtr Rotation_Lerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_LengthSquared")]
-  public static extern float Quaternion_LengthSquared(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Slerp")]
+  public static extern global::System.IntPtr Rotation_Slerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Normalize")]
-  public static extern void Quaternion_Normalize(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_SlerpNoInvert")]
+  public static extern global::System.IntPtr Rotation_SlerpNoInvert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Normalized")]
-  public static extern global::System.IntPtr Quaternion_Normalized(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Squad")]
+  public static extern global::System.IntPtr Rotation_Squad(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, float jarg5);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Conjugate")]
-  public static extern void Quaternion_Conjugate(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Invert")]
-  public static extern void Quaternion_Invert(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Log")]
-  public static extern global::System.IntPtr Quaternion_Log(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Exp")]
-  public static extern global::System.IntPtr Quaternion_Exp(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Dot")]
-  public static extern float Quaternion_Dot(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Lerp")]
-  public static extern global::System.IntPtr Quaternion_Lerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Slerp")]
-  public static extern global::System.IntPtr Quaternion_Slerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SlerpNoInvert")]
-  public static extern global::System.IntPtr Quaternion_SlerpNoInvert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Squad")]
-  public static extern global::System.IntPtr Quaternion_Squad(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, float jarg5);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AngleBetween")]
-  public static extern float Quaternion_AngleBetween(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Rotate__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Rotate__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Rotate__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Rotate__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_mVector_set")]
-  public static extern void Quaternion_mVector_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_mVector_get")]
-  public static extern global::System.IntPtr Quaternion_mVector_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_AngleBetween")]
+  public static extern float Rotation_AngleBetween(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Matrix__SWIG_0")]
   public static extern global::System.IntPtr new_Matrix__SWIG_0();
@@ -1409,6 +1370,33 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_EqualTo__SWIG_9")]
   public static extern bool EqualTo__SWIG_9(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_NextPowerOfTwo")]
+  public static extern uint NextPowerOfTwo(uint jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IsPowerOfTwo")]
+  public static extern bool IsPowerOfTwo(uint jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_GetRangedEpsilon")]
+  public static extern float GetRangedEpsilon(float jarg1, float jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_EqualsZero")]
+  public static extern bool EqualsZero(float jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Equals__SWIG_0")]
+  public static extern bool Equals__SWIG_0(float jarg1, float jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Equals__SWIG_1")]
+  public static extern bool Equals__SWIG_1(float jarg1, float jarg2, float jarg3);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Round")]
+  public static extern float Round(float jarg1, int jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_WrapInDomain")]
+  public static extern float WrapInDomain(float jarg1, float jarg2, float jarg3);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ShortestDistanceInDomain")]
+  public static extern float ShortestDistanceInDomain(float jarg1, float jarg2, float jarg3, float jarg4);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_INVALID_INDEX_get")]
   public static extern int Property_INVALID_INDEX_get();
 
@@ -5171,365 +5159,161 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_TouchPointContainer")]
   public static extern void delete_TouchPointContainer(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectDouble__SWIG_0")]
-  public static extern global::System.IntPtr new_RectDouble__SWIG_0();
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectDouble__SWIG_1")]
-  public static extern global::System.IntPtr new_RectDouble__SWIG_1(double jarg1, double jarg2, double jarg3, double jarg4);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectDouble__SWIG_2")]
-  public static extern global::System.IntPtr new_RectDouble__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Assign")]
-  public static extern global::System.IntPtr RectDouble_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Set")]
-  public static extern void RectDouble_Set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2, double jarg3, double jarg4, double jarg5);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_IsEmpty")]
-  public static extern bool RectDouble_IsEmpty(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Left")]
-  public static extern double RectDouble_Left(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Right")]
-  public static extern double RectDouble_Right(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Top")]
-  public static extern double RectDouble_Top(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Bottom")]
-  public static extern double RectDouble_Bottom(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Area")]
-  public static extern double RectDouble_Area(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Intersects")]
-  public static extern bool RectDouble_Intersects(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_Contains")]
-  public static extern bool RectDouble_Contains(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_x_set")]
-  public static extern void RectDouble_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_x_get")]
-  public static extern double RectDouble_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_left_set")]
-  public static extern void RectDouble_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_left_get")]
-  public static extern double RectDouble_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_y_set")]
-  public static extern void RectDouble_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_y_get")]
-  public static extern double RectDouble_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_right_set")]
-  public static extern void RectDouble_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_right_get")]
-  public static extern double RectDouble_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_width_set")]
-  public static extern void RectDouble_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_width_get")]
-  public static extern double RectDouble_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_bottom_set")]
-  public static extern void RectDouble_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_bottom_get")]
-  public static extern double RectDouble_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rectangle__SWIG_0")]
+  public static extern global::System.IntPtr new_Rectangle__SWIG_0();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_height_set")]
-  public static extern void RectDouble_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rectangle__SWIG_1")]
+  public static extern global::System.IntPtr new_Rectangle__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_height_get")]
-  public static extern double RectDouble_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rectangle__SWIG_2")]
+  public static extern global::System.IntPtr new_Rectangle__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_top_set")]
-  public static extern void RectDouble_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, double jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Assign")]
+  public static extern global::System.IntPtr Rectangle_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectDouble_top_get")]
-  public static extern double RectDouble_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Set")]
+  public static extern void Rectangle_Set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2, int jarg3, int jarg4, int jarg5);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_RectDouble")]
-  public static extern void delete_RectDouble(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_IsEmpty")]
+  public static extern bool Rectangle_IsEmpty(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectInteger__SWIG_0")]
-  public static extern global::System.IntPtr new_RectInteger__SWIG_0();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Left")]
+  public static extern int Rectangle_Left(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectInteger__SWIG_1")]
-  public static extern global::System.IntPtr new_RectInteger__SWIG_1(int jarg1, int jarg2, int jarg3, int jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Right")]
+  public static extern int Rectangle_Right(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectInteger__SWIG_2")]
-  public static extern global::System.IntPtr new_RectInteger__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Top")]
+  public static extern int Rectangle_Top(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Assign")]
-  public static extern global::System.IntPtr RectInteger_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Bottom")]
+  public static extern int Rectangle_Bottom(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Set")]
-  public static extern void RectInteger_Set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2, int jarg3, int jarg4, int jarg5);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Area")]
+  public static extern int Rectangle_Area(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_IsEmpty")]
-  public static extern bool RectInteger_IsEmpty(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Intersects")]
+  public static extern bool Rectangle_Intersects(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Left")]
-  public static extern int RectInteger_Left(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_Contains")]
+  public static extern bool Rectangle_Contains(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Right")]
-  public static extern int RectInteger_Right(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_x_set")]
+  public static extern void Rectangle_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Top")]
-  public static extern int RectInteger_Top(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_x_get")]
+  public static extern int Rectangle_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Bottom")]
-  public static extern int RectInteger_Bottom(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_left_set")]
+  public static extern void Rectangle_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Area")]
-  public static extern int RectInteger_Area(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_left_get")]
+  public static extern int Rectangle_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Intersects")]
-  public static extern bool RectInteger_Intersects(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_y_set")]
+  public static extern void Rectangle_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_Contains")]
-  public static extern bool RectInteger_Contains(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_y_get")]
+  public static extern int Rectangle_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_x_set")]
-  public static extern void RectInteger_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_right_set")]
+  public static extern void Rectangle_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_x_get")]
-  public static extern int RectInteger_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_right_get")]
+  public static extern int Rectangle_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_left_set")]
-  public static extern void RectInteger_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_width_set")]
+  public static extern void Rectangle_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_left_get")]
-  public static extern int RectInteger_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_width_get")]
+  public static extern int Rectangle_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_y_set")]
-  public static extern void RectInteger_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_bottom_set")]
+  public static extern void Rectangle_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_y_get")]
-  public static extern int RectInteger_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_bottom_get")]
+  public static extern int Rectangle_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_right_set")]
-  public static extern void RectInteger_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_height_set")]
+  public static extern void Rectangle_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_right_get")]
-  public static extern int RectInteger_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_height_get")]
+  public static extern int Rectangle_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_width_set")]
-  public static extern void RectInteger_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_top_set")]
+  public static extern void Rectangle_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_width_get")]
-  public static extern int RectInteger_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rectangle_top_get")]
+  public static extern int Rectangle_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_bottom_set")]
-  public static extern void RectInteger_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_Rectangle")]
+  public static extern void delete_Rectangle(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_bottom_get")]
-  public static extern int RectInteger_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_PaddingType__SWIG_0")]
+  public static extern global::System.IntPtr new_PaddingType__SWIG_0();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_height_set")]
-  public static extern void RectInteger_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_PaddingType__SWIG_1")]
+  public static extern global::System.IntPtr new_PaddingType__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_height_get")]
-  public static extern int RectInteger_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_PaddingType__SWIG_2")]
+  public static extern global::System.IntPtr new_PaddingType__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_top_set")]
-  public static extern void RectInteger_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_Assign")]
+  public static extern global::System.IntPtr PaddingType_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectInteger_top_get")]
-  public static extern int RectInteger_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_Set")]
+  public static extern void PaddingType_Set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3, float jarg4, float jarg5);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_RectInteger")]
-  public static extern void delete_RectInteger(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_x_set")]
+  public static extern void PaddingType_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectUnsignedInteger__SWIG_0")]
-  public static extern global::System.IntPtr new_RectUnsignedInteger__SWIG_0();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_x_get")]
+  public static extern float PaddingType_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectUnsignedInteger__SWIG_1")]
-  public static extern global::System.IntPtr new_RectUnsignedInteger__SWIG_1(uint jarg1, uint jarg2, uint jarg3, uint jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_left_set")]
+  public static extern void PaddingType_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectUnsignedInteger__SWIG_2")]
-  public static extern global::System.IntPtr new_RectUnsignedInteger__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_left_get")]
+  public static extern float PaddingType_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Assign")]
-  public static extern global::System.IntPtr RectUnsignedInteger_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_y_set")]
+  public static extern void PaddingType_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Set")]
-  public static extern void RectUnsignedInteger_Set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2, uint jarg3, uint jarg4, uint jarg5);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_y_get")]
+  public static extern float PaddingType_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_IsEmpty")]
-  public static extern bool RectUnsignedInteger_IsEmpty(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_right_set")]
+  public static extern void PaddingType_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Left")]
-  public static extern uint RectUnsignedInteger_Left(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_right_get")]
+  public static extern float PaddingType_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Right")]
-  public static extern uint RectUnsignedInteger_Right(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_width_set")]
+  public static extern void PaddingType_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Top")]
-  public static extern uint RectUnsignedInteger_Top(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_width_get")]
+  public static extern float PaddingType_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Bottom")]
-  public static extern uint RectUnsignedInteger_Bottom(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_bottom_set")]
+  public static extern void PaddingType_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Area")]
-  public static extern uint RectUnsignedInteger_Area(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_bottom_get")]
+  public static extern float PaddingType_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Intersects")]
-  public static extern bool RectUnsignedInteger_Intersects(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_height_set")]
+  public static extern void PaddingType_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_Contains")]
-  public static extern bool RectUnsignedInteger_Contains(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_height_get")]
+  public static extern float PaddingType_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_x_set")]
-  public static extern void RectUnsignedInteger_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_top_set")]
+  public static extern void PaddingType_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_x_get")]
-  public static extern uint RectUnsignedInteger_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_PaddingType_top_get")]
+  public static extern float PaddingType_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_left_set")]
-  public static extern void RectUnsignedInteger_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_left_get")]
-  public static extern uint RectUnsignedInteger_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_y_set")]
-  public static extern void RectUnsignedInteger_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_y_get")]
-  public static extern uint RectUnsignedInteger_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_right_set")]
-  public static extern void RectUnsignedInteger_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_right_get")]
-  public static extern uint RectUnsignedInteger_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_width_set")]
-  public static extern void RectUnsignedInteger_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_width_get")]
-  public static extern uint RectUnsignedInteger_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_bottom_set")]
-  public static extern void RectUnsignedInteger_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_bottom_get")]
-  public static extern uint RectUnsignedInteger_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_height_set")]
-  public static extern void RectUnsignedInteger_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_height_get")]
-  public static extern uint RectUnsignedInteger_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_top_set")]
-  public static extern void RectUnsignedInteger_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectUnsignedInteger_top_get")]
-  public static extern uint RectUnsignedInteger_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_RectUnsignedInteger")]
-  public static extern void delete_RectUnsignedInteger(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectFloat__SWIG_0")]
-  public static extern global::System.IntPtr new_RectFloat__SWIG_0();
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectFloat__SWIG_1")]
-  public static extern global::System.IntPtr new_RectFloat__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_RectFloat__SWIG_2")]
-  public static extern global::System.IntPtr new_RectFloat__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Assign")]
-  public static extern global::System.IntPtr RectFloat_Assign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Set")]
-  public static extern void RectFloat_Set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3, float jarg4, float jarg5);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_IsEmpty")]
-  public static extern bool RectFloat_IsEmpty(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Left")]
-  public static extern float RectFloat_Left(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Right")]
-  public static extern float RectFloat_Right(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Top")]
-  public static extern float RectFloat_Top(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Bottom")]
-  public static extern float RectFloat_Bottom(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Area")]
-  public static extern float RectFloat_Area(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Intersects")]
-  public static extern bool RectFloat_Intersects(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_Contains")]
-  public static extern bool RectFloat_Contains(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_x_set")]
-  public static extern void RectFloat_x_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_x_get")]
-  public static extern float RectFloat_x_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_left_set")]
-  public static extern void RectFloat_left_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_left_get")]
-  public static extern float RectFloat_left_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_y_set")]
-  public static extern void RectFloat_y_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_y_get")]
-  public static extern float RectFloat_y_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_right_set")]
-  public static extern void RectFloat_right_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_right_get")]
-  public static extern float RectFloat_right_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_width_set")]
-  public static extern void RectFloat_width_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_width_get")]
-  public static extern float RectFloat_width_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_bottom_set")]
-  public static extern void RectFloat_bottom_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_bottom_get")]
-  public static extern float RectFloat_bottom_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_height_set")]
-  public static extern void RectFloat_height_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_height_get")]
-  public static extern float RectFloat_height_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_top_set")]
-  public static extern void RectFloat_top_set(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RectFloat_top_get")]
-  public static extern float RectFloat_top_get(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_RectFloat")]
-  public static extern void delete_RectFloat(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_PaddingType")]
+  public static extern void delete_PaddingType(global::System.Runtime.InteropServices.HandleRef jarg1);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VectorInteger_BaseType_get")]
   public static extern int VectorInteger_BaseType_get();
@@ -6614,9 +6398,6 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IMAGE_VISUAL_BORDER_ONLY_get")]
   public static extern int IMAGE_VISUAL_BORDER_ONLY_get();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IMAGE_VISUAL_BATCHING_ENABLED_get")]
-  public static extern int IMAGE_VISUAL_BATCHING_ENABLED_get();
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_IMAGE_VISUAL_PIXEL_AREA_get")]
   public static extern int IMAGE_VISUAL_PIXEL_AREA_get();
 

diff --git a/Tizen.NUI/src/internal/NativeImage.cs b/Tizen.NUI/src/internal/NativeImage.cs
index 04988c3..50c130d 100755 (executable)
--- a/Tizen.NUI/src/internal/NativeImage.cs
+++ b/Tizen.NUI/src/internal/NativeImage.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class NativeImage : Image {
+namespace Tizen.NUI {\r
+\r
+    internal class NativeImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NativeImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImage_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/NativeImageInterface.cs b/Tizen.NUI/src/internal/NativeImageInterface.cs
index 3ea6bcd..9c66963 100755 (executable)
--- a/Tizen.NUI/src/internal/NativeImageInterface.cs
+++ b/Tizen.NUI/src/internal/NativeImageInterface.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class NativeImageInterface : RefObject {
+namespace Tizen.NUI {\r
+\r
+    internal class NativeImageInterface : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NativeImageInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImageInterface_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/NinePatchImage.cs b/Tizen.NUI/src/internal/NinePatchImage.cs
index d7e9ed4..5b715a2 100755 (executable)
--- a/Tizen.NUI/src/internal/NinePatchImage.cs
+++ b/Tizen.NUI/src/internal/NinePatchImage.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class NinePatchImage : ResourceImage {
+namespace Tizen.NUI {\r
+\r
+    internal class NinePatchImage : ResourceImage {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NinePatchImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NinePatchImage_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -99,8 +99,8 @@ public class NinePatchImage : ResourceImage {
     return ret;
   }
 
-  public RectInteger GetChildRectangle() {
-    RectInteger ret = new RectInteger(NDalicPINVOKE.NinePatchImage_GetChildRectangle(swigCPtr), true);
+  public Rectangle GetChildRectangle() {
+    Rectangle ret = new Rectangle(NDalicPINVOKE.NinePatchImage_GetChildRectangle(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }

diff --git a/Tizen.NUI/src/internal/ObjectCreatedSignal.cs b/Tizen.NUI/src/internal/ObjectCreatedSignal.cs
index 1284cee..cd7ebbd 100755 (executable)
--- a/Tizen.NUI/src/internal/ObjectCreatedSignal.cs
+++ b/Tizen.NUI/src/internal/ObjectCreatedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ObjectCreatedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ObjectCreatedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ObjectCreatedSignal : global::System.IDisposable {
   }
 
   ~ObjectCreatedSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ObjectCreatedSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ObjectCreatedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs b/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs
index da25c75..ac1a3f3 100755 (executable)
--- a/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs
+++ b/Tizen.NUI/src/internal/ObjectDestroyedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ObjectDestroyedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ObjectDestroyedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class ObjectDestroyedSignal : global::System.IDisposable {
   }
 
   ~ObjectDestroyedSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class ObjectDestroyedSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.ObjectDestroyedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ObjectRegistry.cs b/Tizen.NUI/src/internal/ObjectRegistry.cs
index 408dcb0..a581227 100755 (executable)
--- a/Tizen.NUI/src/internal/ObjectRegistry.cs
+++ b/Tizen.NUI/src/internal/ObjectRegistry.cs
@@ -11,10 +11,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class ObjectRegistry : BaseHandle {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class ObjectRegistry : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ObjectRegistry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ObjectRegistry_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PaddingType.cs b/Tizen.NUI/src/internal/PaddingType.cs
new file mode 100755 (executable)
index 0000000..d1f3caf
--- /dev/null
+++ b/Tizen.NUI/src/internal/PaddingType.cs
@@ -0,0 +1,288 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI\r
+{\r
+\r
+    public class PaddingType : global::System.IDisposable\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+        protected bool swigCMemOwn;\r
+\r
+        internal PaddingType(global::System.IntPtr cPtr, bool cMemoryOwn)\r
+        {\r
+            swigCMemOwn = cMemoryOwn;\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PaddingType obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        ~PaddingType()\r
+        {\r
+            DisposeQueue.Instance.Add(this);\r
+        }\r
+\r
+        public virtual void Dispose()\r
+        {\r
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
+\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_PaddingType(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+            }\r
+        }\r
+\r
+\r
+        public static bool operator ==(PaddingType a, PaddingType b)\r
+        {\r
+            // If both are null, or both are same instance, return true.\r
+            if (System.Object.ReferenceEquals(a, b))\r
+            {\r
+                return true;\r
+            }\r
+\r
+            // If one is null, but not both, return false.\r
+            if (((object)a == null) || ((object)b == null))\r
+            {\r
+                return false;\r
+            }\r
+\r
+            // Return true if the fields match:\r
+            return (System.Math.Abs(a.Left - b.Left) < NDalic.GetRangedEpsilon(a.Left, b.Left)) &&\r
+                   (System.Math.Abs(a.Right - b.Right) < NDalic.GetRangedEpsilon(a.Right, b.Right)) &&\r
+                   (System.Math.Abs(a.Bottom - b.Bottom) < NDalic.GetRangedEpsilon(a.Bottom, b.Bottom)) &&\r
+                   (System.Math.Abs(a.Top - b.Top) < NDalic.GetRangedEpsilon(a.Top, b.Top));\r
+        }\r
+\r
+        public static bool operator !=(PaddingType a, PaddingType b)\r
+        {\r
+            return !(a == b);\r
+        }\r
+\r
+        ///< The Left value
+        public float Left\r
+        {\r
+            set\r
+            {\r
+                left = value;\r
+            }\r
+            get\r
+            {\r
+                return left;\r
+            }\r
+        }\r
+\r
+        ///< The Right value
+        public float Right\r
+        {\r
+            set\r
+            {\r
+                right = value;\r
+            }\r
+            get\r
+            {\r
+                return right;\r
+            }\r
+        }\r
+\r
+        ///< The Bottom value
+        public float Bottom\r
+        {\r
+            set\r
+            {\r
+                bottom = value;\r
+            }\r
+            get\r
+            {\r
+                return bottom;\r
+            }\r
+        }\r
+\r
+        ///< The Top value
+        public float Top\r
+        {\r
+            set\r
+            {\r
+                top = value;\r
+            }\r
+            get\r
+            {\r
+                return top;\r
+            }\r
+        }\r
+\r
+\r
+        public PaddingType() : this(NDalicPINVOKE.new_PaddingType__SWIG_0(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public PaddingType(float x, float y, float width, float height) : this(NDalicPINVOKE.new_PaddingType__SWIG_1(x, y, width, height), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public PaddingType(PaddingType rhs) : this(NDalicPINVOKE.new_PaddingType__SWIG_2(PaddingType.getCPtr(rhs)), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public PaddingType Assign(PaddingType rhs)\r
+        {\r
+            PaddingType ret = new PaddingType(NDalicPINVOKE.PaddingType_Assign(swigCPtr, PaddingType.getCPtr(rhs)), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void Set(float newX, float newY, float newWidth, float newHeight)\r
+        {\r
+            NDalicPINVOKE.PaddingType_Set(swigCPtr, newX, newY, newWidth, newHeight);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        private float x\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_x_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_x_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float left\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_left_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_left_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float y\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_y_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_y_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float right\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_right_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_right_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float width\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_width_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_width_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float bottom\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_bottom_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_bottom_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float height\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_height_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_height_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        private float top\r
+        {\r
+            set\r
+            {\r
+                NDalicPINVOKE.PaddingType_top_set(swigCPtr, value);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+            get\r
+            {\r
+                float ret = NDalicPINVOKE.PaddingType_top_get(swigCPtr);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+    }
+
+}

diff --git a/Tizen.NUI/src/internal/PageFactory.cs b/Tizen.NUI/src/internal/PageFactory.cs
index 5c7fb59..37cd089 100755 (executable)
--- a/Tizen.NUI/src/internal/PageFactory.cs
+++ b/Tizen.NUI/src/internal/PageFactory.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PageFactory : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PageFactory : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/PagePanSignal.cs b/Tizen.NUI/src/internal/PagePanSignal.cs
index d568003..4f92a9d 100755 (executable)
--- a/Tizen.NUI/src/internal/PagePanSignal.cs
+++ b/Tizen.NUI/src/internal/PagePanSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PagePanSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PagePanSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/PageTurnLandscapeView.cs b/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
index 38bcc8b..7a2d2a8 100755 (executable)
--- a/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
+++ b/Tizen.NUI/src/internal/PageTurnLandscapeView.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PageTurnLandscapeView : PageTurnView {
+namespace Tizen.NUI {\r
+\r
+    internal class PageTurnLandscapeView : PageTurnView {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnLandscapeView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnLandscapeView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PageTurnPortraitView.cs b/Tizen.NUI/src/internal/PageTurnPortraitView.cs
index e345a53..219bca0 100755 (executable)
--- a/Tizen.NUI/src/internal/PageTurnPortraitView.cs
+++ b/Tizen.NUI/src/internal/PageTurnPortraitView.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PageTurnPortraitView : PageTurnView {
+namespace Tizen.NUI {\r
+\r
+    internal class PageTurnPortraitView : PageTurnView {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnPortraitView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnPortraitView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PageTurnSignal.cs b/Tizen.NUI/src/internal/PageTurnSignal.cs
index fb7a368..f500b1b 100755 (executable)
--- a/Tizen.NUI/src/internal/PageTurnSignal.cs
+++ b/Tizen.NUI/src/internal/PageTurnSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PageTurnSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PageTurnSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/PageTurnView.cs b/Tizen.NUI/src/internal/PageTurnView.cs
index 6ca7ef3..694275f 100755 (executable)
--- a/Tizen.NUI/src/internal/PageTurnView.cs
+++ b/Tizen.NUI/src/internal/PageTurnView.cs
@@ -11,10 +11,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class PageTurnView : View {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class PageTurnView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs b/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs
index f773337..c72c53f 100755 (executable)
--- a/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs
+++ b/Tizen.NUI/src/internal/PanGestureDetectedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PanGestureDetectedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PanGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/PanGestureDetector.cs b/Tizen.NUI/src/internal/PanGestureDetector.cs
index c678919..883b69b 100755 (executable)
--- a/Tizen.NUI/src/internal/PanGestureDetector.cs
+++ b/Tizen.NUI/src/internal/PanGestureDetector.cs
@@ -24,404 +24,463 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-using System;
-using System.Runtime.InteropServices;
-
-
-public class PanGestureDetector : GestureDetector {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal PanGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PanGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PanGestureDetector obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~PanGestureDetector() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_PanGestureDetector(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-
-
-public class DetectedEventArgs : EventArgs
-{
-   private Actor _actor;
-   private PanGesture _panGesture;
-
-   public Actor Actor
-   {
-      get
-      {
-         return _actor;
-      }
-      set
-      {
-         _actor = value;
-      }
-   }
-
-   public PanGesture PanGesture
-   {
-      get
-      {
-         return _panGesture;
-      }
-      set
-      {
-         _panGesture = value;
-      }
-   }
-}
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void DetectedCallbackDelegate(IntPtr actor, IntPtr panGesture);
-  private DaliEventHandler<object,DetectedEventArgs> _panGestureEventHandler;
-  private DetectedCallbackDelegate _panGestureCallbackDelegate;
-
-
-  public event DaliEventHandler<object,DetectedEventArgs> Detected
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_panGestureEventHandler == null)
-           {
-              _panGestureEventHandler += value;
-
-              _panGestureCallbackDelegate = new DetectedCallbackDelegate(OnPanGestureDetected);
-              this.DetectedSignal().Connect(_panGestureCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_panGestureEventHandler != null)
-           {
-              this.DetectedSignal().Disconnect(_panGestureCallbackDelegate);
-           }
-
-           _panGestureEventHandler -= value;
-        }
-     }
-  }
-
- private void OnPanGestureDetected(IntPtr actor, IntPtr panGesture)
-  {
-   DetectedEventArgs e = new DetectedEventArgs();
-
-   // Populate all members of "e" (PanGestureEventArgs) with real data
-   e.Actor = Actor.GetActorFromPtr(actor);
-   e.PanGesture = Tizen.NUI.PanGesture.GetPanGestureFromPtr(panGesture);
-
-   if (_panGestureEventHandler != null)
-   {
-      //here we send all data to user event handlers
-      _panGestureEventHandler(this, e);
-   }
-
-  }
-
-
-public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.IntPtr cPtr) {
-    PanGestureDetector ret = new PanGestureDetector(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+namespace Tizen.NUI\r
+{\r
+\r
+    using System;\r
+    using System.Runtime.InteropServices;\r
+\r
+\r
+    public class PanGestureDetector : GestureDetector\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal PanGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PanGestureDetector_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PanGestureDetector obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        ~PanGestureDetector()\r
+        {\r
+            DisposeQueue.Instance.Add(this);\r
+        }\r
+\r
+        public override void Dispose()\r
+        {\r
+            if (!Stage.IsInstalled())\r
+            {\r
+                DisposeQueue.Instance.Add(this);\r
+                return;\r
+            }\r
+\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        NDalicPINVOKE.delete_PanGestureDetector(swigCPtr);\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+                base.Dispose();\r
+            }\r
+        }\r
+\r
+\r
+\r
+\r
+        public class DetectedEventArgs : EventArgs\r
+        {\r
+            private Actor _actor;\r
+            private PanGesture _panGesture;\r
+\r
+            public Actor Actor\r
+            {\r
+                get\r
+                {\r
+                    return _actor;\r
+                }\r
+                set\r
+                {\r
+                    _actor = value;\r
+                }\r
+            }\r
+\r
+            public PanGesture PanGesture\r
+            {\r
+                get\r
+                {\r
+                    return _panGesture;\r
+                }\r
+                set\r
+                {\r
+                    _panGesture = value;\r
+                }\r
+            }\r
+        }\r
+\r
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
+        private delegate void DetectedCallbackDelegate(IntPtr actor, IntPtr panGesture);\r
+        private DaliEventHandler<object, DetectedEventArgs> _panGestureEventHandler;\r
+        private DetectedCallbackDelegate _panGestureCallbackDelegate;\r
+\r
+\r
+        public event DaliEventHandler<object, DetectedEventArgs> Detected\r
+        {\r
+            add\r
+            {\r
+                lock (this)\r
+                {\r
+                    // Restricted to only one listener\r
+                    if (_panGestureEventHandler == null)\r
+                    {\r
+                        _panGestureEventHandler += value;\r
+\r
+                        _panGestureCallbackDelegate = new DetectedCallbackDelegate(OnPanGestureDetected);\r
+                        this.DetectedSignal().Connect(_panGestureCallbackDelegate);\r
+                    }\r
+                }\r
+            }\r
+\r
+            remove\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (_panGestureEventHandler != null)\r
+                    {\r
+                        this.DetectedSignal().Disconnect(_panGestureCallbackDelegate);\r
+                    }\r
+\r
+                    _panGestureEventHandler -= value;\r
+                }\r
+            }\r
+        }\r
+\r
+        private void OnPanGestureDetected(IntPtr actor, IntPtr panGesture)\r
+        {\r
+            DetectedEventArgs e = new DetectedEventArgs();\r
+\r
+            // Populate all members of "e" (PanGestureEventArgs) with real data\r
+            e.Actor = Actor.GetActorFromPtr(actor);\r
+            e.PanGesture = Tizen.NUI.PanGesture.GetPanGestureFromPtr(panGesture);\r
+\r
+            if (_panGestureEventHandler != null)\r
+            {\r
+                //here we send all data to user event handlers\r
+                _panGestureEventHandler(this, e);\r
+            }\r
+\r
+        }\r
+\r
+\r
+        public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.IntPtr cPtr)\r
+        {\r
+            PanGestureDetector ret = new PanGestureDetector(cPtr, false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+\r
+        public class Property : global::System.IDisposable\r
+        {\r
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+            protected bool swigCMemOwn;\r
+\r
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)\r
+            {\r
+                swigCMemOwn = cMemoryOwn;\r
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+            }\r
+\r
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)\r
+            {\r
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+            }\r
+\r
+            ~Property()\r
+            {\r
+                Dispose();\r
+            }\r
+\r
+            public virtual void Dispose()\r
+            {\r
+                lock (this)\r
+                {\r
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                    {\r
+                        if (swigCMemOwn)\r
+                        {\r
+                            swigCMemOwn = false;\r
+                            NDalicPINVOKE.delete_PanGestureDetector_Property(swigCPtr);\r
+                        }\r
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                    }\r
+                    global::System.GC.SuppressFinalize(this);\r
+                }\r
+            }\r
+\r
+            public Property() : this(NDalicPINVOKE.new_PanGestureDetector_Property(), true)\r
+            {\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            }\r
+\r
+            public static readonly int SCREEN_POSITION = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_POSITION_get();\r
+            public static readonly int SCREEN_DISPLACEMENT = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_DISPLACEMENT_get();\r
+            public static readonly int SCREEN_VELOCITY = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_VELOCITY_get();\r
+            public static readonly int LOCAL_POSITION = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_POSITION_get();\r
+            public static readonly int LOCAL_DISPLACEMENT = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_DISPLACEMENT_get();\r
+            public static readonly int LOCAL_VELOCITY = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_VELOCITY_get();\r
+            public static readonly int PANNING = NDalicPINVOKE.PanGestureDetector_Property_PANNING_get();\r
+\r
+        }\r
+\r
+        public static Radian DIRECTION_LEFT\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_LEFT_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DIRECTION_RIGHT\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_RIGHT_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DIRECTION_UP\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_UP_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DIRECTION_DOWN\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_DOWN_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DIRECTION_HORIZONTAL\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_HORIZONTAL_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DIRECTION_VERTICAL\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_VERTICAL_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public static Radian DEFAULT_THRESHOLD\r
+        {\r
+            get\r
+            {\r
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DEFAULT_THRESHOLD_get();\r
+                Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);\r
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+                return ret;\r
+            }\r
+        }\r
+\r
+        public PanGestureDetector() : this(NDalicPINVOKE.PanGestureDetector_New(), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+\r
+        }\r
+        public new static PanGestureDetector DownCast(BaseHandle handle)\r
+        {\r
+            PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.PanGestureDetector_DownCast(BaseHandle.getCPtr(handle)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public PanGestureDetector(PanGestureDetector handle) : this(NDalicPINVOKE.new_PanGestureDetector__SWIG_1(PanGestureDetector.getCPtr(handle)), true)\r
+        {\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public PanGestureDetector Assign(PanGestureDetector rhs)\r
+        {\r
+            PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.PanGestureDetector_Assign(swigCPtr, PanGestureDetector.getCPtr(rhs)), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetMinimumTouchesRequired(uint minimum)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_SetMinimumTouchesRequired(swigCPtr, minimum);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void SetMaximumTouchesRequired(uint maximum)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_SetMaximumTouchesRequired(swigCPtr, maximum);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public uint GetMinimumTouchesRequired()\r
+        {\r
+            uint ret = NDalicPINVOKE.PanGestureDetector_GetMinimumTouchesRequired(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public uint GetMaximumTouchesRequired()\r
+        {\r
+            uint ret = NDalicPINVOKE.PanGestureDetector_GetMaximumTouchesRequired(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void AddAngle(Radian angle, Radian threshold)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_AddAngle__SWIG_0(swigCPtr, Radian.getCPtr(angle), Radian.getCPtr(threshold));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void AddAngle(Radian angle)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_AddAngle__SWIG_1(swigCPtr, Radian.getCPtr(angle));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void AddDirection(Radian direction, Radian threshold)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_AddDirection__SWIG_0(swigCPtr, Radian.getCPtr(direction), Radian.getCPtr(threshold));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void AddDirection(Radian direction)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_AddDirection__SWIG_1(swigCPtr, Radian.getCPtr(direction));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public uint GetAngleCount()\r
+        {\r
+            uint ret = NDalicPINVOKE.PanGestureDetector_GetAngleCount(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal AngleThresholdPair GetAngle(uint index)\r
+        {\r
+            AngleThresholdPair ret = new AngleThresholdPair(NDalicPINVOKE.PanGestureDetector_GetAngle(swigCPtr, index), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void ClearAngles()\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_ClearAngles(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void RemoveAngle(Radian angle)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_RemoveAngle(swigCPtr, Radian.getCPtr(angle));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void RemoveDirection(Radian direction)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_RemoveDirection(swigCPtr, Radian.getCPtr(direction));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal PanGestureDetectedSignal DetectedSignal()\r
+        {\r
+            PanGestureDetectedSignal ret = new PanGestureDetectedSignal(NDalicPINVOKE.PanGestureDetector_DetectedSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public static void SetPanGestureProperties(PanGesture pan)\r
+        {\r
+            NDalicPINVOKE.PanGestureDetector_SetPanGestureProperties(PanGesture.getCPtr(pan));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public Vector2 ScreenPosition\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.SCREEN_POSITION).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public Vector2 ScreenDisplacement\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public Vector2 ScreenVelocity\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.SCREEN_VELOCITY).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public Vector2 LocalPosition\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.LOCAL_POSITION).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public Vector2 LocalDisplacement\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public Vector2 LocalVelocity\r
+        {\r
+            get\r
+            {\r
+                Vector2 temp = new Vector2(0.0f, 0.0f);\r
+                GetProperty(PanGestureDetector.Property.LOCAL_VELOCITY).Get(temp);\r
+                return temp;\r
+            }\r
+        }\r
+        public bool Panning\r
+        {\r
+            get\r
+            {\r
+                bool temp = false;\r
+                GetProperty(PanGestureDetector.Property.PANNING).Get(ref temp);\r
+                return temp;\r
+            }\r
+        }\r
     }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_PanGestureDetector_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_PanGestureDetector_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int SCREEN_POSITION = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_POSITION_get();
-    public static readonly int SCREEN_DISPLACEMENT = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_DISPLACEMENT_get();
-    public static readonly int SCREEN_VELOCITY = NDalicPINVOKE.PanGestureDetector_Property_SCREEN_VELOCITY_get();
-    public static readonly int LOCAL_POSITION = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_POSITION_get();
-    public static readonly int LOCAL_DISPLACEMENT = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_DISPLACEMENT_get();
-    public static readonly int LOCAL_VELOCITY = NDalicPINVOKE.PanGestureDetector_Property_LOCAL_VELOCITY_get();
-    public static readonly int PANNING = NDalicPINVOKE.PanGestureDetector_Property_PANNING_get();
-  
-  }
-
-  public static Radian DIRECTION_LEFT {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_LEFT_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DIRECTION_RIGHT {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_RIGHT_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DIRECTION_UP {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_UP_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DIRECTION_DOWN {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_DOWN_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DIRECTION_HORIZONTAL {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_HORIZONTAL_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DIRECTION_VERTICAL {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DIRECTION_VERTICAL_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Radian DEFAULT_THRESHOLD {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGestureDetector_DEFAULT_THRESHOLD_get();
-      Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public PanGestureDetector () : this (NDalicPINVOKE.PanGestureDetector_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public new static PanGestureDetector DownCast(BaseHandle handle) {
-    PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.PanGestureDetector_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PanGestureDetector(PanGestureDetector handle) : this(NDalicPINVOKE.new_PanGestureDetector__SWIG_1(PanGestureDetector.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PanGestureDetector Assign(PanGestureDetector rhs) {
-    PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.PanGestureDetector_Assign(swigCPtr, PanGestureDetector.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetMinimumTouchesRequired(uint minimum) {
-    NDalicPINVOKE.PanGestureDetector_SetMinimumTouchesRequired(swigCPtr, minimum);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetMaximumTouchesRequired(uint maximum) {
-    NDalicPINVOKE.PanGestureDetector_SetMaximumTouchesRequired(swigCPtr, maximum);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public uint GetMinimumTouchesRequired() {
-    uint ret = NDalicPINVOKE.PanGestureDetector_GetMinimumTouchesRequired(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetMaximumTouchesRequired() {
-    uint ret = NDalicPINVOKE.PanGestureDetector_GetMaximumTouchesRequired(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void AddAngle(Radian angle, Radian threshold) {
-    NDalicPINVOKE.PanGestureDetector_AddAngle__SWIG_0(swigCPtr, Radian.getCPtr(angle), Radian.getCPtr(threshold));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AddAngle(Radian angle) {
-    NDalicPINVOKE.PanGestureDetector_AddAngle__SWIG_1(swigCPtr, Radian.getCPtr(angle));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AddDirection(Radian direction, Radian threshold) {
-    NDalicPINVOKE.PanGestureDetector_AddDirection__SWIG_0(swigCPtr, Radian.getCPtr(direction), Radian.getCPtr(threshold));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AddDirection(Radian direction) {
-    NDalicPINVOKE.PanGestureDetector_AddDirection__SWIG_1(swigCPtr, Radian.getCPtr(direction));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public uint GetAngleCount() {
-    uint ret = NDalicPINVOKE.PanGestureDetector_GetAngleCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public AngleThresholdPair GetAngle(uint index) {
-    AngleThresholdPair ret = new AngleThresholdPair(NDalicPINVOKE.PanGestureDetector_GetAngle(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ClearAngles() {
-    NDalicPINVOKE.PanGestureDetector_ClearAngles(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveAngle(Radian angle) {
-    NDalicPINVOKE.PanGestureDetector_RemoveAngle(swigCPtr, Radian.getCPtr(angle));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveDirection(Radian direction) {
-    NDalicPINVOKE.PanGestureDetector_RemoveDirection(swigCPtr, Radian.getCPtr(direction));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PanGestureDetectedSignal DetectedSignal() {
-    PanGestureDetectedSignal ret = new PanGestureDetectedSignal(NDalicPINVOKE.PanGestureDetector_DetectedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static void SetPanGestureProperties(PanGesture pan) {
-    NDalicPINVOKE.PanGestureDetector_SetPanGestureProperties(PanGesture.getCPtr(pan));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 ScreenPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_POSITION).Get(  temp );
-      return temp;
-    }
-}  public Vector2 ScreenDisplacement
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_DISPLACEMENT).Get(  temp );
-      return temp;
-    }
-}  public Vector2 ScreenVelocity
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.SCREEN_VELOCITY).Get(  temp );
-      return temp;
-    }
-}  public Vector2 LocalPosition
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_POSITION).Get(  temp );
-      return temp;
-    }
-}  public Vector2 LocalDisplacement
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_DISPLACEMENT).Get(  temp );
-      return temp;
-    }
-}  public Vector2 LocalVelocity
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( PanGestureDetector.Property.LOCAL_VELOCITY).Get(  temp );
-      return temp;
-    }
-}  public bool Panning
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( PanGestureDetector.Property.PANNING).Get( ref temp );
-      return temp;
-    }
-}
-}
 
 }

diff --git a/Tizen.NUI/src/public/PathConstrainer.cs b/Tizen.NUI/src/internal/PathConstrainer.cs
similarity index 96%
rename from Tizen.NUI/src/public/PathConstrainer.cs
rename to Tizen.NUI/src/internal/PathConstrainer.cs
index 7856ec7..e973a22 100755 (executable)
--- a/Tizen.NUI/src/public/PathConstrainer.cs
+++ b/Tizen.NUI/src/internal/PathConstrainer.cs
@@ -33,7 +33,7 @@
 namespace Tizen.NUI\r
 {\r
 \r
-    public class PathConstrainer : Handle\r
+    internal class PathConstrainer : Handle\r
     {\r
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
 \r
@@ -162,7 +162,7 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public void Remove(Handle target)\r
+        internal void Remove(Handle target)\r
         {\r
             NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Handle.getCPtr(target));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r

diff --git a/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs b/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs
index 83ee9cf..bb60b4f 100755 (executable)
--- a/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs
+++ b/Tizen.NUI/src/internal/PinchGestureDetectedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PinchGestureDetectedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PinchGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/PinchGestureDetector.cs b/Tizen.NUI/src/internal/PinchGestureDetector.cs
index 5a84c75..10905fa 100755 (executable)
--- a/Tizen.NUI/src/internal/PinchGestureDetector.cs
+++ b/Tizen.NUI/src/internal/PinchGestureDetector.cs
@@ -27,10 +27,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class PinchGestureDetector : GestureDetector {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    public class PinchGestureDetector : GestureDetector {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PinchGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PinchGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -177,7 +177,7 @@ public static PinchGestureDetector GetPinchGestureDetectorFromPtr(global::System
     return ret;
   }
 
-  public PinchGestureDetectedSignal DetectedSignal() {
+  internal PinchGestureDetectedSignal DetectedSignal() {
     PinchGestureDetectedSignal ret = new PinchGestureDetectedSignal(NDalicPINVOKE.PinchGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/PixelData.cs b/Tizen.NUI/src/internal/PixelData.cs
index 547e40c..e3a1f6f 100755 (executable)
--- a/Tizen.NUI/src/internal/PixelData.cs
+++ b/Tizen.NUI/src/internal/PixelData.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PixelData : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class PixelData : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PixelData(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PixelData_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PixelFormat.cs b/Tizen.NUI/src/internal/PixelFormat.cs
index 9a889a8..9cc63d5 100755 (executable)
--- a/Tizen.NUI/src/internal/PixelFormat.cs
+++ b/Tizen.NUI/src/internal/PixelFormat.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum PixelFormat {
+namespace Tizen.NUI {\r
+\r
+    internal enum PixelFormat {
   INVALID = 0,
   A8 = 1,
   L8,

diff --git a/Tizen.NUI/src/internal/PositionInheritanceMode.cs b/Tizen.NUI/src/internal/PositionInheritanceMode.cs
index 14e64a3..d234bc3 100755 (executable)
--- a/Tizen.NUI/src/internal/PositionInheritanceMode.cs
+++ b/Tizen.NUI/src/internal/PositionInheritanceMode.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum PositionInheritanceMode {
+namespace Tizen.NUI {\r
+\r
+    internal enum PositionInheritanceMode {
   INHERIT_PARENT_POSITION,
   USE_PARENT_POSITION,
   USE_PARENT_POSITION_PLUS_LOCAL_POSITION,

diff --git a/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs b/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs
index 56cff15..9c78ab2 100755 (executable)
--- a/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs
+++ b/Tizen.NUI/src/internal/PrimitiveVisualShapeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum PrimitiveVisualShapeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum PrimitiveVisualShapeType {
   SPHERE,
   CONICAL_FRUSTRUM,
   CONE,

diff --git a/Tizen.NUI/src/internal/PropertyBuffer.cs b/Tizen.NUI/src/internal/PropertyBuffer.cs
index 30aaecb..9ccee9f 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyBuffer.cs
+++ b/Tizen.NUI/src/internal/PropertyBuffer.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PropertyBuffer : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class PropertyBuffer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyBuffer_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PropertyCondition.cs b/Tizen.NUI/src/internal/PropertyCondition.cs
index aa833ba..2ae7987 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyCondition.cs
+++ b/Tizen.NUI/src/internal/PropertyCondition.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PropertyCondition : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class PropertyCondition : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyCondition(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyCondition_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PropertyNotification.cs b/Tizen.NUI/src/internal/PropertyNotification.cs
index 44b77f3..6ea46b0 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyNotification.cs
+++ b/Tizen.NUI/src/internal/PropertyNotification.cs
@@ -11,10 +11,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class PropertyNotification : BaseHandle {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class PropertyNotification : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyNotification(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyNotification_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/PropertyNotifySignal.cs b/Tizen.NUI/src/internal/PropertyNotifySignal.cs
index 1d0792d..acb02dc 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyNotifySignal.cs
+++ b/Tizen.NUI/src/internal/PropertyNotifySignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PropertyNotifySignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PropertyNotifySignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class PropertyNotifySignal : global::System.IDisposable {
   }
 
   ~PropertyNotifySignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class PropertyNotifySignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.PropertyNotifySignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/PropertyRangeManager.cs b/Tizen.NUI/src/internal/PropertyRangeManager.cs
index 6c48ef8..0661e16 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyRangeManager.cs
+++ b/Tizen.NUI/src/internal/PropertyRangeManager.cs
@@ -1,17 +1,14 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
-
-#if true
 using System.Reflection;
-#endif
 
 namespace Tizen.NUI
-{
-  /// <summary>
-  /// Helper class for calculating what property indexes should be assigned to C# View (view) classes.
-  /// </summary>
-  public class PropertyRangeManager
+{\r
+    /// <summary>
+    /// Helper class for calculating what property indexes should be assigned to C# View (view) classes.
+    /// </summary>
+    internal class PropertyRangeManager
   {
     private Dictionary<String, PropertyRange > _propertyRange;
 

diff --git a/Tizen.NUI/src/internal/PropertyRanges.cs b/Tizen.NUI/src/internal/PropertyRanges.cs
index 455cc5a..f9d837a 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyRanges.cs
+++ b/Tizen.NUI/src/internal/PropertyRanges.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum PropertyRanges {
+namespace Tizen.NUI {\r
+\r
+    internal enum PropertyRanges {
   DEFAULT_OBJECT_PROPERTY_START_INDEX = 0,
   DEFAULT_ACTOR_PROPERTY_START_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX,
   DEFAULT_ACTOR_PROPERTY_MAX_COUNT = 10000,

diff --git a/Tizen.NUI/src/internal/PropertyRegistration.cs b/Tizen.NUI/src/internal/PropertyRegistration.cs
index 01ee35a..a2bf965 100755 (executable)
--- a/Tizen.NUI/src/internal/PropertyRegistration.cs
+++ b/Tizen.NUI/src/internal/PropertyRegistration.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class PropertyRegistration : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class PropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Quaternion.cs b/Tizen.NUI/src/internal/Quaternion.cs
deleted file mode 100755 (executable)
index a11767e..0000000
--- a/Tizen.NUI/src/internal/Quaternion.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// 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 Quaternion : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal Quaternion(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Quaternion obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Quaternion() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Quaternion(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public static Quaternion operator+(Quaternion arg1, Quaternion arg2) {
-    return arg1.Add(arg2);
-  }
-
-  public static Quaternion operator-(Quaternion arg1, Quaternion arg2) {
-    return arg1.Subtract(arg2);
-  }
-
-  public static Quaternion operator-(Quaternion arg1) {
-    return arg1.Subtract();
-  }
-
-  public static Quaternion operator*(Quaternion arg1, Quaternion arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Vector3 operator*(Quaternion arg1, Vector3 arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Quaternion operator*(Quaternion arg1, float arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Quaternion operator/(Quaternion arg1, Quaternion arg2) {
-    return arg1.Divide(arg2);
-  }
-
-  public static Quaternion operator/(Quaternion arg1, float arg2) {
-    return arg1.Divide(arg2);
-  }
-
-  public Quaternion() : this(NDalicPINVOKE.new_Quaternion__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(float cosThetaBy2, float iBySineTheta, float jBySineTheta, float kBySineTheta) : this(NDalicPINVOKE.new_Quaternion__SWIG_1(cosThetaBy2, iBySineTheta, jBySineTheta, kBySineTheta), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector4 vector) : this(NDalicPINVOKE.new_Quaternion__SWIG_2(Vector4.getCPtr(vector)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Radian angle, Vector3 axis) : this(NDalicPINVOKE.new_Quaternion__SWIG_3(Radian.getCPtr(angle), Vector3.getCPtr(axis)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Radian pitch, Radian yaw, Radian roll) : this(NDalicPINVOKE.new_Quaternion__SWIG_4(Radian.getCPtr(pitch), Radian.getCPtr(yaw), Radian.getCPtr(roll)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Matrix matrix) : this(NDalicPINVOKE.new_Quaternion__SWIG_5(Matrix.getCPtr(matrix)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) : this(NDalicPINVOKE.new_Quaternion__SWIG_6(Vector3.getCPtr(xAxis), Vector3.getCPtr(yAxis), Vector3.getCPtr(zAxis)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector3 v0, Vector3 v1) : this(NDalicPINVOKE.new_Quaternion__SWIG_7(Vector3.getCPtr(v0), Vector3.getCPtr(v1)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Quaternion IDENTITY {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Quaternion_IDENTITY_get();
-      Quaternion ret = (cPtr == global::System.IntPtr.Zero) ? null : new Quaternion(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public bool IsIdentity() {
-    bool ret = NDalicPINVOKE.Quaternion_IsIdentity(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool ToAxisAngle(Vector3 axis, Radian angle) {
-    bool ret = NDalicPINVOKE.Quaternion_ToAxisAngle(swigCPtr, Vector3.getCPtr(axis), Radian.getCPtr(angle));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 AsVector() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_AsVector(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetEuler(Radian pitch, Radian yaw, Radian roll) {
-    NDalicPINVOKE.Quaternion_SetEuler(swigCPtr, Radian.getCPtr(pitch), Radian.getCPtr(yaw), Radian.getCPtr(roll));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 EulerAngles() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_EulerAngles(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Add(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Add(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Subtract(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Subtract__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Multiply(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Multiply__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Multiply(Vector3 other) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Quaternion_Multiply__SWIG_1(swigCPtr, Vector3.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Divide(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Divide__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Multiply(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Multiply__SWIG_2(swigCPtr, scale), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Divide(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Divide__SWIG_1(swigCPtr, scale), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Subtract() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Subtract__SWIG_1(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion AddAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_AddAssign(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion SubtractAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_SubtractAssign(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion MultiplyAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_MultiplyAssign__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion MultiplyAssign(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_MultiplyAssign__SWIG_1(swigCPtr, scale), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion DivideAssign(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_DivideAssign(swigCPtr, scale), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EqualTo(Quaternion rhs) {
-    bool ret = NDalicPINVOKE.Quaternion_EqualTo(swigCPtr, Quaternion.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool NotEqualTo(Quaternion rhs) {
-    bool ret = NDalicPINVOKE.Quaternion_NotEqualTo(swigCPtr, Quaternion.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Length() {
-    float ret = NDalicPINVOKE.Quaternion_Length(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float LengthSquared() {
-    float ret = NDalicPINVOKE.Quaternion_LengthSquared(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Normalize() {
-    NDalicPINVOKE.Quaternion_Normalize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion Normalized() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Normalized(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Conjugate() {
-    NDalicPINVOKE.Quaternion_Conjugate(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Invert() {
-    NDalicPINVOKE.Quaternion_Invert(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion Log() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Log(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Exp() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Exp(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static float Dot(Quaternion q1, Quaternion q2) {
-    float ret = NDalicPINVOKE.Quaternion_Dot(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Lerp(Quaternion q1, Quaternion q2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Lerp(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Slerp(Quaternion q1, Quaternion q2, float progress) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Slerp(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), progress), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion SlerpNoInvert(Quaternion q1, Quaternion q2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_SlerpNoInvert(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Squad(Quaternion start, Quaternion end, Quaternion ctrl1, Quaternion ctrl2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Squad(Quaternion.getCPtr(start), Quaternion.getCPtr(end), Quaternion.getCPtr(ctrl1), Quaternion.getCPtr(ctrl2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static float AngleBetween(Quaternion q1, Quaternion q2) {
-    float ret = NDalicPINVOKE.Quaternion_AngleBetween(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Rotate(Vector4 vector) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_Rotate__SWIG_0(swigCPtr, Vector4.getCPtr(vector)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Rotate(Vector3 vector) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Quaternion_Rotate__SWIG_1(swigCPtr, Vector3.getCPtr(vector)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 mVector {
-    set {
-      NDalicPINVOKE.Quaternion_mVector_set(swigCPtr, Vector4.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Quaternion_mVector_get(swigCPtr);
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-}
-
-}

diff --git a/Tizen.NUI/src/internal/RectDouble.cs b/Tizen.NUI/src/internal/RectDouble.cs
deleted file mode 100755 (executable)
index f77becc..0000000
--- a/Tizen.NUI/src/internal/RectDouble.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// 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 RectDouble : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal RectDouble(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RectDouble obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~RectDouble() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_RectDouble(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public RectDouble() : this(NDalicPINVOKE.new_RectDouble__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectDouble(double x, double y, double width, double height) : this(NDalicPINVOKE.new_RectDouble__SWIG_1(x, y, width, height), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectDouble(RectDouble rhs) : this(NDalicPINVOKE.new_RectDouble__SWIG_2(RectDouble.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectDouble Assign(RectDouble rhs) {
-    RectDouble ret = new RectDouble(NDalicPINVOKE.RectDouble_Assign(swigCPtr, RectDouble.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Set(double newX, double newY, double newWidth, double newHeight) {
-    NDalicPINVOKE.RectDouble_Set(swigCPtr, newX, newY, newWidth, newHeight);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsEmpty() {
-    bool ret = NDalicPINVOKE.RectDouble_IsEmpty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double Left() {
-    double ret = NDalicPINVOKE.RectDouble_Left(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double Right() {
-    double ret = NDalicPINVOKE.RectDouble_Right(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double Top() {
-    double ret = NDalicPINVOKE.RectDouble_Top(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double Bottom() {
-    double ret = NDalicPINVOKE.RectDouble_Bottom(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double Area() {
-    double ret = NDalicPINVOKE.RectDouble_Area(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Intersects(RectDouble other) {
-    bool ret = NDalicPINVOKE.RectDouble_Intersects(swigCPtr, RectDouble.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Contains(RectDouble other) {
-    bool ret = NDalicPINVOKE.RectDouble_Contains(swigCPtr, RectDouble.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public double x {
-    set {
-      NDalicPINVOKE.RectDouble_x_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_x_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double left {
-    set {
-      NDalicPINVOKE.RectDouble_left_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_left_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double y {
-    set {
-      NDalicPINVOKE.RectDouble_y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double right {
-    set {
-      NDalicPINVOKE.RectDouble_right_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_right_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double width {
-    set {
-      NDalicPINVOKE.RectDouble_width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double bottom {
-    set {
-      NDalicPINVOKE.RectDouble_bottom_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_bottom_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double height {
-    set {
-      NDalicPINVOKE.RectDouble_height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public double top {
-    set {
-      NDalicPINVOKE.RectDouble_top_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      double ret = NDalicPINVOKE.RectDouble_top_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-}
-
-}

diff --git a/Tizen.NUI/src/internal/RectInteger.cs b/Tizen.NUI/src/internal/RectInteger.cs
deleted file mode 100755 (executable)
index d847758..0000000
--- a/Tizen.NUI/src/internal/RectInteger.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// 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 RectInteger : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal RectInteger(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RectInteger obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~RectInteger() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_RectInteger(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-
-  public int X {
-    set {
-      NDalicPINVOKE.RectInteger_x_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-    get {
-      int ret = NDalicPINVOKE.RectInteger_x_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  }
-
-  public int Y {
-    set {
-      NDalicPINVOKE.RectInteger_y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-    get {
-      int ret = NDalicPINVOKE.RectInteger_y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  }
-
-  public int W {
-    set {
-      NDalicPINVOKE.RectInteger_width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-    get {
-      int ret = NDalicPINVOKE.RectInteger_width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  }
-
-  public int H {
-    set {
-      NDalicPINVOKE.RectInteger_height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-    get {
-      int ret = NDalicPINVOKE.RectInteger_height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  }
-
-
-  public RectInteger() : this(NDalicPINVOKE.new_RectInteger__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectInteger(int x, int y, int width, int height) : this(NDalicPINVOKE.new_RectInteger__SWIG_1(x, y, width, height), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectInteger(RectInteger rhs) : this(NDalicPINVOKE.new_RectInteger__SWIG_2(RectInteger.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectInteger Assign(RectInteger rhs) {
-    RectInteger ret = new RectInteger(NDalicPINVOKE.RectInteger_Assign(swigCPtr, RectInteger.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Set(int newX, int newY, int newWidth, int newHeight) {
-    NDalicPINVOKE.RectInteger_Set(swigCPtr, newX, newY, newWidth, newHeight);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsEmpty() {
-    bool ret = NDalicPINVOKE.RectInteger_IsEmpty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Left() {
-    int ret = NDalicPINVOKE.RectInteger_Left(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Right() {
-    int ret = NDalicPINVOKE.RectInteger_Right(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Top() {
-    int ret = NDalicPINVOKE.RectInteger_Top(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Bottom() {
-    int ret = NDalicPINVOKE.RectInteger_Bottom(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Area() {
-    int ret = NDalicPINVOKE.RectInteger_Area(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Intersects(RectInteger other) {
-    bool ret = NDalicPINVOKE.RectInteger_Intersects(swigCPtr, RectInteger.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Contains(RectInteger other) {
-    bool ret = NDalicPINVOKE.RectInteger_Contains(swigCPtr, RectInteger.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int x {
-    set {
-      NDalicPINVOKE.RectInteger_x_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_x_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int left {
-    set {
-      NDalicPINVOKE.RectInteger_left_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_left_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int y {
-    set {
-      NDalicPINVOKE.RectInteger_y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int right {
-    set {
-      NDalicPINVOKE.RectInteger_right_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_right_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int width {
-    set {
-      NDalicPINVOKE.RectInteger_width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int bottom {
-    set {
-      NDalicPINVOKE.RectInteger_bottom_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_bottom_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int height {
-    set {
-      NDalicPINVOKE.RectInteger_height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int top {
-    set {
-      NDalicPINVOKE.RectInteger_top_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.RectInteger_top_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-}
-
-}

diff --git a/Tizen.NUI/src/internal/RectUnsignedInteger.cs b/Tizen.NUI/src/internal/RectUnsignedInteger.cs
deleted file mode 100755 (executable)
index e970d34..0000000
--- a/Tizen.NUI/src/internal/RectUnsignedInteger.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// 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 RectUnsignedInteger : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal RectUnsignedInteger(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RectUnsignedInteger obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~RectUnsignedInteger() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_RectUnsignedInteger(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public RectUnsignedInteger() : this(NDalicPINVOKE.new_RectUnsignedInteger__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectUnsignedInteger(uint x, uint y, uint width, uint height) : this(NDalicPINVOKE.new_RectUnsignedInteger__SWIG_1(x, y, width, height), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectUnsignedInteger(RectUnsignedInteger rhs) : this(NDalicPINVOKE.new_RectUnsignedInteger__SWIG_2(RectUnsignedInteger.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public RectUnsignedInteger Assign(RectUnsignedInteger rhs) {
-    RectUnsignedInteger ret = new RectUnsignedInteger(NDalicPINVOKE.RectUnsignedInteger_Assign(swigCPtr, RectUnsignedInteger.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Set(uint newX, uint newY, uint newWidth, uint newHeight) {
-    NDalicPINVOKE.RectUnsignedInteger_Set(swigCPtr, newX, newY, newWidth, newHeight);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsEmpty() {
-    bool ret = NDalicPINVOKE.RectUnsignedInteger_IsEmpty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint Left() {
-    uint ret = NDalicPINVOKE.RectUnsignedInteger_Left(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint Right() {
-    uint ret = NDalicPINVOKE.RectUnsignedInteger_Right(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint Top() {
-    uint ret = NDalicPINVOKE.RectUnsignedInteger_Top(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint Bottom() {
-    uint ret = NDalicPINVOKE.RectUnsignedInteger_Bottom(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint Area() {
-    uint ret = NDalicPINVOKE.RectUnsignedInteger_Area(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Intersects(RectUnsignedInteger other) {
-    bool ret = NDalicPINVOKE.RectUnsignedInteger_Intersects(swigCPtr, RectUnsignedInteger.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Contains(RectUnsignedInteger other) {
-    bool ret = NDalicPINVOKE.RectUnsignedInteger_Contains(swigCPtr, RectUnsignedInteger.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint x {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_x_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_x_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint left {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_left_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_left_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint y {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint right {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_right_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_right_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint width {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint bottom {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_bottom_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_bottom_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint height {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint top {
-    set {
-      NDalicPINVOKE.RectUnsignedInteger_top_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.RectUnsignedInteger_top_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-}
-
-}

diff --git a/Tizen.NUI/src/internal/RefObject.cs b/Tizen.NUI/src/internal/RefObject.cs
index 4fb2602..9e0ff8c 100755 (executable)
--- a/Tizen.NUI/src/internal/RefObject.cs
+++ b/Tizen.NUI/src/internal/RefObject.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RefObject : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    public class RefObject : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/RenderBufferFormat.cs b/Tizen.NUI/src/internal/RenderBufferFormat.cs
index 662ccc6..b528bf7 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderBufferFormat.cs
+++ b/Tizen.NUI/src/internal/RenderBufferFormat.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum RenderBufferFormat {
+namespace Tizen.NUI {\r
+\r
+    internal enum RenderBufferFormat {
   COLOR,
   COLOR_DEPTH,
   COLOR_STENCIL,

diff --git a/Tizen.NUI/src/internal/RenderModeType.cs b/Tizen.NUI/src/internal/RenderModeType.cs
index 418cc37..7cbd682 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderModeType.cs
+++ b/Tizen.NUI/src/internal/RenderModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum RenderModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum RenderModeType {
   NONE,
   AUTO,
   COLOR,

diff --git a/Tizen.NUI/src/internal/RenderTask.cs b/Tizen.NUI/src/internal/RenderTask.cs
index 44a6bad..5942b25 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderTask.cs
+++ b/Tizen.NUI/src/internal/RenderTask.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RenderTask : Handle {
+namespace Tizen.NUI {\r
+\r
+    internal class RenderTask : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal RenderTask(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTask_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -290,13 +290,13 @@ public class RenderTask : Handle {
     return ret;
   }
 
-  public void SetViewport(RectInteger viewport) {
-    NDalicPINVOKE.RenderTask_SetViewport(swigCPtr, RectInteger.getCPtr(viewport));
+  public void SetViewport(Rectangle viewport) {
+    NDalicPINVOKE.RenderTask_SetViewport(swigCPtr, Rectangle.getCPtr(viewport));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public RectInteger GetViewport() {
-    RectInteger ret = new RectInteger(NDalicPINVOKE.RenderTask_GetViewport(swigCPtr), true);
+  public Rectangle GetViewport() {
+    Rectangle ret = new Rectangle(NDalicPINVOKE.RenderTask_GetViewport(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }

diff --git a/Tizen.NUI/src/internal/RenderTaskList.cs b/Tizen.NUI/src/internal/RenderTaskList.cs
index 1b761e3..cca8a4e 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderTaskList.cs
+++ b/Tizen.NUI/src/internal/RenderTaskList.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RenderTaskList : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class RenderTaskList : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal RenderTaskList(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTaskList_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/RenderTaskSignal.cs b/Tizen.NUI/src/internal/RenderTaskSignal.cs
index 4e722b2..dba0c22 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderTaskSignal.cs
+++ b/Tizen.NUI/src/internal/RenderTaskSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RenderTaskSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class RenderTaskSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Renderer.cs b/Tizen.NUI/src/internal/Renderer.cs
index 171378a..7994a7a 100755 (executable)
--- a/Tizen.NUI/src/internal/Renderer.cs
+++ b/Tizen.NUI/src/internal/Renderer.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Renderer : Handle {
+namespace Tizen.NUI {\r
+\r
+    internal class Renderer : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Renderer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Renderer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -61,20 +61,6 @@ public class Renderer : Handle {
   }
 
 
-  public bool BatchingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Renderer.Property.BATCHING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Renderer.Property.BATCHING_ENABLED, new Tizen.NUI.PropertyValue( value ) );
-    }
-  }
-
   public class Property : global::System.IDisposable {
     private global::System.Runtime.InteropServices.HandleRef swigCPtr;
     protected bool swigCMemOwn;
@@ -105,8 +91,6 @@ public class Renderer : Handle {
       }
     }
   
-    public static readonly int BATCHING_ENABLED = NDalicManualPINVOKE.Renderer_Property_BATCHING_ENABLED_get();
-  
     public Property() : this(NDalicPINVOKE.new_Renderer_Property(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }

diff --git a/Tizen.NUI/src/internal/RenderingType.cs b/Tizen.NUI/src/internal/RenderingType.cs
index 601c97d..b4d9e44 100755 (executable)
--- a/Tizen.NUI/src/internal/RenderingType.cs
+++ b/Tizen.NUI/src/internal/RenderingType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum RenderingType {
+namespace Tizen.NUI {\r
+\r
+    internal enum RenderingType {
   RENDERING_SHARED_ATLAS,
   RENDERING_VECTOR_BASED
 }

diff --git a/Tizen.NUI/src/internal/ResourceImage.cs b/Tizen.NUI/src/internal/ResourceImage.cs
index b33bdd4..8e33bdf 100755 (executable)
--- a/Tizen.NUI/src/internal/ResourceImage.cs
+++ b/Tizen.NUI/src/internal/ResourceImage.cs
@@ -30,7 +30,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class ResourceImage : Image {
+internal class ResourceImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ResourceImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ResourceImage_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ResourceImageSignal.cs b/Tizen.NUI/src/internal/ResourceImageSignal.cs
index f50b72e..bd0cc1f 100755 (executable)
--- a/Tizen.NUI/src/internal/ResourceImageSignal.cs
+++ b/Tizen.NUI/src/internal/ResourceImageSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ResourceImageSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ResourceImageSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Ruler.cs b/Tizen.NUI/src/internal/Ruler.cs
index 9c598e0..f1034cb 100755 (executable)
--- a/Tizen.NUI/src/internal/Ruler.cs
+++ b/Tizen.NUI/src/internal/Ruler.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Ruler : RefObject {
+namespace Tizen.NUI {\r
+\r
+    internal class Ruler : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Ruler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Ruler_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/RulerDomain.cs b/Tizen.NUI/src/internal/RulerDomain.cs
index 8560e8b..1adb07f 100755 (executable)
--- a/Tizen.NUI/src/internal/RulerDomain.cs
+++ b/Tizen.NUI/src/internal/RulerDomain.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RulerDomain : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class RulerDomain : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/RulerPtr.cs b/Tizen.NUI/src/internal/RulerPtr.cs
index cc1dc55..a2b3c66 100755 (executable)
--- a/Tizen.NUI/src/internal/RulerPtr.cs
+++ b/Tizen.NUI/src/internal/RulerPtr.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class RulerPtr : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class RulerPtr : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class RulerPtr : global::System.IDisposable {
   }
 
   ~RulerPtr() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class RulerPtr : global::System.IDisposable {
     }
   }
 
+
   public RulerPtr() : this(NDalicPINVOKE.new_RulerPtr__SWIG_0(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
index 8728a7a..7c34d54 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_CallbackBase.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_CallbackBase {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_CallbackBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_CallbackBase(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Configuration__ContextLoss.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Configuration__ContextLoss.cs
index 2493069..a4769e6 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Configuration__ContextLoss.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Configuration__ContextLoss.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Configuration__ContextLoss {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Configuration__ContextLoss {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Configuration__ContextLoss(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
index f4a8e52..72c5840 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CallbackBase.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__CallbackBase {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__CallbackBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__CallbackBase(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Constraint.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Constraint.cs
index 51c260b..34dd2ae 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Constraint.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Constraint.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Constraint {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Constraint {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Constraint(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs
index ddd0486..779a9c2 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__CustomActorImpl__Extension {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__CustomActorImpl__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__CustomActorImpl__Extension(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
index abc378a..9f0e450 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__FunctorDelegate {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__FunctorDelegate {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs
index e1ed5b3..505dec4 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Internal__TypeRegistry {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Internal__TypeRegistry {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Internal__TypeRegistry(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs
index 74d9503..3ef4ac1 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs
new file mode 100755 (executable)
index 0000000..51cbd71
--- /dev/null
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__RectT_unsigned_int_t {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+  internal SWIGTYPE_p_Dali__RectT_unsigned_int_t(global::System.IntPtr cPtr, bool futureUse) {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+  }
+
+  protected SWIGTYPE_p_Dali__RectT_unsigned_int_t() {
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+  }
+
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__RectT_unsigned_int_t obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+}
+
+}

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs
index b10d6f9..0e0e91f 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs
index 7ae3407..9d41306 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
index 36072cc..f4100da 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs
index 94fb6ec..f3f6d4f 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs
index 3ec4f2e..1d443b0 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs
index dc9220f..fab07cc 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs
index 0e75eed..d4db411 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs
index 28b5a57..505d8ce 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fboolF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fboolF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fboolF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs
index b3f62fe..512488d 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs
index fd8fa8e..b35d165 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__ClampState {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__ClampState {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__ClampState(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs
index 899a03a..85c9c95 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs
index 86fbe25..c7c9543 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs
index bb53e48..efcf5e2 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs
index e59846f..363c859 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs
index 1cf719a..0a8bdc6 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__TouchEvent.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__TouchEvent.cs
index 0f22c5e..3d29094 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__TouchEvent.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_Dali__TouchEvent.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_Dali__TouchEvent {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_Dali__TouchEvent {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__TouchEvent(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_FunctorDelegate.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_FunctorDelegate.cs
index f2fe1a4..169d641 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_FunctorDelegate.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_FunctorDelegate.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_FunctorDelegate {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_FunctorDelegate {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_PropertyInputContainer.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_PropertyInputContainer.cs
index 8a36b7d..56e5274 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_PropertyInputContainer.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_PropertyInputContainer.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_PropertyInputContainer {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_PropertyInputContainer {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_PropertyInputContainer(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_double.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_double.cs
index 8d9c59f..8f0bb77 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_double.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_double.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_double {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_double {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_double(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f___bool.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f___bool.cs
index 0fa739b..593e1fc 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f___bool.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f___bool.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f___bool {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f___bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f___bool(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_float__float.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_float__float.cs
index 0a2c70a..02e995c 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_float__float.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_float__float.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_float__float {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_float__float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_float__float(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs
index b16ce93..e4c146d 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs
index ce3edd9..8d697e0 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
index ae01122..36f59dd 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs
index 08cfa4a..c7fb894 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs
index 8cd7c95..14c75bc 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs
index 0bee9ba..0ac2e29 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_r_Dali__Vector2__bool {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_r_Dali__Vector2__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_Dali__Vector2__bool(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs
index 2bf37c9..b877dc7 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs
index 283e8ed..5d62f2d 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_q_const__Dali__Vector3__float(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_float.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_float.cs
index 981023a..090a51e 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_float.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_float.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_float {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_float(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_int.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_int.cs
index 0a6ca69..b7b3e93 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_int.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_int.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_int {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_int {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_int(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_std__type_info.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_std__type_info.cs
index 85f511d..6dcdaf7 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_std__type_info.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_std__type_info.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_std__type_info {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_std__type_info {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_std__type_info(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_uint8_t.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_uint8_t.cs
index 66cac48..70ea5be 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_uint8_t.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_uint8_t.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_uint8_t {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_uint8_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_uint8_t(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_char.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_char.cs
index c36cc87..6ca7897 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_char.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_char.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_unsigned_char {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_unsigned_char {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_char(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_int.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_int.cs
index 4919f69..b83645c 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_int.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_int.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_unsigned_int {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_unsigned_int {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_int(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_short.cs b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_short.cs
index 704f281..5c55b88 100755 (executable)
--- a/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_short.cs
+++ b/Tizen.NUI/src/internal/SWIGTYPE_p_unsigned_short.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SWIGTYPE_p_unsigned_short {
+namespace Tizen.NUI {\r
+\r
+    internal class SWIGTYPE_p_unsigned_short {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_short(global::System.IntPtr cPtr, bool futureUse) {

diff --git a/Tizen.NUI/src/internal/Sampler.cs b/Tizen.NUI/src/internal/Sampler.cs
index b4f6196..630e07d 100755 (executable)
--- a/Tizen.NUI/src/internal/Sampler.cs
+++ b/Tizen.NUI/src/internal/Sampler.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Sampler : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class Sampler : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Sampler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Sampler_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/SamplingModeType.cs b/Tizen.NUI/src/internal/SamplingModeType.cs
index 5fe99e9..c7122f4 100755 (executable)
--- a/Tizen.NUI/src/internal/SamplingModeType.cs
+++ b/Tizen.NUI/src/internal/SamplingModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum SamplingModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum SamplingModeType {
   BOX,
   NEAREST,
   LINEAR,

diff --git a/Tizen.NUI/src/internal/ScrollView.cs b/Tizen.NUI/src/internal/ScrollView.cs
index 6434c50..b68dd42 100755 (executable)
--- a/Tizen.NUI/src/internal/ScrollView.cs
+++ b/Tizen.NUI/src/internal/ScrollView.cs
@@ -27,10 +27,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class ScrollView : Scrollable {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class ScrollView : Scrollable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollView_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ScrollViewEffect.cs b/Tizen.NUI/src/internal/ScrollViewEffect.cs
index 92f8a21..d36e6d8 100755 (executable)
--- a/Tizen.NUI/src/internal/ScrollViewEffect.cs
+++ b/Tizen.NUI/src/internal/ScrollViewEffect.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ScrollViewEffect : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class ScrollViewEffect : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollViewEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewEffect_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs b/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
index b47b03b..413c56a 100755 (executable)
--- a/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
+++ b/Tizen.NUI/src/internal/ScrollViewPagePathEffect.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ScrollViewPagePathEffect : ScrollViewEffect {
+namespace Tizen.NUI {\r
+\r
+    internal class ScrollViewPagePathEffect : ScrollViewEffect {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollViewPagePathEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewPagePathEffect_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs b/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs
index 115fcb0..2fd4b99 100755 (executable)
--- a/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs
+++ b/Tizen.NUI/src/internal/ScrollViewSnapStartedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ScrollViewSnapStartedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ScrollViewSnapStartedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Scrollable.cs b/Tizen.NUI/src/internal/Scrollable.cs
index a1ede4a..63b190b 100755 (executable)
--- a/Tizen.NUI/src/internal/Scrollable.cs
+++ b/Tizen.NUI/src/internal/Scrollable.cs
@@ -11,10 +11,10 @@
 namespace Tizen.NUI {
 
 using System;
-using System.Runtime.InteropServices;
-
-
-public class Scrollable : View {
+using System.Runtime.InteropServices;\r
+\r
+\r
+    internal class Scrollable : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/ScrollableSignal.cs b/Tizen.NUI/src/internal/ScrollableSignal.cs
index a0fd91a..cdd8012 100755 (executable)
--- a/Tizen.NUI/src/internal/ScrollableSignal.cs
+++ b/Tizen.NUI/src/internal/ScrollableSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ScrollableSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ScrollableSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Shader.cs b/Tizen.NUI/src/internal/Shader.cs
index 0faa671..e69a2ae 100755 (executable)
--- a/Tizen.NUI/src/internal/Shader.cs
+++ b/Tizen.NUI/src/internal/Shader.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Shader : Handle {
+namespace Tizen.NUI {\r
+\r
+    internal class Shader : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Shader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Shader_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/SignalConnectorType.cs b/Tizen.NUI/src/internal/SignalConnectorType.cs
index 6723267..55d36c5 100755 (executable)
--- a/Tizen.NUI/src/internal/SignalConnectorType.cs
+++ b/Tizen.NUI/src/internal/SignalConnectorType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SignalConnectorType : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class SignalConnectorType : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/SignalObserver.cs b/Tizen.NUI/src/internal/SignalObserver.cs
index ded3db3..25b4b3e 100755 (executable)
--- a/Tizen.NUI/src/internal/SignalObserver.cs
+++ b/Tizen.NUI/src/internal/SignalObserver.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SignalObserver : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class SignalObserver : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class SignalObserver : global::System.IDisposable {
   }
 
   ~SignalObserver() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class SignalObserver : global::System.IDisposable {
     }
   }
 
+
   public virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) {
     NDalicPINVOKE.SignalObserver_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs b/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
index beed0ea..738545d 100755 (executable)
--- a/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
+++ b/Tizen.NUI/src/internal/SliderMarkReachedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SliderMarkReachedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class SliderMarkReachedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/SliderValueChangedSignal.cs b/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
index e3082a0..b9f9df1 100755 (executable)
--- a/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
+++ b/Tizen.NUI/src/internal/SliderValueChangedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SliderValueChangedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class SliderValueChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/SlotObserver.cs b/Tizen.NUI/src/internal/SlotObserver.cs
index 2066b0b..db65be6 100755 (executable)
--- a/Tizen.NUI/src/internal/SlotObserver.cs
+++ b/Tizen.NUI/src/internal/SlotObserver.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class SlotObserver : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class SlotObserver : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class SlotObserver : global::System.IDisposable {
   }
 
   ~SlotObserver() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class SlotObserver : global::System.IDisposable {
     }
   }
 
+
   public virtual void SlotDisconnected(SWIGTYPE_p_Dali__CallbackBase callback) {
     NDalicPINVOKE.SlotObserver_SlotDisconnected(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/SnapType.cs b/Tizen.NUI/src/internal/SnapType.cs
index 8b4a060..9373428 100755 (executable)
--- a/Tizen.NUI/src/internal/SnapType.cs
+++ b/Tizen.NUI/src/internal/SnapType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum SnapType {
+namespace Tizen.NUI {\r
+\r
+    internal enum SnapType {
   Snap,
   Flick
 }

diff --git a/Tizen.NUI/src/internal/StageWheelSignal.cs b/Tizen.NUI/src/internal/StageWheelSignal.cs
index 009b598..223453f 100755 (executable)
--- a/Tizen.NUI/src/internal/StageWheelSignal.cs
+++ b/Tizen.NUI/src/internal/StageWheelSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class StageWheelSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class StageWheelSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/StencilFunctionType.cs b/Tizen.NUI/src/internal/StencilFunctionType.cs
index de74f13..6ec65bd 100755 (executable)
--- a/Tizen.NUI/src/internal/StencilFunctionType.cs
+++ b/Tizen.NUI/src/internal/StencilFunctionType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum StencilFunctionType {
+namespace Tizen.NUI {\r
+\r
+    internal enum StencilFunctionType {
   NEVER,
   LESS,
   EQUAL,

diff --git a/Tizen.NUI/src/internal/StencilOperationType.cs b/Tizen.NUI/src/internal/StencilOperationType.cs
index 5c3431c..f64fef7 100755 (executable)
--- a/Tizen.NUI/src/internal/StencilOperationType.cs
+++ b/Tizen.NUI/src/internal/StencilOperationType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum StencilOperationType {
+namespace Tizen.NUI {\r
+\r
+    internal enum StencilOperationType {
   ZERO,
   KEEP,
   REPLACE,

diff --git a/Tizen.NUI/src/internal/StringValuePair.cs b/Tizen.NUI/src/internal/StringValuePair.cs
index 2dd5d12..a4ef08c 100755 (executable)
--- a/Tizen.NUI/src/internal/StringValuePair.cs
+++ b/Tizen.NUI/src/internal/StringValuePair.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class StringValuePair : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class StringValuePair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/StyleChangedSignal.cs b/Tizen.NUI/src/internal/StyleChangedSignal.cs
index df28f69..4fba284 100755 (executable)
--- a/Tizen.NUI/src/internal/StyleChangedSignal.cs
+++ b/Tizen.NUI/src/internal/StyleChangedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class StyleChangedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class StyleChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs b/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs
index edddeb1..85d3101 100755 (executable)
--- a/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs
+++ b/Tizen.NUI/src/internal/TapGestureDetectedSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TapGestureDetectedSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TapGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TapGestureDetector.cs b/Tizen.NUI/src/internal/TapGestureDetector.cs
index 3b6067f..5692c09 100755 (executable)
--- a/Tizen.NUI/src/internal/TapGestureDetector.cs
+++ b/Tizen.NUI/src/internal/TapGestureDetector.cs
@@ -203,7 +203,7 @@ public static TapGestureDetector GetTapGestureDetectorFromPtr(global::System.Int
     return ret;
   }
 
-  public TapGestureDetectedSignal DetectedSignal() {
+  internal TapGestureDetectedSignal DetectedSignal() {
     TapGestureDetectedSignal ret = new TapGestureDetectedSignal(NDalicPINVOKE.TapGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;

diff --git a/Tizen.NUI/src/internal/TextEditorSignal.cs b/Tizen.NUI/src/internal/TextEditorSignal.cs
index 994845c..df47b1f 100755 (executable)
--- a/Tizen.NUI/src/internal/TextEditorSignal.cs
+++ b/Tizen.NUI/src/internal/TextEditorSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TextEditorSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TextEditorSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TextFieldSignal.cs b/Tizen.NUI/src/internal/TextFieldSignal.cs
index 6b57457..fba0342 100755 (executable)
--- a/Tizen.NUI/src/internal/TextFieldSignal.cs
+++ b/Tizen.NUI/src/internal/TextFieldSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TextFieldSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TextFieldSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/Texture.cs b/Tizen.NUI/src/internal/Texture.cs
index 0c8e2ec..afb0df8 100755 (executable)
--- a/Tizen.NUI/src/internal/Texture.cs
+++ b/Tizen.NUI/src/internal/Texture.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Texture : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class Texture : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Texture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Texture_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/TextureSet.cs b/Tizen.NUI/src/internal/TextureSet.cs
index 260d759..3e95048 100755 (executable)
--- a/Tizen.NUI/src/internal/TextureSet.cs
+++ b/Tizen.NUI/src/internal/TextureSet.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TextureSet : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    internal class TextureSet : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal TextureSet(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextureSet_SWIGUpcast(cPtr), cMemoryOwn) {

diff --git a/Tizen.NUI/src/internal/TextureType.cs b/Tizen.NUI/src/internal/TextureType.cs
index b3a2d81..8c20921 100755 (executable)
--- a/Tizen.NUI/src/internal/TextureType.cs
+++ b/Tizen.NUI/src/internal/TextureType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum TextureType {
+namespace Tizen.NUI {\r
+\r
+    internal enum TextureType {
   TEXTURE_2D,
   TEXTURE_CUBE
 }

diff --git a/Tizen.NUI/src/internal/TimePeriod.cs b/Tizen.NUI/src/internal/TimePeriod.cs
index b6b04da..0454589 100755 (executable)
--- a/Tizen.NUI/src/internal/TimePeriod.cs
+++ b/Tizen.NUI/src/internal/TimePeriod.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TimePeriod : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TimePeriod : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TimerSignalType.cs b/Tizen.NUI/src/internal/TimerSignalType.cs
index a9820fe..1e4df44 100755 (executable)
--- a/Tizen.NUI/src/internal/TimerSignalType.cs
+++ b/Tizen.NUI/src/internal/TimerSignalType.cs
@@ -11,7 +11,7 @@
 namespace Tizen.NUI\r
 {\r
 \r
-    public class TimerSignalType : global::System.IDisposable\r
+    internal class TimerSignalType : global::System.IDisposable\r
     {\r
         private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
         protected bool swigCMemOwn;\r
@@ -91,9 +91,7 @@ namespace Tizen.NUI
             bool ret = NDalicPINVOKE.TimerSignalType_Emit(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
-        }\r
-\r
-\r
+        }
         public void Connect(System.Delegate func)\r
         {\r
             System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);\r
@@ -112,7 +110,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-\r
     }
 
 }

diff --git a/Tizen.NUI/src/internal/ToolkitPropertyRange.cs b/Tizen.NUI/src/internal/ToolkitPropertyRange.cs
index 31186d7..0006fd2 100755 (executable)
--- a/Tizen.NUI/src/internal/ToolkitPropertyRange.cs
+++ b/Tizen.NUI/src/internal/ToolkitPropertyRange.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum ToolkitPropertyRange {
+namespace Tizen.NUI {\r
+\r
+    internal enum ToolkitPropertyRange {
   VISUAL_PROPERTY_BASE_START_INDEX = PropertyRanges.CORE_PROPERTY_MAX_INDEX+1,
   VISUAL_PROPERTY_BASE_END_INDEX = VISUAL_PROPERTY_BASE_START_INDEX+100,
   VISUAL_PROPERTY_START_INDEX = VISUAL_PROPERTY_BASE_END_INDEX+1,

diff --git a/Tizen.NUI/src/internal/TooltipPositionType.cs b/Tizen.NUI/src/internal/TooltipPositionType.cs
index 9cf68b6..0f0e0c5 100755 (executable)
--- a/Tizen.NUI/src/internal/TooltipPositionType.cs
+++ b/Tizen.NUI/src/internal/TooltipPositionType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum TooltipPositionType {
+namespace Tizen.NUI {\r
+\r
+    internal enum TooltipPositionType {
   ABOVE,
   BELOW,
   HOVER_POINT

diff --git a/Tizen.NUI/src/internal/TouchPoint.cs b/Tizen.NUI/src/internal/TouchPoint.cs
index a1bb95c..6d05197 100755 (executable)
--- a/Tizen.NUI/src/internal/TouchPoint.cs
+++ b/Tizen.NUI/src/internal/TouchPoint.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TouchPoint : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TouchPoint : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TouchPointContainer.cs b/Tizen.NUI/src/internal/TouchPointContainer.cs
index 44cc3ae..692b32b 100755 (executable)
--- a/Tizen.NUI/src/internal/TouchPointContainer.cs
+++ b/Tizen.NUI/src/internal/TouchPointContainer.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+namespace Tizen.NUI {\r
+\r
+    internal class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<TouchPoint>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;

diff --git a/Tizen.NUI/src/internal/TouchSignal.cs b/Tizen.NUI/src/internal/TouchSignal.cs
index 27dda6d..9f8f36a 100755 (executable)
--- a/Tizen.NUI/src/internal/TouchSignal.cs
+++ b/Tizen.NUI/src/internal/TouchSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TouchSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TouchSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class TouchSignal : global::System.IDisposable {
   }
 
   ~TouchSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class TouchSignal : global::System.IDisposable {
     }
   }
 
+
   public bool Empty() {
     bool ret = NDalicPINVOKE.TouchSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/TransitionData.cs b/Tizen.NUI/src/internal/TransitionData.cs
index b000b39..8972074 100755 (executable)
--- a/Tizen.NUI/src/internal/TransitionData.cs
+++ b/Tizen.NUI/src/internal/TransitionData.cs
@@ -24,9 +24,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TransitionData : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    public class TransitionData : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal TransitionData(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TransitionData_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -91,7 +91,7 @@ public class TransitionData : BaseHandle {
     return ret;
   }
 
-  public TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) {
+  internal TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/Tizen.NUI/src/internal/TypeAction.cs b/Tizen.NUI/src/internal/TypeAction.cs
index a579ddd..0a87fcb 100755 (executable)
--- a/Tizen.NUI/src/internal/TypeAction.cs
+++ b/Tizen.NUI/src/internal/TypeAction.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TypeAction : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TypeAction : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TypeInfo.cs b/Tizen.NUI/src/internal/TypeInfo.cs
index 625fa73..5a99008 100755 (executable)
--- a/Tizen.NUI/src/internal/TypeInfo.cs
+++ b/Tizen.NUI/src/internal/TypeInfo.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TypeInfo : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    public class TypeInfo : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal TypeInfo(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TypeInfo_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -107,7 +107,7 @@ public class TypeInfo : BaseHandle {
     return ret;
   }
 
-  public void GetPropertyIndices(VectorInteger indices) {
+  internal void GetPropertyIndices(VectorInteger indices) {
     NDalicPINVOKE.TypeInfo_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/TypeRegistration.cs b/Tizen.NUI/src/internal/TypeRegistration.cs
index f98073b..55476b4 100755 (executable)
--- a/Tizen.NUI/src/internal/TypeRegistration.cs
+++ b/Tizen.NUI/src/internal/TypeRegistration.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TypeRegistration : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class TypeRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/TypeRegistry.cs b/Tizen.NUI/src/internal/TypeRegistry.cs
index 4d87b07..9adfd27 100755 (executable)
--- a/Tizen.NUI/src/internal/TypeRegistry.cs
+++ b/Tizen.NUI/src/internal/TypeRegistry.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class TypeRegistry : BaseHandle {
+namespace Tizen.NUI {\r
+\r
+    public class TypeRegistry : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal TypeRegistry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TypeRegistry_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -65,7 +65,7 @@ public class TypeRegistry : BaseHandle {
     return ret;
   }
 
-  public TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) {
+  internal TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) {
     TypeInfo ret = new TypeInfo(NDalicPINVOKE.TypeRegistry_GetTypeInfo__SWIG_1(swigCPtr, SWIGTYPE_p_std__type_info.getCPtr(registerType)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -83,7 +83,7 @@ public class TypeRegistry : BaseHandle {
     return ret;
   }
 
-  public TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) {
+  internal TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 

diff --git a/Tizen.NUI/src/internal/Uint16Pair.cs b/Tizen.NUI/src/internal/Uint16Pair.cs
index 594125e..af87f00 100755 (executable)
--- a/Tizen.NUI/src/internal/Uint16Pair.cs
+++ b/Tizen.NUI/src/internal/Uint16Pair.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Uint16Pair : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class Uint16Pair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VectorBase.cs b/Tizen.NUI/src/internal/VectorBase.cs
index 96d4ed1..c6e5256 100755 (executable)
--- a/Tizen.NUI/src/internal/VectorBase.cs
+++ b/Tizen.NUI/src/internal/VectorBase.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VectorBase : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VectorBase : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VectorFloat.cs b/Tizen.NUI/src/internal/VectorFloat.cs
index c01ad6b..78c4d55 100755 (executable)
--- a/Tizen.NUI/src/internal/VectorFloat.cs
+++ b/Tizen.NUI/src/internal/VectorFloat.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VectorFloat : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VectorFloat : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VectorInteger.cs b/Tizen.NUI/src/internal/VectorInteger.cs
index b12bf0c..e338d0c 100755 (executable)
--- a/Tizen.NUI/src/internal/VectorInteger.cs
+++ b/Tizen.NUI/src/internal/VectorInteger.cs
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorInteger : global::System.IDisposable {
+internal class VectorInteger : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VectorUint16Pair.cs b/Tizen.NUI/src/internal/VectorUint16Pair.cs
index fe0216b..a8b7d60 100755 (executable)
--- a/Tizen.NUI/src/internal/VectorUint16Pair.cs
+++ b/Tizen.NUI/src/internal/VectorUint16Pair.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VectorUint16Pair : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VectorUint16Pair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VectorUnsignedChar.cs b/Tizen.NUI/src/internal/VectorUnsignedChar.cs
index f5679a4..f5f2e73 100755 (executable)
--- a/Tizen.NUI/src/internal/VectorUnsignedChar.cs
+++ b/Tizen.NUI/src/internal/VectorUnsignedChar.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VectorUnsignedChar : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VectorUnsignedChar : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/VideoViewSignal.cs b/Tizen.NUI/src/internal/VideoViewSignal.cs
index 6a7b743..2b80108 100755 (executable)
--- a/Tizen.NUI/src/internal/VideoViewSignal.cs
+++ b/Tizen.NUI/src/internal/VideoViewSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VideoViewSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VideoViewSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ViewImpl.cs b/Tizen.NUI/src/internal/ViewImpl.cs
index 6d0de32..a40fb56 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewImpl.cs
+++ b/Tizen.NUI/src/internal/ViewImpl.cs
@@ -7,801 +7,906 @@
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
-
-#if true
 using System.Reflection;
-#endif
-
-
-namespace Tizen.NUI {
-
-public class ViewImpl : CustomActorImpl {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal ViewImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ViewImpl_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewImpl obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  public override void Dispose() {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          throw new global::System.MethodAccessException("C++ destructor does not have public access");
+namespace Tizen.NUI\r
+{\r
+\r
+    public class ViewImpl : CustomActorImpl\r
+    {\r
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
+\r
+        internal ViewImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ViewImpl_SWIGUpcast(cPtr), cMemoryOwn)\r
+        {\r
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
+        }\r
+\r
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewImpl obj)\r
+        {\r
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
+        }\r
+\r
+        public override void Dispose()\r
+        {\r
+            lock (this)\r
+            {\r
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
+                {\r
+                    if (swigCMemOwn)\r
+                    {\r
+                        swigCMemOwn = false;\r
+                        throw new global::System.MethodAccessException("C++ destructor does not have public access");\r
+                    }\r
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
+                }\r
+                global::System.GC.SuppressFinalize(this);\r
+                base.Dispose();\r
+            }\r
+        }\r
+\r
+        public static View New()\r
+        {\r
+            View ret = new View(NDalicPINVOKE.ViewImpl_New(), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetStyleName(string styleName)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetStyleName(swigCPtr, styleName);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public string GetStyleName()\r
+        {\r
+            string ret = NDalicPINVOKE.ViewImpl_GetStyleName(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetBackgroundColor(Vector4 color)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public Vector4 GetBackgroundColor()\r
+        {\r
+            Vector4 ret = new Vector4(NDalicPINVOKE.ViewImpl_GetBackgroundColor(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal void SetBackgroundImage(Image image)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetBackgroundImage(swigCPtr, Image.getCPtr(image));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void SetBackground(PropertyMap map)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetBackground(swigCPtr, PropertyMap.getCPtr(map));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void ClearBackground()\r
+        {\r
+            NDalicPINVOKE.ViewImpl_ClearBackground(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void EnableGestureDetection(Gesture.GestureType type)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_EnableGestureDetection(swigCPtr, (int)type);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void DisableGestureDetection(Gesture.GestureType type)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_DisableGestureDetection(swigCPtr, (int)type);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public PinchGestureDetector GetPinchGestureDetector()\r
+        {\r
+            PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.ViewImpl_GetPinchGestureDetector(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public PanGestureDetector GetPanGestureDetector()\r
+        {\r
+            PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.ViewImpl_GetPanGestureDetector(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public TapGestureDetector GetTapGestureDetector()\r
+        {\r
+            TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.ViewImpl_GetTapGestureDetector(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public LongPressGestureDetector GetLongPressGestureDetector()\r
+        {\r
+            LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.ViewImpl_GetLongPressGestureDetector(swigCPtr), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetKeyboardNavigationSupport(bool isSupported)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetKeyboardNavigationSupport(swigCPtr, isSupported);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public bool IsKeyboardNavigationSupported()\r
+        {\r
+            bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardNavigationSupported(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void SetKeyInputFocus()\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetKeyInputFocus(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public bool HasKeyInputFocus()\r
+        {\r
+            bool ret = NDalicPINVOKE.ViewImpl_HasKeyInputFocus(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void ClearKeyInputFocus()\r
+        {\r
+            NDalicPINVOKE.ViewImpl_ClearKeyInputFocus(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void SetAsKeyboardFocusGroup(bool isFocusGroup)\r
+        {\r
+            NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public bool IsKeyboardFocusGroup()\r
+        {\r
+            bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public void AccessibilityActivate()\r
+        {\r
+            NDalicPINVOKE.ViewImpl_AccessibilityActivate(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public void KeyboardEnter()\r
+        {\r
+            NDalicPINVOKE.ViewImpl_KeyboardEnter(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal ControlKeySignal KeyEventSignal()\r
+        {\r
+            ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.ViewImpl_KeyEventSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal KeyInputFocusSignal KeyInputFocusGainedSignal()\r
+        {\r
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusGainedSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal KeyInputFocusSignal KeyInputFocusLostSignal()\r
+        {\r
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusLostSignal(swigCPtr), false);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public bool EmitKeyEventSignal(Key arg0)\r
+        {\r
+            bool ret = NDalicPINVOKE.ViewImpl_EmitKeyEventSignal(swigCPtr, Key.getCPtr(arg0));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new void OnStageConnection(int depth)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) NDalicPINVOKE.ViewImpl_OnStageConnectionSwigExplicitViewImpl(swigCPtr, depth); else NDalicPINVOKE.ViewImpl_OnStageConnection(swigCPtr, depth);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnStageDisconnection()\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) NDalicPINVOKE.ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnStageDisconnection(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnChildAdd(Actor child)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnChildRemove(Actor child)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnPropertySet(int index, PropertyValue propertyValue)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4)) NDalicPINVOKE.ViewImpl_OnPropertySetSwigExplicitViewImpl(swigCPtr, index, PropertyValue.getCPtr(propertyValue)); else NDalicPINVOKE.ViewImpl_OnPropertySet(swigCPtr, index, PropertyValue.getCPtr(propertyValue));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnSizeSet(Vector3 targetSize)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5)) NDalicPINVOKE.ViewImpl_OnSizeSetSwigExplicitViewImpl(swigCPtr, Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeSet(swigCPtr, Vector3.getCPtr(targetSize));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnSizeAnimation(Animation animation, Vector3 targetSize)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6)) NDalicPINVOKE.ViewImpl_OnSizeAnimationSwigExplicitViewImpl(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeAnimation(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal virtual new bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7) ? NDalicPINVOKE.ViewImpl_OnTouchEventSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new bool OnHoverEvent(Hover arg0)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8) ? NDalicPINVOKE.ViewImpl_OnHoverEventSwigExplicitViewImpl(swigCPtr, Hover.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnHoverEvent(swigCPtr, Hover.getCPtr(arg0)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new bool OnKeyEvent(Key arg0)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9) ? NDalicPINVOKE.ViewImpl_OnKeyEventSwigExplicitViewImpl(swigCPtr, Key.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnKeyEvent(swigCPtr, Key.getCPtr(arg0)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new bool OnWheelEvent(Wheel arg0)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10) ? NDalicPINVOKE.ViewImpl_OnWheelEventSwigExplicitViewImpl(swigCPtr, Wheel.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnWheelEvent(swigCPtr, Wheel.getCPtr(arg0)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new void OnRelayout(Vector2 size, RelayoutContainer container)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11)) NDalicPINVOKE.ViewImpl_OnRelayoutSwigExplicitViewImpl(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container)); else NDalicPINVOKE.ViewImpl_OnRelayout(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12)) NDalicPINVOKE.ViewImpl_OnSetResizePolicySwigExplicitViewImpl(swigCPtr, (int)policy, (int)dimension); else NDalicPINVOKE.ViewImpl_OnSetResizePolicy(swigCPtr, (int)policy, (int)dimension);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new Vector3 GetNaturalSize()\r
+        {\r
+            Vector3 ret = new Vector3((SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13) ? NDalicPINVOKE.ViewImpl_GetNaturalSizeSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_GetNaturalSize(swigCPtr)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new float CalculateChildSize(Actor child, DimensionType dimension)\r
+        {\r
+            float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new float GetHeightForWidth(float width)\r
+        {\r
+            float ret = (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15) ? NDalicPINVOKE.ViewImpl_GetHeightForWidthSwigExplicitViewImpl(swigCPtr, width) : NDalicPINVOKE.ViewImpl_GetHeightForWidth(swigCPtr, width));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new float GetWidthForHeight(float height)\r
+        {\r
+            float ret = (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16) ? NDalicPINVOKE.ViewImpl_GetWidthForHeightSwigExplicitViewImpl(swigCPtr, height) : NDalicPINVOKE.ViewImpl_GetWidthForHeight(swigCPtr, height));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new bool RelayoutDependentOnChildren(DimensionType dimension)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(swigCPtr, (int)dimension) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_0(swigCPtr, (int)dimension));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new bool RelayoutDependentOnChildren()\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(swigCPtr) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_1(swigCPtr));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        protected virtual new void OnCalculateRelayoutSize(DimensionType dimension)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19)) NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(swigCPtr, (int)dimension); else NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSize(swigCPtr, (int)dimension);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        protected virtual new void OnLayoutNegotiated(float size, DimensionType dimension)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20)) NDalicPINVOKE.ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(swigCPtr, size, (int)dimension); else NDalicPINVOKE.ViewImpl_OnLayoutNegotiated(swigCPtr, size, (int)dimension);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnInitialize()\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21)) NDalicPINVOKE.ViewImpl_OnInitializeSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnInitialize(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnControlChildAdd(Actor child)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, Actor.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnControlChildRemove(Actor child)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, Actor.getCPtr(child));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24)) NDalicPINVOKE.ViewImpl_OnStyleChangeSwigExplicitViewImpl(swigCPtr, StyleManager.getCPtr(styleManager), (int)change); else NDalicPINVOKE.ViewImpl_OnStyleChange(swigCPtr, StyleManager.getCPtr(styleManager), (int)change);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual bool OnAccessibilityActivated()\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25) ? NDalicPINVOKE.ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityActivated(swigCPtr));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual bool OnAccessibilityPan(PanGesture gesture)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26) ? NDalicPINVOKE.ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(gesture)) : NDalicPINVOKE.ViewImpl_OnAccessibilityPan(swigCPtr, PanGesture.getCPtr(gesture)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        internal virtual bool OnAccessibilityTouch(SWIGTYPE_p_Dali__TouchEvent touchEvent)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27) ? NDalicPINVOKE.ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)) : NDalicPINVOKE.ViewImpl_OnAccessibilityTouch(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual bool OnAccessibilityValueChange(bool isIncrease)\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28) ? NDalicPINVOKE.ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(swigCPtr, isIncrease) : NDalicPINVOKE.ViewImpl_OnAccessibilityValueChange(swigCPtr, isIncrease));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual bool OnAccessibilityZoom()\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29) ? NDalicPINVOKE.ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityZoom(swigCPtr));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual void OnKeyInputFocusGained()\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnKeyInputFocusLost()\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled)\r
+        {\r
+            Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual bool OnKeyboardEnter()\r
+        {\r
+            bool ret = (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+            return ret;\r
+        }\r
+\r
+        public virtual void OnPinch(PinchGesture pinch)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35)) NDalicPINVOKE.ViewImpl_OnPinchSwigExplicitViewImpl(swigCPtr, PinchGesture.getCPtr(pinch)); else NDalicPINVOKE.ViewImpl_OnPinch(swigCPtr, PinchGesture.getCPtr(pinch));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnPan(PanGesture pan)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36)) NDalicPINVOKE.ViewImpl_OnPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(pan)); else NDalicPINVOKE.ViewImpl_OnPan(swigCPtr, PanGesture.getCPtr(pan));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnTap(TapGesture tap)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37)) NDalicPINVOKE.ViewImpl_OnTapSwigExplicitViewImpl(swigCPtr, TapGesture.getCPtr(tap)); else NDalicPINVOKE.ViewImpl_OnTap(swigCPtr, TapGesture.getCPtr(tap));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        public virtual void OnLongPress(LongPressGesture longPress)\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38)) NDalicPINVOKE.ViewImpl_OnLongPressSwigExplicitViewImpl(swigCPtr, LongPressGesture.getCPtr(longPress)); else NDalicPINVOKE.ViewImpl_OnLongPress(swigCPtr, LongPressGesture.getCPtr(longPress));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal virtual void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)\r
+        {\r
+            if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39)) NDalicPINVOKE.ViewImpl_SignalConnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalConnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        internal virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)\r
+        {\r
+            if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40)) NDalicPINVOKE.ViewImpl_SignalDisconnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));\r
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
+        }\r
+\r
+        private void SwigDirectorConnect()\r
+        {\r
+            if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0))\r
+                swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnStageConnection);\r
+            if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1))\r
+                swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnStageDisconnection);\r
+            if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2))\r
+                swigDelegate2 = new SwigDelegateViewImpl_2(SwigDirectorOnChildAdd);\r
+            if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3))\r
+                swigDelegate3 = new SwigDelegateViewImpl_3(SwigDirectorOnChildRemove);\r
+            if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4))\r
+                swigDelegate4 = new SwigDelegateViewImpl_4(SwigDirectorOnPropertySet);\r
+            if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5))\r
+                swigDelegate5 = new SwigDelegateViewImpl_5(SwigDirectorOnSizeSet);\r
+            if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6))\r
+                swigDelegate6 = new SwigDelegateViewImpl_6(SwigDirectorOnSizeAnimation);\r
+            if (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7))\r
+                swigDelegate7 = new SwigDelegateViewImpl_7(SwigDirectorOnTouchEvent);\r
+            if (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8))\r
+                swigDelegate8 = new SwigDelegateViewImpl_8(SwigDirectorOnHoverEvent);\r
+            if (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9))\r
+                swigDelegate9 = new SwigDelegateViewImpl_9(SwigDirectorOnKeyEvent);\r
+            if (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10))\r
+                swigDelegate10 = new SwigDelegateViewImpl_10(SwigDirectorOnWheelEvent);\r
+            if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11))\r
+                swigDelegate11 = new SwigDelegateViewImpl_11(SwigDirectorOnRelayout);\r
+            if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12))\r
+                swigDelegate12 = new SwigDelegateViewImpl_12(SwigDirectorOnSetResizePolicy);\r
+            if (SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13))\r
+                swigDelegate13 = new SwigDelegateViewImpl_13(SwigDirectorGetNaturalSize);\r
+            if (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14))\r
+                swigDelegate14 = new SwigDelegateViewImpl_14(SwigDirectorCalculateChildSize);\r
+            if (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15))\r
+                swigDelegate15 = new SwigDelegateViewImpl_15(SwigDirectorGetHeightForWidth);\r
+            if (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16))\r
+                swigDelegate16 = new SwigDelegateViewImpl_16(SwigDirectorGetWidthForHeight);\r
+            if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17))\r
+                swigDelegate17 = new SwigDelegateViewImpl_17(SwigDirectorRelayoutDependentOnChildren__SWIG_0);\r
+            if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18))\r
+                swigDelegate18 = new SwigDelegateViewImpl_18(SwigDirectorRelayoutDependentOnChildren__SWIG_1);\r
+            if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19))\r
+                swigDelegate19 = new SwigDelegateViewImpl_19(SwigDirectorOnCalculateRelayoutSize);\r
+            if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20))\r
+                swigDelegate20 = new SwigDelegateViewImpl_20(SwigDirectorOnLayoutNegotiated);\r
+            if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21))\r
+                swigDelegate21 = new SwigDelegateViewImpl_21(SwigDirectorOnInitialize);\r
+            if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22))\r
+                swigDelegate22 = new SwigDelegateViewImpl_22(SwigDirectorOnControlChildAdd);\r
+            if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23))\r
+                swigDelegate23 = new SwigDelegateViewImpl_23(SwigDirectorOnControlChildRemove);\r
+            if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24))\r
+                swigDelegate24 = new SwigDelegateViewImpl_24(SwigDirectorOnStyleChange);\r
+            if (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25))\r
+                swigDelegate25 = new SwigDelegateViewImpl_25(SwigDirectorOnAccessibilityActivated);\r
+            if (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26))\r
+                swigDelegate26 = new SwigDelegateViewImpl_26(SwigDirectorOnAccessibilityPan);\r
+            if (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27))\r
+                swigDelegate27 = new SwigDelegateViewImpl_27(SwigDirectorOnAccessibilityTouch);\r
+            if (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28))\r
+                swigDelegate28 = new SwigDelegateViewImpl_28(SwigDirectorOnAccessibilityValueChange);\r
+            if (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29))\r
+                swigDelegate29 = new SwigDelegateViewImpl_29(SwigDirectorOnAccessibilityZoom);\r
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30))\r
+                swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained);\r
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31))\r
+                swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost);\r
+            if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32))\r
+                swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor);\r
+            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33))\r
+                swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted);\r
+            if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34))\r
+                swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter);\r
+            if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35))\r
+                swigDelegate35 = new SwigDelegateViewImpl_35(SwigDirectorOnPinch);\r
+            if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36))\r
+                swigDelegate36 = new SwigDelegateViewImpl_36(SwigDirectorOnPan);\r
+            if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37))\r
+                swigDelegate37 = new SwigDelegateViewImpl_37(SwigDirectorOnTap);\r
+            if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38))\r
+                swigDelegate38 = new SwigDelegateViewImpl_38(SwigDirectorOnLongPress);\r
+            if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39))\r
+                swigDelegate39 = new SwigDelegateViewImpl_39(SwigDirectorSignalConnected);\r
+            if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40))\r
+                swigDelegate40 = new SwigDelegateViewImpl_40(SwigDirectorSignalDisconnected);\r
+            NDalicPINVOKE.ViewImpl_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6, swigDelegate7, swigDelegate8, swigDelegate9, swigDelegate10, swigDelegate11, swigDelegate12, swigDelegate13, swigDelegate14, swigDelegate15, swigDelegate16, swigDelegate17, swigDelegate18, swigDelegate19, swigDelegate20, swigDelegate21, swigDelegate22, swigDelegate23, swigDelegate24, swigDelegate25, swigDelegate26, swigDelegate27, swigDelegate28, swigDelegate29, swigDelegate30, swigDelegate31, swigDelegate32, swigDelegate33, swigDelegate34, swigDelegate35, swigDelegate36, swigDelegate37, swigDelegate38, swigDelegate39, swigDelegate40);\r
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-  public static View New() {
-    View ret = new View(NDalicPINVOKE.ViewImpl_New(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetStyleName(string styleName) {
-    NDalicPINVOKE.ViewImpl_SetStyleName(swigCPtr, styleName);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public string GetStyleName() {
-    string ret = NDalicPINVOKE.ViewImpl_GetStyleName(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundColor(Vector4 color) {
-    NDalicPINVOKE.ViewImpl_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetBackgroundColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.ViewImpl_GetBackgroundColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundImage(Image image) {
-    NDalicPINVOKE.ViewImpl_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetBackground(PropertyMap map) {
-    NDalicPINVOKE.ViewImpl_SetBackground(swigCPtr, PropertyMap.getCPtr(map));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void ClearBackground() {
-    NDalicPINVOKE.ViewImpl_ClearBackground(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
 
-  public void EnableGestureDetection(Gesture.GestureType type) {
-    NDalicPINVOKE.ViewImpl_EnableGestureDetection(swigCPtr, (int)type);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void DisableGestureDetection(Gesture.GestureType type) {
-    NDalicPINVOKE.ViewImpl_DisableGestureDetection(swigCPtr, (int)type);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PinchGestureDetector GetPinchGestureDetector() {
-    PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.ViewImpl_GetPinchGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PanGestureDetector GetPanGestureDetector() {
-    PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.ViewImpl_GetPanGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TapGestureDetector GetTapGestureDetector() {
-    TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.ViewImpl_GetTapGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public LongPressGestureDetector GetLongPressGestureDetector() {
-    LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.ViewImpl_GetLongPressGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyboardNavigationSupport(bool isSupported) {
-    NDalicPINVOKE.ViewImpl_SetKeyboardNavigationSupport(swigCPtr, isSupported);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsKeyboardNavigationSupported() {
-    bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardNavigationSupported(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyInputFocus() {
-    NDalicPINVOKE.ViewImpl_SetKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool HasKeyInputFocus() {
-    bool ret = NDalicPINVOKE.ViewImpl_HasKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ClearKeyInputFocus() {
-    NDalicPINVOKE.ViewImpl_ClearKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetAsKeyboardFocusGroup(bool isFocusGroup) {
-    NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsKeyboardFocusGroup() {
-    bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void AccessibilityActivate() {
-    NDalicPINVOKE.ViewImpl_AccessibilityActivate(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void KeyboardEnter() {
-    NDalicPINVOKE.ViewImpl_KeyboardEnter(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ControlKeySignal KeyEventSignal() {
-    ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.ViewImpl_KeyEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusGainedSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusGainedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusLostSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusLostSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EmitKeyEventSignal(Key arg0) {
-    bool ret = NDalicPINVOKE.ViewImpl_EmitKeyEventSignal(swigCPtr, Key.getCPtr(arg0));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnStageConnection(int depth) {
-    if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) NDalicPINVOKE.ViewImpl_OnStageConnectionSwigExplicitViewImpl(swigCPtr, depth); else NDalicPINVOKE.ViewImpl_OnStageConnection(swigCPtr, depth);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnStageDisconnection() {
-    if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) NDalicPINVOKE.ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnStageDisconnection(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnChildAdd(Actor child) {
-    if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnChildRemove(Actor child) {
-    if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnPropertySet(int index, PropertyValue propertyValue) {
-    if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4)) NDalicPINVOKE.ViewImpl_OnPropertySetSwigExplicitViewImpl(swigCPtr, index, PropertyValue.getCPtr(propertyValue)); else NDalicPINVOKE.ViewImpl_OnPropertySet(swigCPtr, index, PropertyValue.getCPtr(propertyValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSizeSet(Vector3 targetSize) {
-    if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5)) NDalicPINVOKE.ViewImpl_OnSizeSetSwigExplicitViewImpl(swigCPtr, Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeSet(swigCPtr, Vector3.getCPtr(targetSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSizeAnimation(Animation animation, Vector3 targetSize) {
-    if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6)) NDalicPINVOKE.ViewImpl_OnSizeAnimationSwigExplicitViewImpl(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeAnimation(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7) ? NDalicPINVOKE.ViewImpl_OnTouchEventSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnHoverEvent(Hover arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8) ? NDalicPINVOKE.ViewImpl_OnHoverEventSwigExplicitViewImpl(swigCPtr, Hover.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnHoverEvent(swigCPtr, Hover.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnKeyEvent(Key arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9) ? NDalicPINVOKE.ViewImpl_OnKeyEventSwigExplicitViewImpl(swigCPtr, Key.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnKeyEvent(swigCPtr, Key.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnWheelEvent(Wheel arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10) ? NDalicPINVOKE.ViewImpl_OnWheelEventSwigExplicitViewImpl(swigCPtr, Wheel.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnWheelEvent(swigCPtr, Wheel.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnRelayout(Vector2 size, RelayoutContainer container) {
-    if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11)) NDalicPINVOKE.ViewImpl_OnRelayoutSwigExplicitViewImpl(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container)); else NDalicPINVOKE.ViewImpl_OnRelayout(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12)) NDalicPINVOKE.ViewImpl_OnSetResizePolicySwigExplicitViewImpl(swigCPtr, (int)policy, (int)dimension); else NDalicPINVOKE.ViewImpl_OnSetResizePolicy(swigCPtr, (int)policy, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new Vector3 GetNaturalSize() {
-    Vector3 ret = new Vector3((SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13) ? NDalicPINVOKE.ViewImpl_GetNaturalSizeSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_GetNaturalSize(swigCPtr)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float CalculateChildSize(Actor child, DimensionType dimension) {
-    float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float GetHeightForWidth(float width) {
-    float ret = (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15) ? NDalicPINVOKE.ViewImpl_GetHeightForWidthSwigExplicitViewImpl(swigCPtr, width) : NDalicPINVOKE.ViewImpl_GetHeightForWidth(swigCPtr, width));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float GetWidthForHeight(float height) {
-    float ret = (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16) ? NDalicPINVOKE.ViewImpl_GetWidthForHeightSwigExplicitViewImpl(swigCPtr, height) : NDalicPINVOKE.ViewImpl_GetWidthForHeight(swigCPtr, height));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool RelayoutDependentOnChildren(DimensionType dimension) {
-    bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(swigCPtr, (int)dimension) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_0(swigCPtr, (int)dimension));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool RelayoutDependentOnChildren() {
-    bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(swigCPtr) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_1(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnCalculateRelayoutSize(DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19)) NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(swigCPtr, (int)dimension); else NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSize(swigCPtr, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnLayoutNegotiated(float size, DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20)) NDalicPINVOKE.ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(swigCPtr, size, (int)dimension); else NDalicPINVOKE.ViewImpl_OnLayoutNegotiated(swigCPtr, size, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnInitialize() {
-    if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21)) NDalicPINVOKE.ViewImpl_OnInitializeSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnInitialize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnControlChildAdd(Actor child) {
-    if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnControlChildRemove(Actor child) {
-    if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change) {
-    if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24)) NDalicPINVOKE.ViewImpl_OnStyleChangeSwigExplicitViewImpl(swigCPtr, StyleManager.getCPtr(styleManager), (int)change); else NDalicPINVOKE.ViewImpl_OnStyleChange(swigCPtr, StyleManager.getCPtr(styleManager), (int)change);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual bool OnAccessibilityActivated() {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25) ? NDalicPINVOKE.ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityActivated(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityPan(PanGesture gesture) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26) ? NDalicPINVOKE.ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(gesture)) : NDalicPINVOKE.ViewImpl_OnAccessibilityPan(swigCPtr, PanGesture.getCPtr(gesture)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityTouch(SWIGTYPE_p_Dali__TouchEvent touchEvent) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27) ? NDalicPINVOKE.ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)) : NDalicPINVOKE.ViewImpl_OnAccessibilityTouch(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityValueChange(bool isIncrease) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28) ? NDalicPINVOKE.ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(swigCPtr, isIncrease) : NDalicPINVOKE.ViewImpl_OnAccessibilityValueChange(swigCPtr, isIncrease));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityZoom() {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29) ? NDalicPINVOKE.ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityZoom(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnKeyInputFocusGained() {
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnKeyInputFocusLost() {
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled) {
-    Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) {
-    if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual bool OnKeyboardEnter() {
-    bool ret = (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnPinch(PinchGesture pinch) {
-    if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35)) NDalicPINVOKE.ViewImpl_OnPinchSwigExplicitViewImpl(swigCPtr, PinchGesture.getCPtr(pinch)); else NDalicPINVOKE.ViewImpl_OnPinch(swigCPtr, PinchGesture.getCPtr(pinch));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnPan(PanGesture pan) {
-    if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36)) NDalicPINVOKE.ViewImpl_OnPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(pan)); else NDalicPINVOKE.ViewImpl_OnPan(swigCPtr, PanGesture.getCPtr(pan));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnTap(TapGesture tap) {
-    if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37)) NDalicPINVOKE.ViewImpl_OnTapSwigExplicitViewImpl(swigCPtr, TapGesture.getCPtr(tap)); else NDalicPINVOKE.ViewImpl_OnTap(swigCPtr, TapGesture.getCPtr(tap));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnLongPress(LongPressGesture longPress) {
-    if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38)) NDalicPINVOKE.ViewImpl_OnLongPressSwigExplicitViewImpl(swigCPtr, LongPressGesture.getCPtr(longPress)); else NDalicPINVOKE.ViewImpl_OnLongPress(swigCPtr, LongPressGesture.getCPtr(longPress));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) {
-    if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39)) NDalicPINVOKE.ViewImpl_SignalConnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalConnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) {
-    if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40)) NDalicPINVOKE.ViewImpl_SignalDisconnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  private void SwigDirectorConnect() {
-    if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnStageConnection);
-    if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnStageDisconnection);
-    if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateViewImpl_2(SwigDirectorOnChildAdd);
-    if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3))
-      swigDelegate3 = new SwigDelegateViewImpl_3(SwigDirectorOnChildRemove);
-    if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4))
-      swigDelegate4 = new SwigDelegateViewImpl_4(SwigDirectorOnPropertySet);
-    if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5))
-      swigDelegate5 = new SwigDelegateViewImpl_5(SwigDirectorOnSizeSet);
-    if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6))
-      swigDelegate6 = new SwigDelegateViewImpl_6(SwigDirectorOnSizeAnimation);
-    if (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7))
-      swigDelegate7 = new SwigDelegateViewImpl_7(SwigDirectorOnTouchEvent);
-    if (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8))
-      swigDelegate8 = new SwigDelegateViewImpl_8(SwigDirectorOnHoverEvent);
-    if (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9))
-      swigDelegate9 = new SwigDelegateViewImpl_9(SwigDirectorOnKeyEvent);
-    if (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10))
-      swigDelegate10 = new SwigDelegateViewImpl_10(SwigDirectorOnWheelEvent);
-    if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11))
-      swigDelegate11 = new SwigDelegateViewImpl_11(SwigDirectorOnRelayout);
-    if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12))
-      swigDelegate12 = new SwigDelegateViewImpl_12(SwigDirectorOnSetResizePolicy);
-    if (SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13))
-      swigDelegate13 = new SwigDelegateViewImpl_13(SwigDirectorGetNaturalSize);
-    if (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14))
-      swigDelegate14 = new SwigDelegateViewImpl_14(SwigDirectorCalculateChildSize);
-    if (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15))
-      swigDelegate15 = new SwigDelegateViewImpl_15(SwigDirectorGetHeightForWidth);
-    if (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16))
-      swigDelegate16 = new SwigDelegateViewImpl_16(SwigDirectorGetWidthForHeight);
-    if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17))
-      swigDelegate17 = new SwigDelegateViewImpl_17(SwigDirectorRelayoutDependentOnChildren__SWIG_0);
-    if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18))
-      swigDelegate18 = new SwigDelegateViewImpl_18(SwigDirectorRelayoutDependentOnChildren__SWIG_1);
-    if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19))
-      swigDelegate19 = new SwigDelegateViewImpl_19(SwigDirectorOnCalculateRelayoutSize);
-    if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20))
-      swigDelegate20 = new SwigDelegateViewImpl_20(SwigDirectorOnLayoutNegotiated);
-    if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21))
-      swigDelegate21 = new SwigDelegateViewImpl_21(SwigDirectorOnInitialize);
-    if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22))
-      swigDelegate22 = new SwigDelegateViewImpl_22(SwigDirectorOnControlChildAdd);
-    if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23))
-      swigDelegate23 = new SwigDelegateViewImpl_23(SwigDirectorOnControlChildRemove);
-    if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24))
-      swigDelegate24 = new SwigDelegateViewImpl_24(SwigDirectorOnStyleChange);
-    if (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25))
-      swigDelegate25 = new SwigDelegateViewImpl_25(SwigDirectorOnAccessibilityActivated);
-    if (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26))
-      swigDelegate26 = new SwigDelegateViewImpl_26(SwigDirectorOnAccessibilityPan);
-    if (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27))
-      swigDelegate27 = new SwigDelegateViewImpl_27(SwigDirectorOnAccessibilityTouch);
-    if (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28))
-      swigDelegate28 = new SwigDelegateViewImpl_28(SwigDirectorOnAccessibilityValueChange);
-    if (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29))
-      swigDelegate29 = new SwigDelegateViewImpl_29(SwigDirectorOnAccessibilityZoom);
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30))
-      swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained);
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31))
-      swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost);
-    if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32))
-      swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor);
-    if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33))
-      swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted);
-    if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34))
-      swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter);
-    if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35))
-      swigDelegate35 = new SwigDelegateViewImpl_35(SwigDirectorOnPinch);
-    if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36))
-      swigDelegate36 = new SwigDelegateViewImpl_36(SwigDirectorOnPan);
-    if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37))
-      swigDelegate37 = new SwigDelegateViewImpl_37(SwigDirectorOnTap);
-    if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38))
-      swigDelegate38 = new SwigDelegateViewImpl_38(SwigDirectorOnLongPress);
-    if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39))
-      swigDelegate39 = new SwigDelegateViewImpl_39(SwigDirectorSignalConnected);
-    if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40))
-      swigDelegate40 = new SwigDelegateViewImpl_40(SwigDirectorSignalDisconnected);
-    NDalicPINVOKE.ViewImpl_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6, swigDelegate7, swigDelegate8, swigDelegate9, swigDelegate10, swigDelegate11, swigDelegate12, swigDelegate13, swigDelegate14, swigDelegate15, swigDelegate16, swigDelegate17, swigDelegate18, swigDelegate19, swigDelegate20, swigDelegate21, swigDelegate22, swigDelegate23, swigDelegate24, swigDelegate25, swigDelegate26, swigDelegate27, swigDelegate28, swigDelegate29, swigDelegate30, swigDelegate31, swigDelegate32, swigDelegate33, swigDelegate34, swigDelegate35, swigDelegate36, swigDelegate37, swigDelegate38, swigDelegate39, swigDelegate40);
-  }\r
-\r
-#if true
         private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)\r
         {\r
             global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);\r
             bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ViewImpl));\r
             return hasDerivedMethod;\r
         }\r
-#else
-//original
-  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
-    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ViewImpl));
-    return hasDerivedMethod;
-  }
-#endif
-\r
-        private void SwigDirectorOnStageConnection(int depth) {
-    OnStageConnection(depth);
-  }
-
-  private void SwigDirectorOnStageDisconnection() {
-    OnStageDisconnection();
-  }
-
-  private void SwigDirectorOnChildAdd(global::System.IntPtr child) {
-    OnChildAdd(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnChildRemove(global::System.IntPtr child) {
-    OnChildRemove(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnPropertySet(int index, global::System.IntPtr propertyValue) {
-    OnPropertySet(index, new PropertyValue(propertyValue, true));
-  }
-
-  private void SwigDirectorOnSizeSet(global::System.IntPtr targetSize) {
-    OnSizeSet(new Vector3(targetSize, false));
-  }
-
-  private void SwigDirectorOnSizeAnimation(global::System.IntPtr animation, global::System.IntPtr targetSize) {
-    OnSizeAnimation(new Animation(animation, false), new Vector3(targetSize, false));
-  }
-
-  private bool SwigDirectorOnTouchEvent(global::System.IntPtr arg0) {
-    return OnTouchEvent(new SWIGTYPE_p_Dali__TouchEvent(arg0, false));
-  }
-
-  private bool SwigDirectorOnHoverEvent(global::System.IntPtr arg0) {
-    return OnHoverEvent(new Hover(arg0, false));
-  }
-
-  private bool SwigDirectorOnKeyEvent(global::System.IntPtr arg0) {
-    return OnKeyEvent(new Key(arg0, false));
-  }
-
-  private bool SwigDirectorOnWheelEvent(global::System.IntPtr arg0) {
-    return OnWheelEvent(new Wheel(arg0, false));
-  }
-
-  private void SwigDirectorOnRelayout(global::System.IntPtr size, global::System.IntPtr container) {
-    OnRelayout(new Vector2(size, false), new RelayoutContainer(container, false));
-  }
-
-  private void SwigDirectorOnSetResizePolicy(int policy, int dimension) {
-    OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);
-  }
-
-  private global::System.IntPtr SwigDirectorGetNaturalSize() {
-    return Vector3.getCPtr(GetNaturalSize()).Handle;
-  }
-
-  private float SwigDirectorCalculateChildSize(global::System.IntPtr child, int dimension) {
-    return CalculateChildSize(new Actor(child, false), (DimensionType)dimension);
-  }
-
-  private float SwigDirectorGetHeightForWidth(float width) {
-    return GetHeightForWidth(width);
-  }
-
-  private float SwigDirectorGetWidthForHeight(float height) {
-    return GetWidthForHeight(height);
-  }
-
-  private bool SwigDirectorRelayoutDependentOnChildren__SWIG_0(int dimension) {
-    return RelayoutDependentOnChildren((DimensionType)dimension);
-  }
-
-  private bool SwigDirectorRelayoutDependentOnChildren__SWIG_1() {
-    return RelayoutDependentOnChildren();
-  }
-
-  private void SwigDirectorOnCalculateRelayoutSize(int dimension) {
-    OnCalculateRelayoutSize((DimensionType)dimension);
-  }
-
-  private void SwigDirectorOnLayoutNegotiated(float size, int dimension) {
-    OnLayoutNegotiated(size, (DimensionType)dimension);
-  }
-
-  private void SwigDirectorOnInitialize() {
-    OnInitialize();
-  }
-
-  private void SwigDirectorOnControlChildAdd(global::System.IntPtr child) {
-    OnControlChildAdd(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnControlChildRemove(global::System.IntPtr child) {
-    OnControlChildRemove(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnStyleChange(global::System.IntPtr styleManager, int change) {
-    OnStyleChange(new StyleManager(styleManager, true), (StyleChangeType)change);
-  }
-
-  private bool SwigDirectorOnAccessibilityActivated() {
-    return OnAccessibilityActivated();
-  }
-
-  private bool SwigDirectorOnAccessibilityPan(global::System.IntPtr gesture) {
-    return OnAccessibilityPan(new PanGesture(gesture, true));
-  }
-
-  private bool SwigDirectorOnAccessibilityTouch(global::System.IntPtr touchEvent) {
-    return OnAccessibilityTouch(new SWIGTYPE_p_Dali__TouchEvent(touchEvent, false));
-  }
-
-  private bool SwigDirectorOnAccessibilityValueChange(bool isIncrease) {
-    return OnAccessibilityValueChange(isIncrease);
-  }
-
-  private bool SwigDirectorOnAccessibilityZoom() {
-    return OnAccessibilityZoom();
-  }
-
-  private void SwigDirectorOnKeyInputFocusGained() {
-    OnKeyInputFocusGained();
-  }
-
-  private void SwigDirectorOnKeyInputFocusLost() {
-    OnKeyInputFocusLost();
-  }
-
-  private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) {
-    return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle;
-  }
-
-  private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) {
-    OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, true));
-  }
-
-  private bool SwigDirectorOnKeyboardEnter() {
-    return OnKeyboardEnter();
-  }
-
-  private void SwigDirectorOnPinch(global::System.IntPtr pinch) {
-    OnPinch(new PinchGesture(pinch, false));
-  }
-
-  private void SwigDirectorOnPan(global::System.IntPtr pan) {
-    OnPan(new PanGesture(pan, false));
-  }
-
-  private void SwigDirectorOnTap(global::System.IntPtr tap) {
-    OnTap(new TapGesture(tap, false));
-  }
-
-  private void SwigDirectorOnLongPress(global::System.IntPtr longPress) {
-    OnLongPress(new LongPressGesture(longPress, false));
-  }
-
-  private void SwigDirectorSignalConnected(global::System.IntPtr slotObserver, global::System.IntPtr callback) {
-    SignalConnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-  }
-
-  private void SwigDirectorSignalDisconnected(global::System.IntPtr slotObserver, global::System.IntPtr callback) {
-    SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-  }
-
-  public delegate void SwigDelegateViewImpl_0(int depth);
-  public delegate void SwigDelegateViewImpl_1();
-  public delegate void SwigDelegateViewImpl_2(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_3(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_4(int index, global::System.IntPtr propertyValue);
-  public delegate void SwigDelegateViewImpl_5(global::System.IntPtr targetSize);
-  public delegate void SwigDelegateViewImpl_6(global::System.IntPtr animation, global::System.IntPtr targetSize);
-  public delegate bool SwigDelegateViewImpl_7(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_8(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_9(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_10(global::System.IntPtr arg0);
-  public delegate void SwigDelegateViewImpl_11(global::System.IntPtr size, global::System.IntPtr container);
-  public delegate void SwigDelegateViewImpl_12(int policy, int dimension);
-  public delegate global::System.IntPtr SwigDelegateViewImpl_13();
-  public delegate float SwigDelegateViewImpl_14(global::System.IntPtr child, int dimension);
-  public delegate float SwigDelegateViewImpl_15(float width);
-  public delegate float SwigDelegateViewImpl_16(float height);
-  public delegate bool SwigDelegateViewImpl_17(int dimension);
-  public delegate bool SwigDelegateViewImpl_18();
-  public delegate void SwigDelegateViewImpl_19(int dimension);
-  public delegate void SwigDelegateViewImpl_20(float size, int dimension);
-  public delegate void SwigDelegateViewImpl_21();
-  public delegate void SwigDelegateViewImpl_22(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_23(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_24(global::System.IntPtr styleManager, int change);
-  public delegate bool SwigDelegateViewImpl_25();
-  public delegate bool SwigDelegateViewImpl_26(global::System.IntPtr gesture);
-  public delegate bool SwigDelegateViewImpl_27(global::System.IntPtr touchEvent);
-  public delegate bool SwigDelegateViewImpl_28(bool isIncrease);
-  public delegate bool SwigDelegateViewImpl_29();
-  public delegate void SwigDelegateViewImpl_30();
-  public delegate void SwigDelegateViewImpl_31();
-  public delegate global::System.IntPtr SwigDelegateViewImpl_32(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled);
-  public delegate void SwigDelegateViewImpl_33(global::System.IntPtr commitedFocusableActor);
-  public delegate bool SwigDelegateViewImpl_34();
-  public delegate void SwigDelegateViewImpl_35(global::System.IntPtr pinch);
-  public delegate void SwigDelegateViewImpl_36(global::System.IntPtr pan);
-  public delegate void SwigDelegateViewImpl_37(global::System.IntPtr tap);
-  public delegate void SwigDelegateViewImpl_38(global::System.IntPtr longPress);
-  public delegate void SwigDelegateViewImpl_39(global::System.IntPtr slotObserver, global::System.IntPtr callback);
-  public delegate void SwigDelegateViewImpl_40(global::System.IntPtr slotObserver, global::System.IntPtr callback);
-
-  private SwigDelegateViewImpl_0 swigDelegate0;
-  private SwigDelegateViewImpl_1 swigDelegate1;
-  private SwigDelegateViewImpl_2 swigDelegate2;
-  private SwigDelegateViewImpl_3 swigDelegate3;
-  private SwigDelegateViewImpl_4 swigDelegate4;
-  private SwigDelegateViewImpl_5 swigDelegate5;
-  private SwigDelegateViewImpl_6 swigDelegate6;
-  private SwigDelegateViewImpl_7 swigDelegate7;
-  private SwigDelegateViewImpl_8 swigDelegate8;
-  private SwigDelegateViewImpl_9 swigDelegate9;
-  private SwigDelegateViewImpl_10 swigDelegate10;
-  private SwigDelegateViewImpl_11 swigDelegate11;
-  private SwigDelegateViewImpl_12 swigDelegate12;
-  private SwigDelegateViewImpl_13 swigDelegate13;
-  private SwigDelegateViewImpl_14 swigDelegate14;
-  private SwigDelegateViewImpl_15 swigDelegate15;
-  private SwigDelegateViewImpl_16 swigDelegate16;
-  private SwigDelegateViewImpl_17 swigDelegate17;
-  private SwigDelegateViewImpl_18 swigDelegate18;
-  private SwigDelegateViewImpl_19 swigDelegate19;
-  private SwigDelegateViewImpl_20 swigDelegate20;
-  private SwigDelegateViewImpl_21 swigDelegate21;
-  private SwigDelegateViewImpl_22 swigDelegate22;
-  private SwigDelegateViewImpl_23 swigDelegate23;
-  private SwigDelegateViewImpl_24 swigDelegate24;
-  private SwigDelegateViewImpl_25 swigDelegate25;
-  private SwigDelegateViewImpl_26 swigDelegate26;
-  private SwigDelegateViewImpl_27 swigDelegate27;
-  private SwigDelegateViewImpl_28 swigDelegate28;
-  private SwigDelegateViewImpl_29 swigDelegate29;
-  private SwigDelegateViewImpl_30 swigDelegate30;
-  private SwigDelegateViewImpl_31 swigDelegate31;
-  private SwigDelegateViewImpl_32 swigDelegate32;
-  private SwigDelegateViewImpl_33 swigDelegate33;
-  private SwigDelegateViewImpl_34 swigDelegate34;
-  private SwigDelegateViewImpl_35 swigDelegate35;
-  private SwigDelegateViewImpl_36 swigDelegate36;
-  private SwigDelegateViewImpl_37 swigDelegate37;
-  private SwigDelegateViewImpl_38 swigDelegate38;
-  private SwigDelegateViewImpl_39 swigDelegate39;
-  private SwigDelegateViewImpl_40 swigDelegate40;
-
-  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(int) };
-  private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes4 = new global::System.Type[] { typeof(int), typeof(PropertyValue) };
-  private static global::System.Type[] swigMethodTypes5 = new global::System.Type[] { typeof(Vector3) };
-  private static global::System.Type[] swigMethodTypes6 = new global::System.Type[] { typeof(Animation), typeof(Vector3) };
-  private static global::System.Type[] swigMethodTypes7 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
-  private static global::System.Type[] swigMethodTypes8 = new global::System.Type[] { typeof(Hover) };
-  private static global::System.Type[] swigMethodTypes9 = new global::System.Type[] { typeof(Key) };
-  private static global::System.Type[] swigMethodTypes10 = new global::System.Type[] { typeof(Wheel) };
-  private static global::System.Type[] swigMethodTypes11 = new global::System.Type[] { typeof(Vector2), typeof(RelayoutContainer) };
-  private static global::System.Type[] swigMethodTypes12 = new global::System.Type[] { typeof(ResizePolicyType), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes13 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(Actor), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes15 = new global::System.Type[] { typeof(float) };
-  private static global::System.Type[] swigMethodTypes16 = new global::System.Type[] { typeof(float) };
-  private static global::System.Type[] swigMethodTypes17 = new global::System.Type[] { typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes18 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes19 = new global::System.Type[] { typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes20 = new global::System.Type[] { typeof(float), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes21 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes24 = new global::System.Type[] { typeof(StyleManager), typeof(StyleChangeType) };
-  private static global::System.Type[] swigMethodTypes25 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes26 = new global::System.Type[] { typeof(PanGesture) };
-  private static global::System.Type[] swigMethodTypes27 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
-  private static global::System.Type[] swigMethodTypes28 = new global::System.Type[] { typeof(bool) };
-  private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(Actor), typeof(View.FocusDirection), typeof(bool) };
-  private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) };
-  private static global::System.Type[] swigMethodTypes36 = new global::System.Type[] { typeof(PanGesture) };
-  private static global::System.Type[] swigMethodTypes37 = new global::System.Type[] { typeof(TapGesture) };
-  private static global::System.Type[] swigMethodTypes38 = new global::System.Type[] { typeof(LongPressGesture) };
-  private static global::System.Type[] swigMethodTypes39 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
-  private static global::System.Type[] swigMethodTypes40 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
-}
+\r
+        private void SwigDirectorOnStageConnection(int depth)\r
+        {\r
+            OnStageConnection(depth);\r
+        }\r
+\r
+        private void SwigDirectorOnStageDisconnection()\r
+        {\r
+            OnStageDisconnection();\r
+        }\r
+\r
+        private void SwigDirectorOnChildAdd(global::System.IntPtr child)\r
+        {\r
+            OnChildAdd(new Actor(child, false));\r
+        }\r
+\r
+        private void SwigDirectorOnChildRemove(global::System.IntPtr child)\r
+        {\r
+            OnChildRemove(new Actor(child, false));\r
+        }\r
+\r
+        private void SwigDirectorOnPropertySet(int index, global::System.IntPtr propertyValue)\r
+        {\r
+            OnPropertySet(index, new PropertyValue(propertyValue, true));\r
+        }\r
+\r
+        private void SwigDirectorOnSizeSet(global::System.IntPtr targetSize)\r
+        {\r
+            OnSizeSet(new Vector3(targetSize, false));\r
+        }\r
+\r
+        private void SwigDirectorOnSizeAnimation(global::System.IntPtr animation, global::System.IntPtr targetSize)\r
+        {\r
+            OnSizeAnimation(new Animation(animation, false), new Vector3(targetSize, false));\r
+        }\r
+\r
+        private bool SwigDirectorOnTouchEvent(global::System.IntPtr arg0)\r
+        {\r
+            return OnTouchEvent(new SWIGTYPE_p_Dali__TouchEvent(arg0, false));\r
+        }\r
+\r
+        private bool SwigDirectorOnHoverEvent(global::System.IntPtr arg0)\r
+        {\r
+            return OnHoverEvent(new Hover(arg0, false));\r
+        }\r
+\r
+        private bool SwigDirectorOnKeyEvent(global::System.IntPtr arg0)\r
+        {\r
+            return OnKeyEvent(new Key(arg0, false));\r
+        }\r
+\r
+        private bool SwigDirectorOnWheelEvent(global::System.IntPtr arg0)\r
+        {\r
+            return OnWheelEvent(new Wheel(arg0, false));\r
+        }\r
+\r
+        private void SwigDirectorOnRelayout(global::System.IntPtr size, global::System.IntPtr container)\r
+        {\r
+            OnRelayout(new Vector2(size, false), new RelayoutContainer(container, false));\r
+        }\r
+\r
+        private void SwigDirectorOnSetResizePolicy(int policy, int dimension)\r
+        {\r
+            OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);\r
+        }\r
+\r
+        private global::System.IntPtr SwigDirectorGetNaturalSize()\r
+        {\r
+            return Vector3.getCPtr(GetNaturalSize()).Handle;\r
+        }\r
+\r
+        private float SwigDirectorCalculateChildSize(global::System.IntPtr child, int dimension)\r
+        {\r
+            return CalculateChildSize(new Actor(child, false), (DimensionType)dimension);\r
+        }\r
+\r
+        private float SwigDirectorGetHeightForWidth(float width)\r
+        {\r
+            return GetHeightForWidth(width);\r
+        }\r
+\r
+        private float SwigDirectorGetWidthForHeight(float height)\r
+        {\r
+            return GetWidthForHeight(height);\r
+        }\r
+\r
+        private bool SwigDirectorRelayoutDependentOnChildren__SWIG_0(int dimension)\r
+        {\r
+            return RelayoutDependentOnChildren((DimensionType)dimension);\r
+        }\r
+\r
+        private bool SwigDirectorRelayoutDependentOnChildren__SWIG_1()\r
+        {\r
+            return RelayoutDependentOnChildren();\r
+        }\r
+\r
+        private void SwigDirectorOnCalculateRelayoutSize(int dimension)\r
+        {\r
+            OnCalculateRelayoutSize((DimensionType)dimension);\r
+        }\r
+\r
+        private void SwigDirectorOnLayoutNegotiated(float size, int dimension)\r
+        {\r
+            OnLayoutNegotiated(size, (DimensionType)dimension);\r
+        }\r
+\r
+        private void SwigDirectorOnInitialize()\r
+        {\r
+            OnInitialize();\r
+        }\r
+\r
+        private void SwigDirectorOnControlChildAdd(global::System.IntPtr child)\r
+        {\r
+            OnControlChildAdd(new Actor(child, false));\r
+        }\r
+\r
+        private void SwigDirectorOnControlChildRemove(global::System.IntPtr child)\r
+        {\r
+            OnControlChildRemove(new Actor(child, false));\r
+        }\r
+\r
+        private void SwigDirectorOnStyleChange(global::System.IntPtr styleManager, int change)\r
+        {\r
+            OnStyleChange(new StyleManager(styleManager, true), (StyleChangeType)change);\r
+        }\r
+\r
+        private bool SwigDirectorOnAccessibilityActivated()\r
+        {\r
+            return OnAccessibilityActivated();\r
+        }\r
+\r
+        private bool SwigDirectorOnAccessibilityPan(global::System.IntPtr gesture)\r
+        {\r
+            return OnAccessibilityPan(new PanGesture(gesture, true));\r
+        }\r
+\r
+        private bool SwigDirectorOnAccessibilityTouch(global::System.IntPtr touchEvent)\r
+        {\r
+            return OnAccessibilityTouch(new SWIGTYPE_p_Dali__TouchEvent(touchEvent, false));\r
+        }\r
+\r
+        private bool SwigDirectorOnAccessibilityValueChange(bool isIncrease)\r
+        {\r
+            return OnAccessibilityValueChange(isIncrease);\r
+        }\r
+\r
+        private bool SwigDirectorOnAccessibilityZoom()\r
+        {\r
+            return OnAccessibilityZoom();\r
+        }\r
+\r
+        private void SwigDirectorOnKeyInputFocusGained()\r
+        {\r
+            OnKeyInputFocusGained();\r
+        }\r
+\r
+        private void SwigDirectorOnKeyInputFocusLost()\r
+        {\r
+            OnKeyInputFocusLost();\r
+        }\r
+\r
+        private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)\r
+        {\r
+            return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle;\r
+        }\r
+\r
+        private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor)\r
+        {\r
+            OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, true));\r
+        }\r
+\r
+        private bool SwigDirectorOnKeyboardEnter()\r
+        {\r
+            return OnKeyboardEnter();\r
+        }\r
+\r
+        private void SwigDirectorOnPinch(global::System.IntPtr pinch)\r
+        {\r
+            OnPinch(new PinchGesture(pinch, false));\r
+        }\r
+\r
+        private void SwigDirectorOnPan(global::System.IntPtr pan)\r
+        {\r
+            OnPan(new PanGesture(pan, false));\r
+        }\r
+\r
+        private void SwigDirectorOnTap(global::System.IntPtr tap)\r
+        {\r
+            OnTap(new TapGesture(tap, false));\r
+        }\r
+\r
+        private void SwigDirectorOnLongPress(global::System.IntPtr longPress)\r
+        {\r
+            OnLongPress(new LongPressGesture(longPress, false));\r
+        }\r
+\r
+        private void SwigDirectorSignalConnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)\r
+        {\r
+            SignalConnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));\r
+        }\r
+\r
+        private void SwigDirectorSignalDisconnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)\r
+        {\r
+            SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));\r
+        }\r
+\r
+        public delegate void SwigDelegateViewImpl_0(int depth);\r
+        public delegate void SwigDelegateViewImpl_1();\r
+        public delegate void SwigDelegateViewImpl_2(global::System.IntPtr child);\r
+        public delegate void SwigDelegateViewImpl_3(global::System.IntPtr child);\r
+        public delegate void SwigDelegateViewImpl_4(int index, global::System.IntPtr propertyValue);\r
+        public delegate void SwigDelegateViewImpl_5(global::System.IntPtr targetSize);\r
+        public delegate void SwigDelegateViewImpl_6(global::System.IntPtr animation, global::System.IntPtr targetSize);\r
+        public delegate bool SwigDelegateViewImpl_7(global::System.IntPtr arg0);\r
+        public delegate bool SwigDelegateViewImpl_8(global::System.IntPtr arg0);\r
+        public delegate bool SwigDelegateViewImpl_9(global::System.IntPtr arg0);\r
+        public delegate bool SwigDelegateViewImpl_10(global::System.IntPtr arg0);\r
+        public delegate void SwigDelegateViewImpl_11(global::System.IntPtr size, global::System.IntPtr container);\r
+        public delegate void SwigDelegateViewImpl_12(int policy, int dimension);\r
+        public delegate global::System.IntPtr SwigDelegateViewImpl_13();\r
+        public delegate float SwigDelegateViewImpl_14(global::System.IntPtr child, int dimension);\r
+        public delegate float SwigDelegateViewImpl_15(float width);\r
+        public delegate float SwigDelegateViewImpl_16(float height);\r
+        public delegate bool SwigDelegateViewImpl_17(int dimension);\r
+        public delegate bool SwigDelegateViewImpl_18();\r
+        public delegate void SwigDelegateViewImpl_19(int dimension);\r
+        public delegate void SwigDelegateViewImpl_20(float size, int dimension);\r
+        public delegate void SwigDelegateViewImpl_21();\r
+        public delegate void SwigDelegateViewImpl_22(global::System.IntPtr child);\r
+        public delegate void SwigDelegateViewImpl_23(global::System.IntPtr child);\r
+        public delegate void SwigDelegateViewImpl_24(global::System.IntPtr styleManager, int change);\r
+        public delegate bool SwigDelegateViewImpl_25();\r
+        public delegate bool SwigDelegateViewImpl_26(global::System.IntPtr gesture);\r
+        public delegate bool SwigDelegateViewImpl_27(global::System.IntPtr touchEvent);\r
+        public delegate bool SwigDelegateViewImpl_28(bool isIncrease);\r
+        public delegate bool SwigDelegateViewImpl_29();\r
+        public delegate void SwigDelegateViewImpl_30();\r
+        public delegate void SwigDelegateViewImpl_31();\r
+        public delegate global::System.IntPtr SwigDelegateViewImpl_32(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled);\r
+        public delegate void SwigDelegateViewImpl_33(global::System.IntPtr commitedFocusableActor);\r
+        public delegate bool SwigDelegateViewImpl_34();\r
+        public delegate void SwigDelegateViewImpl_35(global::System.IntPtr pinch);\r
+        public delegate void SwigDelegateViewImpl_36(global::System.IntPtr pan);\r
+        public delegate void SwigDelegateViewImpl_37(global::System.IntPtr tap);\r
+        public delegate void SwigDelegateViewImpl_38(global::System.IntPtr longPress);\r
+        public delegate void SwigDelegateViewImpl_39(global::System.IntPtr slotObserver, global::System.IntPtr callback);\r
+        public delegate void SwigDelegateViewImpl_40(global::System.IntPtr slotObserver, global::System.IntPtr callback);\r
+\r
+        private SwigDelegateViewImpl_0 swigDelegate0;\r
+        private SwigDelegateViewImpl_1 swigDelegate1;\r
+        private SwigDelegateViewImpl_2 swigDelegate2;\r
+        private SwigDelegateViewImpl_3 swigDelegate3;\r
+        private SwigDelegateViewImpl_4 swigDelegate4;\r
+        private SwigDelegateViewImpl_5 swigDelegate5;\r
+        private SwigDelegateViewImpl_6 swigDelegate6;\r
+        private SwigDelegateViewImpl_7 swigDelegate7;\r
+        private SwigDelegateViewImpl_8 swigDelegate8;\r
+        private SwigDelegateViewImpl_9 swigDelegate9;\r
+        private SwigDelegateViewImpl_10 swigDelegate10;\r
+        private SwigDelegateViewImpl_11 swigDelegate11;\r
+        private SwigDelegateViewImpl_12 swigDelegate12;\r
+        private SwigDelegateViewImpl_13 swigDelegate13;\r
+        private SwigDelegateViewImpl_14 swigDelegate14;\r
+        private SwigDelegateViewImpl_15 swigDelegate15;\r
+        private SwigDelegateViewImpl_16 swigDelegate16;\r
+        private SwigDelegateViewImpl_17 swigDelegate17;\r
+        private SwigDelegateViewImpl_18 swigDelegate18;\r
+        private SwigDelegateViewImpl_19 swigDelegate19;\r
+        private SwigDelegateViewImpl_20 swigDelegate20;\r
+        private SwigDelegateViewImpl_21 swigDelegate21;\r
+        private SwigDelegateViewImpl_22 swigDelegate22;\r
+        private SwigDelegateViewImpl_23 swigDelegate23;\r
+        private SwigDelegateViewImpl_24 swigDelegate24;\r
+        private SwigDelegateViewImpl_25 swigDelegate25;\r
+        private SwigDelegateViewImpl_26 swigDelegate26;\r
+        private SwigDelegateViewImpl_27 swigDelegate27;\r
+        private SwigDelegateViewImpl_28 swigDelegate28;\r
+        private SwigDelegateViewImpl_29 swigDelegate29;\r
+        private SwigDelegateViewImpl_30 swigDelegate30;\r
+        private SwigDelegateViewImpl_31 swigDelegate31;\r
+        private SwigDelegateViewImpl_32 swigDelegate32;\r
+        private SwigDelegateViewImpl_33 swigDelegate33;\r
+        private SwigDelegateViewImpl_34 swigDelegate34;\r
+        private SwigDelegateViewImpl_35 swigDelegate35;\r
+        private SwigDelegateViewImpl_36 swigDelegate36;\r
+        private SwigDelegateViewImpl_37 swigDelegate37;\r
+        private SwigDelegateViewImpl_38 swigDelegate38;\r
+        private SwigDelegateViewImpl_39 swigDelegate39;\r
+        private SwigDelegateViewImpl_40 swigDelegate40;\r
+\r
+        private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(int) };\r
+        private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(Actor) };\r
+        private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(Actor) };\r
+        private static global::System.Type[] swigMethodTypes4 = new global::System.Type[] { typeof(int), typeof(PropertyValue) };\r
+        private static global::System.Type[] swigMethodTypes5 = new global::System.Type[] { typeof(Vector3) };\r
+        private static global::System.Type[] swigMethodTypes6 = new global::System.Type[] { typeof(Animation), typeof(Vector3) };\r
+        private static global::System.Type[] swigMethodTypes7 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };\r
+        private static global::System.Type[] swigMethodTypes8 = new global::System.Type[] { typeof(Hover) };\r
+        private static global::System.Type[] swigMethodTypes9 = new global::System.Type[] { typeof(Key) };\r
+        private static global::System.Type[] swigMethodTypes10 = new global::System.Type[] { typeof(Wheel) };\r
+        private static global::System.Type[] swigMethodTypes11 = new global::System.Type[] { typeof(Vector2), typeof(RelayoutContainer) };\r
+        private static global::System.Type[] swigMethodTypes12 = new global::System.Type[] { typeof(ResizePolicyType), typeof(DimensionType) };\r
+        private static global::System.Type[] swigMethodTypes13 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(Actor), typeof(DimensionType) };\r
+        private static global::System.Type[] swigMethodTypes15 = new global::System.Type[] { typeof(float) };\r
+        private static global::System.Type[] swigMethodTypes16 = new global::System.Type[] { typeof(float) };\r
+        private static global::System.Type[] swigMethodTypes17 = new global::System.Type[] { typeof(DimensionType) };\r
+        private static global::System.Type[] swigMethodTypes18 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes19 = new global::System.Type[] { typeof(DimensionType) };\r
+        private static global::System.Type[] swigMethodTypes20 = new global::System.Type[] { typeof(float), typeof(DimensionType) };\r
+        private static global::System.Type[] swigMethodTypes21 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(Actor) };\r
+        private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(Actor) };\r
+        private static global::System.Type[] swigMethodTypes24 = new global::System.Type[] { typeof(StyleManager), typeof(StyleChangeType) };\r
+        private static global::System.Type[] swigMethodTypes25 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes26 = new global::System.Type[] { typeof(PanGesture) };\r
+        private static global::System.Type[] swigMethodTypes27 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };\r
+        private static global::System.Type[] swigMethodTypes28 = new global::System.Type[] { typeof(bool) };\r
+        private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(Actor), typeof(View.FocusDirection), typeof(bool) };\r
+        private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(Actor) };\r
+        private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] { };\r
+        private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) };\r
+        private static global::System.Type[] swigMethodTypes36 = new global::System.Type[] { typeof(PanGesture) };\r
+        private static global::System.Type[] swigMethodTypes37 = new global::System.Type[] { typeof(TapGesture) };\r
+        private static global::System.Type[] swigMethodTypes38 = new global::System.Type[] { typeof(LongPressGesture) };\r
+        private static global::System.Type[] swigMethodTypes39 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };\r
+        private static global::System.Type[] swigMethodTypes40 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };\r
+    }
 
 }

diff --git a/Tizen.NUI/src/internal/ViewMode.cs b/Tizen.NUI/src/internal/ViewMode.cs
index 68a6b94..59b59c5 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewMode.cs
+++ b/Tizen.NUI/src/internal/ViewMode.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum ViewMode {
+namespace Tizen.NUI {\r
+\r
+    internal enum ViewMode {
   MONO,
   STEREO_HORIZONTAL,
   STEREO_VERTICAL,

diff --git a/Tizen.NUI/src/internal/ViewRegistry.cs b/Tizen.NUI/src/internal/ViewRegistry.cs
index 99987af..41872b4 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewRegistry.cs
+++ b/Tizen.NUI/src/internal/ViewRegistry.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
-
-#if true
-using System.Reflection;
-#endif
+using System.Reflection;\r
+\r
 
 namespace Tizen.NUI
 {\r
@@ -102,7 +100,7 @@ namespace Tizen.NUI
     ///
     ///  static Spin()
     ///  {
-    ///     ViewRegistry.Instance.RegisterControl("Spin", CreateInstance, typeof(Spin) );
+    ///     ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
     ///  }
     ///
     ///  The control should also provide a CreateInstance function, which gets passed to the ViewRegistry
@@ -297,32 +295,28 @@ namespace Tizen.NUI
         /// {
         ///   ViewRegistry registers control type with DALi type registery
         ///   also uses introspection to find any properties that need to be registered with type registry
-        ///   ViewRegistry.Instance.Register("Spin", CreateInstance, typeof(Spin) );
+        ///   ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
         /// }
         ///
         /// </summary>
-        public void Register(string viewName, Func<CustomView> createFunction, System.Type viewType)\r
+        public void Register(Func<CustomView> createFunction, System.Type viewType)\r
         {\r
             // add the mapping between the view name and it's create function\r
-            _constructorMap.Add(viewName, createFunction);\r
+            _constructorMap.Add(viewType.Name, createFunction);\r
 \r
             // Call into DALi C++ to register the control with the type registry\r
-            TypeRegistration.RegisterControl(viewName, _createCallback);\r
+            TypeRegistration.RegisterControl(viewType.Name, _createCallback);\r
 \r
             // Cycle through each property in the class\r
             foreach (System.Reflection.PropertyInfo propertyInfo in viewType.GetProperties())\r
             {\r
 \r
                 if (propertyInfo.CanRead)\r
-                {\r
-\r
-#if true\r
+                {
+
                     IEnumerable<Attribute> ie_attrs = propertyInfo.GetCustomAttributes<Attribute>();\r
                     List<Attribute> li_attrs = new List<Attribute>(ie_attrs);\r
                     System.Attribute[] attrs = li_attrs.ToArray();\r
-#else\r
-          System.Attribute[] attrs = System.Attribute.GetCustomAttributes(propertyInfo);\r
-#endif\r
 \r
                     foreach (System.Attribute attr in attrs)\r
                     {\r
@@ -335,19 +329,16 @@ namespace Tizen.NUI
                             ScriptableProperty scriptableProp = attr as ScriptableProperty;\r
 \r
                             // we get the start property index, based on the type and it's heirachy, e.g. DateView (70,000)-> Spin (60,000) -> View (50,000)\r
-                            int propertyIndex = _propertyRangeManager.GetPropertyIndex(viewName, viewType, scriptableProp.type);\r
+                            int propertyIndex = _propertyRangeManager.GetPropertyIndex(viewType.Name, viewType, scriptableProp.type);\r
 \r
                             // get the enum for the property type... E.g. registering a string property returns Tizen.NUI.PropertyType.String\r
                             Tizen.NUI.PropertyType propertyType = GetDaliPropertyType(propertyInfo.PropertyType.Name);\r
 \r
                             // Example   RegisterProperty("spin","maxValue", 50001, FLOAT, set, get );\r
                             // Native call to register the property\r
-                            TypeRegistration.RegisterProperty(viewName, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);\r
+                            TypeRegistration.RegisterProperty(viewType.Name, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);\r
                         }\r
                     }\r
-\r
-\r
-\r
                     // Console.WriteLine ("property name = " + propertyInfo.Name);\r
                 }\r
             }\r

diff --git a/Tizen.NUI/src/internal/ViewWrapper.cs b/Tizen.NUI/src/internal/ViewWrapper.cs
index 9f9c8dc..ac80b47 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewWrapper.cs
+++ b/Tizen.NUI/src/internal/ViewWrapper.cs
@@ -55,7 +55,7 @@ namespace Tizen.NUI
             }
         }
 
-        public ViewWrapper (ViewWrapperImpl implementation) : this (NDalicManualPINVOKE.ViewWrapper_New(ViewWrapperImpl.getCPtr(implementation)), true)
+        public ViewWrapper (string typeName, ViewWrapperImpl implementation) : this (NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true)
         {
             viewWrapperImpl = implementation;
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/Tizen.NUI/src/internal/ViewWrapperImpl.cs
index 9ded463..811c0af 100755 (executable)
--- a/Tizen.NUI/src/internal/ViewWrapperImpl.cs
+++ b/Tizen.NUI/src/internal/ViewWrapperImpl.cs
@@ -58,8 +58,8 @@ namespace Tizen.NUI
         public delegate void OnPanDelegate(PanGesture pan);
         public delegate void OnTapDelegate(TapGesture tap);
         public delegate void OnLongPressDelegate(LongPressGesture longPress);
-        public delegate void SignalConnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
-        public delegate void SignalDisconnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
+        internal delegate void SignalConnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
+        internal delegate void SignalDisconnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
 
         public OnStageConnectionDelegate OnStageConnection;
         public OnStageDisconnectionDelegate OnStageDisconnection;
@@ -99,8 +99,8 @@ namespace Tizen.NUI
         public OnPanDelegate OnPan;
         public OnTapDelegate OnTap;
         public OnLongPressDelegate OnLongPress;
-        public SignalConnectedDelegate SignalConnected;
-        public SignalDisconnectedDelegate SignalDisconnected;
+        internal SignalConnectedDelegate SignalConnected;
+        internal SignalDisconnectedDelegate SignalDisconnected;
 
         internal ViewWrapperImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapperImpl_SWIGUpcast(cPtr), cMemoryOwn)
         {
@@ -141,9 +141,9 @@ namespace Tizen.NUI
             DirectorConnect();
         }
 
-        public static ViewWrapper New(ViewWrapperImpl viewWrapper)
+        public static ViewWrapper New(string typeName, ViewWrapperImpl viewWrapper)
         {
-            ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapperImpl_New(ViewWrapperImpl.getCPtr(viewWrapper)), true);
+            ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapperImpl_New(typeName, ViewWrapperImpl.getCPtr(viewWrapper)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }

diff --git a/Tizen.NUI/src/internal/VisualTransformPropertyType.cs b/Tizen.NUI/src/internal/VisualTransformPropertyType.cs
index 816a8e5..ff2a921 100755 (executable)
--- a/Tizen.NUI/src/internal/VisualTransformPropertyType.cs
+++ b/Tizen.NUI/src/internal/VisualTransformPropertyType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum VisualTransformPropertyType {
+namespace Tizen.NUI {\r
+\r
+    internal enum VisualTransformPropertyType {
   OFFSET,
   SIZE,
   ORIGIN,

diff --git a/Tizen.NUI/src/internal/VisualType.cs b/Tizen.NUI/src/internal/VisualType.cs
index 147003d..0013819 100755 (executable)
--- a/Tizen.NUI/src/internal/VisualType.cs
+++ b/Tizen.NUI/src/internal/VisualType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum VisualType {
+namespace Tizen.NUI {\r
+\r
+    internal enum VisualType {
   BORDER,
   COLOR,
   GRADIENT,

diff --git a/Tizen.NUI/src/internal/VoidSignal.cs b/Tizen.NUI/src/internal/VoidSignal.cs
index 15d1e06..0847468 100755 (executable)
--- a/Tizen.NUI/src/internal/VoidSignal.cs
+++ b/Tizen.NUI/src/internal/VoidSignal.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VoidSignal : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class VoidSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -24,10 +24,15 @@ public class VoidSignal : global::System.IDisposable {
   }
 
   ~VoidSignal() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
@@ -40,6 +45,7 @@ public class VoidSignal : global::System.IDisposable {
     }
   }
 
+
   public VoidSignal() : this(NDalicPINVOKE.new_VoidSignal(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }

diff --git a/Tizen.NUI/src/internal/WrapModeType.cs b/Tizen.NUI/src/internal/WrapModeType.cs
index 3e57514..1bad554 100755 (executable)
--- a/Tizen.NUI/src/internal/WrapModeType.cs
+++ b/Tizen.NUI/src/internal/WrapModeType.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum WrapModeType {
+namespace Tizen.NUI {\r
+\r
+    internal enum WrapModeType {
   DEFAULT = 0,
   CLAMP_TO_EDGE,
   REPEAT,

diff --git a/Tizen.NUI/src/internal/doublep.cs b/Tizen.NUI/src/internal/doublep.cs
index 0faeaad..bbdd388 100755 (executable)
--- a/Tizen.NUI/src/internal/doublep.cs
+++ b/Tizen.NUI/src/internal/doublep.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class doublep : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class doublep : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/floatp.cs b/Tizen.NUI/src/internal/floatp.cs
index 5f18c5e..f73f909 100755 (executable)
--- a/Tizen.NUI/src/internal/floatp.cs
+++ b/Tizen.NUI/src/internal/floatp.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class floatp : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class floatp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/intp.cs b/Tizen.NUI/src/internal/intp.cs
index aed5e07..e9c9228 100755 (executable)
--- a/Tizen.NUI/src/internal/intp.cs
+++ b/Tizen.NUI/src/internal/intp.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class intp : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class intp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/spin.cs b/Tizen.NUI/src/internal/spin.cs
deleted file mode 100755 (executable)
index da91b3b..0000000
--- a/Tizen.NUI/src/internal/spin.cs
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-using System;
-using System.Runtime.InteropServices;
-using Tizen.NUI;
-
-// A spin control (for continously changing values when users can easily predict a set of values)
-
-namespace Tizen.NUI
-{\r
-    public class Spin : CustomView\r
-    {\r
-        private VisualBase _arrowVisual;\r
-        private TextField _textField;\r
-        private int _arrowVisualPropertyIndex;\r
-        private string _arrowImage;\r
-        private int _currentValue;\r
-        private int _minValue;\r
-        private int _maxValue;\r
-        private int _singleStep;\r
-        private bool _wrappingEnabled;\r
-        private string _fontFamily;\r
-        private string _fontStyle;\r
-        private int _pointSize;\r
-        private Color _textColor;\r
-        private Color _textBackgroundColor;\r
-        private int _maxTextLength;\r
-\r
-        // Called by DALi Builder if it finds a Spin control in a JSON file\r
-        static CustomView CreateInstance()\r
-        {\r
-            return new Spin();\r
-        }\r
-\r
-        // static constructor registers the control type (only runs once)\r
-        static Spin()\r
-        {\r
-            // ViewRegistry registers control type with DALi type registery\r
-            // also uses introspection to find any properties that need to be registered with type registry\r
-            ViewRegistry.Instance.Register("Spin", CreateInstance, typeof(Spin));\r
-        }\r
-        public Spin() : base(ViewBehaviour.RequiresKeyboardNavigationSupport | ViewBehaviour.DisableStyleChangeSignals)\r
-        {\r
-\r
-        }\r
-\r
-        public override void OnInitialize()\r
-        {\r
-            // Initialize the propertiesControl\r
-            _arrowImage = "/home/owner/apps_rw/NUISamples.TizenTV/res/images/arrow.png";\r
-            _textBackgroundColor = new Color(0.6f, 0.6f, 0.6f, 1.0f);\r
-            _currentValue = 0;\r
-            _minValue = 0;\r
-            _maxValue = 0;\r
-            _singleStep = 1;\r
-            _maxTextLength = 0;\r
-\r
-            // Create image visual for the arrow keys\r
-            _arrowVisualPropertyIndex = RegisterProperty("ArrowImage", new Tizen.NUI.PropertyValue(_arrowImage), Tizen.NUI.PropertyAccessMode.ReadWrite);\r
-            _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150));\r
-            RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual);\r
-\r
-            // Create a text field\r
-            _textField = new TextField();\r
-            _textField.ParentOrigin = Tizen.NUI.ParentOrigin.Center;\r
-            _textField.AnchorPoint = Tizen.NUI.AnchorPoint.Center;\r
-            _textField.WidthResizePolicy = ResizePolicyType.SizeRelativeToParent;\r
-            _textField.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent;\r
-            _textField.SizeModeFactor = new Vector3(1.0f, 0.45f, 1.0f);\r
-            _textField.PlaceholderText = "----";\r
-            _textField.BackgroundColor = _textBackgroundColor;\r
-            _textField.HorizontalAlignment = "Center";\r
-            _textField.VerticalAlignment = "Center";\r
-            _textField.SetKeyboardFocusable(true);\r
-            _textField.Name = "_textField";\r
-\r
-            this.Add(_textField);\r
-\r
-            _textField.FocusGained += TextFieldKeyInputFocusGained;\r
-            _textField.FocusLost += TextFieldKeyInputFocusLost;\r
-        }\r
-\r
-        public override Size GetNaturalSize()\r
-        {\r
-            return new Size(150.0f, 150.0f, 0.0f);\r
-        }\r
-\r
-        public void TextFieldKeyInputFocusGained(object source, EventArgs e)\r
-        {\r
-            // Make sure when the current spin that takes input focus also takes the keyboard focus\r
-            // For example, when you tap the spin directly\r
-            FocusManager.Instance.SetCurrentFocusView(_textField);\r
-        }\r
-\r
-        public void TextFieldKeyInputFocusLost(object source, EventArgs e)\r
-        {\r
-            int previousValue = _currentValue;\r
-\r
-            // If the input value is invalid, change it back to the previous valid value\r
-            if (int.TryParse(_textField.Text, out _currentValue))\r
-            {\r
-                if (_currentValue < _minValue || _currentValue > _maxValue)\r
-                {\r
-                    _currentValue = previousValue;\r
-                }\r
-            }\r
-            else\r
-            {\r
-                _currentValue = previousValue;\r
-            }\r
-\r
-            // Otherwise take the new value\r
-            this.Value = _currentValue;\r
-        }\r
-\r
-        public override View GetNextFocusableView(View currentFocusedActor, View.FocusDirection direction, bool loopEnabled)\r
-        {\r
-            // Respond to Up/Down keys to change the value while keeping the current spin focused\r
-            View nextFocusedActor = currentFocusedActor;\r
-            if (direction == View.FocusDirection.Up)\r
-            {\r
-                this.Value += this.Step;\r
-                nextFocusedActor = _textField;\r
-            }\r
-            else if (direction == View.FocusDirection.Down)\r
-            {\r
-                this.Value -= this.Step;\r
-                nextFocusedActor = _textField;\r
-            }\r
-            else\r
-            {\r
-                // Return a native empty handle as nothing can be focused in the left or right\r
-                nextFocusedActor = new View();\r
-                nextFocusedActor.Reset();\r
-            }\r
-\r
-            return nextFocusedActor;\r
-        }\r
-\r
-\r
-        [ScriptableProperty()]\r
-        public int Value\r
-        {\r
-            get\r
-            {\r
-                return _currentValue;\r
-            }\r
-            set\r
-            {\r
-\r
-                Console.WriteLine("Value set to " + value);\r
-                _currentValue = value;\r
-\r
-                // Make sure no invalid value is accepted\r
-                if (_currentValue < _minValue)\r
-                {\r
-                    _currentValue = _minValue;\r
-                }\r
-\r
-                if (_currentValue > _maxValue)\r
-                {\r
-                    _currentValue = _maxValue;\r
-                }\r
-\r
-                _textField.Text = _currentValue.ToString();\r
-            }\r
-        }\r
-        // MinValue property of type int:\r
-        [ScriptableProperty()]\r
-        public int MinValue\r
-        {\r
-            get\r
-            {\r
-                return _minValue;\r
-            }\r
-            set\r
-            {\r
-                _minValue = value;\r
-            }\r
-        }\r
-\r
-        // MaxValue property of type int:\r
-        [ScriptableProperty()]\r
-        public int MaxValue\r
-        {\r
-            get\r
-            {\r
-                return _maxValue;\r
-            }\r
-            set\r
-            {\r
-                _maxValue = value;\r
-            }\r
-        }\r
-\r
-        // Step property of type int:\r
-        [ScriptableProperty()]\r
-        public int Step\r
-        {\r
-            get\r
-            {\r
-                return _singleStep;\r
-            }\r
-            set\r
-            {\r
-                _singleStep = value;\r
-            }\r
-        }\r
-\r
-        // WrappingEnabled property of type bool:\r
-        [ScriptableProperty()]\r
-        public bool WrappingEnabled\r
-        {\r
-            get\r
-            {\r
-                return _wrappingEnabled;\r
-            }\r
-            set\r
-            {\r
-                _wrappingEnabled = value;\r
-            }\r
-        }\r
-\r
-        // TextPointSize property of type int:\r
-        [ScriptableProperty()]\r
-        public int TextPointSize\r
-        {\r
-            get\r
-            {\r
-                return _pointSize;\r
-            }\r
-            set\r
-            {\r
-                _pointSize = value;\r
-                _textField.PointSize = _pointSize;\r
-            }\r
-        }\r
-\r
-        // TextColor property of type Color:\r
-        [ScriptableProperty()]\r
-        public Color TextColor\r
-        {\r
-            get\r
-            {\r
-                return _textColor;\r
-            }\r
-            set\r
-            {\r
-                Console.WriteLine("TextColor set to " + value.R + "," + value.G + "," + value.B);\r
-\r
-                _textColor = value;\r
-                _textField.TextColor = _textColor;\r
-            }\r
-        }\r
-\r
-        // MaxTextLength property of type int:\r
-        [ScriptableProperty()]\r
-        public int MaxTextLength\r
-        {\r
-            get\r
-            {\r
-                return _maxTextLength;\r
-            }\r
-            set\r
-            {\r
-                _maxTextLength = value;\r
-                _textField.MaxLength = _maxTextLength;\r
-            }\r
-        }\r
-\r
-        public TextField SpinText\r
-        {\r
-            get\r
-            {\r
-                return _textField;\r
-            }\r
-            set\r
-            {\r
-                _textField = value;\r
-            }\r
-        }\r
-\r
-        // Indicator property of type string:\r
-        public string IndicatorImage\r
-        {\r
-            get\r
-            {\r
-                return _arrowImage;\r
-            }\r
-            set\r
-            {\r
-                _arrowImage = value;\r
-                _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150));\r
-                RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual);\r
-            }\r
-        }\r
-    }
-}
\ No newline at end of file

diff --git a/Tizen.NUI/src/internal/uintp.cs b/Tizen.NUI/src/internal/uintp.cs
index f21f891..1f2751a 100755 (executable)
--- a/Tizen.NUI/src/internal/uintp.cs
+++ b/Tizen.NUI/src/internal/uintp.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class uintp : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class uintp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/ushortp.cs b/Tizen.NUI/src/internal/ushortp.cs
index e812ca3..2362d9e 100755 (executable)
--- a/Tizen.NUI/src/internal/ushortp.cs
+++ b/Tizen.NUI/src/internal/ushortp.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class ushortp : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    internal class ushortp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/public/Actor.cs b/Tizen.NUI/src/public/Actor.cs
index 8f7e283..6d0ab26 100755 (executable)
--- a/Tizen.NUI/src/public/Actor.cs
+++ b/Tizen.NUI/src/public/Actor.cs
@@ -10,24 +10,24 @@
 // particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
 // damages suffered by licensee as a result of using, modifying or distributing\r
 // this software or its derivatives.\r
-
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
+\r
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
 //
-
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-// Some have been manually changed
+\r
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+// Some have been manually changed\r
 
 namespace Tizen.NUI\r
 {
@@ -108,7 +108,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //changed\r
         public float Opacity\r
         {\r
             get\r
@@ -123,21 +122,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //changed. moved to View class\r
-        /*\r
-        public bool StateFocusEnable\r
-        {\r
-            set\r
-            {\r
-                SetKeyboardFocusable(value);\r
-            }\r
-            get\r
-            {\r
-                return IsKeyboardFocusable();\r
-            }\r
-        }\r
-        */\r
-\r
         public bool IsOnStage\r
         {\r
             get\r
@@ -146,7 +130,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //changed\r
         public int HierarchyDepth\r
         {\r
             get\r
@@ -155,20 +138,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        public bool BatchParent\r
-        {\r
-            get\r
-            {\r
-                bool temp = false;\r
-                GetProperty(Actor.Property.BATCH_PARENT).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(Actor.Property.BATCH_PARENT, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-\r
         public int SiblingOrder\r
         {\r
             get\r
@@ -182,7 +151,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.SIBLING_ORDER, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-
+\r
         public void Show()\r
         {\r
             SetVisible(true);\r
@@ -193,7 +162,6 @@ namespace Tizen.NUI
             SetVisible(false);\r
         }\r
 \r
-        //changed\r
         internal class Property : global::System.IDisposable\r
         {\r
             private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
@@ -231,15 +199,15 @@ namespace Tizen.NUI
                     global::System.GC.SuppressFinalize(this);\r
                 }\r
             }\r
-            //changed\r
-            internal static readonly int BATCH_PARENT = NDalicManualPINVOKE.Actor_Property_BATCH_PARENT_get();\r
+\r
             internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();\r
-            //changed\r
+            internal static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get();\r
+\r
             internal Property() : this(NDalicPINVOKE.new_Actor_Property(), true)\r
             {\r
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             }\r
-            //changed\r
+\r
             internal static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get();\r
             internal static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get();\r
             internal static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get();\r
@@ -308,60 +276,60 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Actor(Actor copy) : this(NDalicPINVOKE.new_Actor__SWIG_1(Actor.getCPtr(copy)), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Actor Assign(Actor rhs)\r
         {\r
             Actor ret = new Actor(NDalicPINVOKE.Actor_Assign(swigCPtr, Actor.getCPtr(rhs)), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal string GetName()\r
         {\r
             string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetName(string name)\r
         {\r
             NDalicPINVOKE.Actor_SetName(swigCPtr, name);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal uint GetId()\r
         {\r
             uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsRoot()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsRoot(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool OnStage()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsLayer()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Layer GetLayer()\r
         {\r
             Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true);\r
@@ -380,7 +348,7 @@ namespace Tizen.NUI
             NDalicPINVOKE.Actor_Remove(swigCPtr, Actor.getCPtr(child));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Unparent()\r
         {\r
             NDalicPINVOKE.Actor_Unparent(swigCPtr);\r
@@ -407,81 +375,81 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Actor FindChildById(uint id)\r
         {\r
             Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Actor GetParent()\r
         {\r
             Actor ret = new Actor(NDalicPINVOKE.Actor_GetParent(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetParentOrigin(Vector3 origin)\r
         {\r
             NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetCurrentParentOrigin()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetAnchorPoint(Vector3 anchorPoint)\r
         {\r
             NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetCurrentAnchorPoint()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetSize(float width, float height)\r
         {\r
             NDalicPINVOKE.Actor_SetSize__SWIG_0(swigCPtr, width, height);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetSize(float width, float height, float depth)\r
         {\r
             NDalicPINVOKE.Actor_SetSize__SWIG_1(swigCPtr, width, height, depth);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetSize(Vector2 size)\r
         {\r
             NDalicPINVOKE.Actor_SetSize__SWIG_2(swigCPtr, Vector2.getCPtr(size));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetSize(Vector3 size)\r
         {\r
             NDalicPINVOKE.Actor_SetSize__SWIG_3(swigCPtr, Vector3.getCPtr(size));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetTargetSize()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetTargetSize(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
-        internal Vector3 GetCurrentSize()\r
+\r
+        internal Size GetCurrentSize()\r
         {\r
-            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true);\r
+            Size ret = new Size(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
@@ -492,282 +460,282 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetPosition(float x, float y)\r
         {\r
             NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetPosition(float x, float y, float z)\r
         {\r
             NDalicPINVOKE.Actor_SetPosition__SWIG_1(swigCPtr, x, y, z);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetPosition(Vector3 position)\r
         {\r
             NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetX(float x)\r
         {\r
             NDalicPINVOKE.Actor_SetX(swigCPtr, x);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetY(float y)\r
         {\r
             NDalicPINVOKE.Actor_SetY(swigCPtr, y);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetZ(float z)\r
         {\r
             NDalicPINVOKE.Actor_SetZ(swigCPtr, z);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void TranslateBy(Vector3 distance)\r
         {\r
             NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal Vector3 GetCurrentPosition()\r
+\r
+        internal Position GetCurrentPosition()\r
         {\r
-            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true);\r
+            Position ret = new Position(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetCurrentWorldPosition()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetInheritPosition(bool inherit)\r
         {\r
             NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal PositionInheritanceMode GetPositionInheritanceMode()\r
         {\r
             PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsPositionInherited()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetOrientation(Degree angle, Vector3 axis)\r
         {\r
             NDalicPINVOKE.Actor_SetOrientation__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetOrientation(Radian angle, Vector3 axis)\r
         {\r
             NDalicPINVOKE.Actor_SetOrientation__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal void SetOrientation(Quaternion orientation)\r
+\r
+        internal void SetOrientation(Rotation orientation)\r
         {\r
-            NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Quaternion.getCPtr(orientation));\r
+            NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void RotateBy(Degree angle, Vector3 axis)\r
         {\r
             NDalicPINVOKE.Actor_RotateBy__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void RotateBy(Radian angle, Vector3 axis)\r
         {\r
             NDalicPINVOKE.Actor_RotateBy__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal void RotateBy(Quaternion relativeRotation)\r
+\r
+        internal void RotateBy(Rotation relativeRotation)\r
         {\r
-            NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Quaternion.getCPtr(relativeRotation));\r
+            NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Rotation.getCPtr(relativeRotation));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal Quaternion GetCurrentOrientation()\r
+\r
+        internal Rotation GetCurrentOrientation()\r
         {\r
-            Quaternion ret = new Quaternion(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true);\r
+            Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetInheritOrientation(bool inherit)\r
         {\r
             NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool IsOrientationInherited()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
-        internal Quaternion GetCurrentWorldOrientation()\r
+\r
+        internal Rotation GetCurrentWorldOrientation()\r
         {\r
-            Quaternion ret = new Quaternion(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true);\r
+            Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetScale(float scale)\r
         {\r
             NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetScale(float scaleX, float scaleY, float scaleZ)\r
         {\r
             NDalicPINVOKE.Actor_SetScale__SWIG_1(swigCPtr, scaleX, scaleY, scaleZ);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetScale(Vector3 scale)\r
         {\r
             NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void ScaleBy(Vector3 relativeScale)\r
         {\r
             NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetCurrentScale()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetCurrentWorldScale()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetInheritScale(bool inherit)\r
         {\r
             NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool IsScaleInherited()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Matrix GetCurrentWorldMatrix()\r
         {\r
             Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetVisible(bool visible)\r
         {\r
             NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool IsVisible()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetOpacity(float opacity)\r
         {\r
             NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal float GetCurrentOpacity()\r
         {\r
             float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetColor(Vector4 color)\r
         {\r
             NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector4 GetCurrentColor()\r
         {\r
             Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetColorMode(ColorMode colorMode)\r
         {\r
             NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal ColorMode GetColorMode()\r
         {\r
             ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Vector4 GetCurrentWorldColor()\r
         {\r
             Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetDrawMode(DrawModeType drawMode)\r
         {\r
             NDalicPINVOKE.Actor_SetDrawMode(swigCPtr, (int)drawMode);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal DrawModeType GetDrawMode()\r
         {\r
             DrawModeType ret = (DrawModeType)NDalicPINVOKE.Actor_GetDrawMode(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetSensitive(bool sensitive)\r
         {\r
             NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool IsSensitive()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr);\r
@@ -781,65 +749,65 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetLeaveRequired(bool required)\r
         {\r
             NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool GetLeaveRequired()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetKeyboardFocusable(bool focusable)\r
         {\r
             NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal bool IsKeyboardFocusable()\r
         {\r
             bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetResizePolicy(ResizePolicyType policy, DimensionType dimension)\r
         {\r
             NDalicPINVOKE.Actor_SetResizePolicy(swigCPtr, (int)policy, (int)dimension);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal ResizePolicyType GetResizePolicy(DimensionType dimension)\r
         {\r
             ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.Actor_GetResizePolicy(swigCPtr, (int)dimension);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetSizeScalePolicy(SizeScalePolicyType policy)\r
         {\r
             NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal SizeScalePolicyType GetSizeScalePolicy()\r
         {\r
             SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetSizeModeFactor(Vector3 factor)\r
         {\r
             NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector3 GetSizeModeFactor()\r
         {\r
             Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetSizeModeFactor(swigCPtr), true);\r
@@ -860,134 +828,134 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal float GetRelayoutSize(DimensionType dimension)\r
         {\r
             float ret = NDalicPINVOKE.Actor_GetRelayoutSize(swigCPtr, (int)dimension);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
-        internal void SetPadding(RectFloat padding)\r
+\r
+        public void SetPadding(PaddingType padding)\r
         {\r
-            NDalicPINVOKE.Actor_SetPadding(swigCPtr, RectFloat.getCPtr(padding));\r
+            NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal void GetPadding(RectFloat paddingOut)\r
+\r
+        public void GetPadding(PaddingType paddingOut)\r
         {\r
-            NDalicPINVOKE.Actor_GetPadding(swigCPtr, RectFloat.getCPtr(paddingOut));\r
+            NDalicPINVOKE.Actor_GetPadding(swigCPtr, PaddingType.getCPtr(paddingOut));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetMinimumSize(Vector2 size)\r
         {\r
             NDalicPINVOKE.Actor_SetMinimumSize(swigCPtr, Vector2.getCPtr(size));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector2 GetMinimumSize()\r
         {\r
             Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMinimumSize(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetMaximumSize(Vector2 size)\r
         {\r
             NDalicPINVOKE.Actor_SetMaximumSize(swigCPtr, Vector2.getCPtr(size));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector2 GetMaximumSize()\r
         {\r
             Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMaximumSize(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal int GetHierarchyDepth()\r
         {\r
             int ret = NDalicPINVOKE.Actor_GetHierarchyDepth(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal uint AddRenderer(Renderer renderer)\r
         {\r
             uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal uint GetRendererCount()\r
         {\r
             uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Renderer GetRendererAt(uint index)\r
         {\r
             Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void RemoveRenderer(Renderer renderer)\r
         {\r
             NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void RemoveRenderer(uint index)\r
         {\r
             NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t TouchedSignal()\r
         {\r
             SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t ret = new SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t(NDalicPINVOKE.Actor_TouchedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorTouchDataSignal TouchSignal()\r
         {\r
             ActorTouchDataSignal ret = new ActorTouchDataSignal(NDalicPINVOKE.Actor_TouchSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorHoverSignal HoveredSignal()\r
         {\r
             ActorHoverSignal ret = new ActorHoverSignal(NDalicPINVOKE.Actor_HoveredSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorWheelSignal WheelEventSignal()\r
         {\r
             ActorWheelSignal ret = new ActorWheelSignal(NDalicPINVOKE.Actor_WheelEventSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorSignal OnStageSignal()\r
         {\r
             ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorSignal OffStageSignal()\r
         {\r
             ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ActorSignal OnRelayoutSignal()\r
         {\r
             ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false);\r
@@ -1008,10 +976,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.PARENT_ORIGIN, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //removed\r
-        //public float ParentOriginX\r
-        //public float ParentOriginY\r
-        //public float ParentOriginZ\r
+\r
         public Position AnchorPoint\r
         {\r
             get\r
@@ -1025,16 +990,12 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //removed\r
-        //public float AnchorPointX\r
-        //public float AnchorPointY\r
-        //public float AnchorPointZ\r
+\r
         public Size Size\r
         {\r
             get\r
             {\r
-                Size temp = new Size(0.0f, 0.0f, 0.0f);\r
-                GetProperty(Actor.Property.SIZE).Get(temp);\r
+                Size temp = GetCurrentSize();\r
                 return temp;\r
             }\r
             set\r
@@ -1085,8 +1046,7 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Position temp = new Position(0.0f, 0.0f, 0.0f);\r
-                GetProperty(Actor.Property.POSITION).Get(temp);\r
+                Position temp = GetCurrentPosition();\r
                 return temp;\r
             }\r
             set\r
@@ -1143,17 +1103,11 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //removed\r
-        //public float WorldPositionX\r
-        //public float WorldPositionY\r
-        //public float WorldPositionZ\r
-\r
-        //need to be removed and replaced by "Rotation" high level class\r
-        public Quaternion Orientation\r
+        public Rotation Orientation\r
         {\r
             get\r
             {\r
-                Quaternion temp = new Quaternion();\r
+                Rotation temp = new Rotation();\r
                 GetProperty(Actor.Property.ORIENTATION).Get(temp);\r
                 return temp;\r
             }\r
@@ -1162,11 +1116,11 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.ORIENTATION, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public Quaternion WorldOrientation\r
+        public Rotation WorldOrientation\r
         {\r
             get\r
             {\r
-                Quaternion temp = new Quaternion();\r
+                Rotation temp = new Rotation();\r
                 GetProperty(Actor.Property.WORLD_ORIENTATION).Get(temp);\r
                 return temp;\r
             }\r
@@ -1319,8 +1273,7 @@ namespace Tizen.NUI
                 return temp;\r
             }\r
         }\r
-        //removed\r
-        //public Matrix WorldMatrix\r
+\r
         public string Name\r
         {\r
             get\r
@@ -1386,7 +1339,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.INHERIT_SCALE, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //changed\r
+\r
         public ColorMode ColorMode\r
         {\r
             get\r
@@ -1415,10 +1368,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.COLOR_MODE, new Tizen.NUI.PropertyValue((int)value));\r
             }\r
         }\r
-        //removed\r
-        //public string PositionInheritance\r
 \r
-        //changed\r
         public DrawModeType DrawMode\r
         {\r
             get\r
@@ -1459,7 +1409,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //changed\r
         public ResizePolicyType WidthResizePolicy\r
         {\r
             get\r
@@ -1496,7 +1445,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.WIDTH_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value));\r
             }\r
         }\r
-        //changed\r
+\r
         public ResizePolicyType HeightResizePolicy\r
         {\r
             get\r
@@ -1533,7 +1482,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.HEIGHT_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value));\r
             }\r
         }\r
-        //changed\r
+\r
         public SizeScalePolicyType SizeScalePolicy\r
         {\r
             get\r
@@ -1600,7 +1549,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.PADDING, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //changed\r
+\r
         public Size2D MinimumSize\r
         {\r
             get\r
@@ -1614,7 +1563,7 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //changed\r
+\r
         public Size2D MaximumSize\r
         {\r
             get\r
@@ -1641,13 +1590,13 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.INHERIT_POSITION, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //changed\r
+\r
         public ClippingModeType ClippingMode\r
         {\r
             get\r
             {\r
                 string temp;\r
-                if (GetProperty(Actor.Property.SIZE_SCALE_POLICY).Get(out temp) == false)\r
+                if (GetProperty(Actor.Property.CLIPPING_MODE).Get(out temp) == false)\r
                 {\r
                     //Tizen.Log.Error("NUI", "ClippingMode get error!");\r
                 }\r
@@ -1663,7 +1612,7 @@ namespace Tizen.NUI
             }\r
             set\r
             {\r
-                SetProperty(Actor.Property.SIZE_SCALE_POLICY, new Tizen.NUI.PropertyValue((int)value));\r
+                SetProperty(Actor.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value));\r
             }\r
         }\r
 \r
@@ -1675,14 +1624,14 @@ namespace Tizen.NUI
         UseParentColor,\r
         UseOwnMultiplyParentColor,\r
         UseOwnMultiplyParentAlpha\r
-    }\r
+            }\r
 \r
     public enum DimensionType\r
     {\r
         Width = 0x1,\r
         Height = 0x2,\r
         AllDimensions = 0x3\r
-    }\r
+        }\r
 \r
     public enum DrawModeType\r
     {\r
@@ -1711,6 +1660,6 @@ namespace Tizen.NUI
     {\r
         Disabled,\r
         ClipChildren\r
-    }\r
+    }
 
 }

diff --git a/Tizen.NUI/src/public/AlphaFunction.cs b/Tizen.NUI/src/public/AlphaFunction.cs
index 9801c4d..cfad0b7 100755 (executable)
--- a/Tizen.NUI/src/public/AlphaFunction.cs
+++ b/Tizen.NUI/src/public/AlphaFunction.cs
@@ -10,25 +10,25 @@
 // particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
 // damages suffered by licensee as a result of using, modifying or distributing\r
 // this software or its derivatives.\r
-
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
+\r
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
 //
 
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
-
+\r
 namespace Tizen.NUI\r
 {\r
 \r
@@ -91,7 +91,7 @@ namespace Tizen.NUI
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal AlphaFunction(SWIGTYPE_p_f_float__float function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(function)), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -102,7 +102,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        //changed\r
         public void GetBezierControlPoints(out Vector2 controlPoint0, out Vector2 controlPoint1)\r
         {\r
             Vector4 ret = new Vector4(NDalicPINVOKE.AlphaFunction_GetBezierControlPoints(swigCPtr), true);\r
@@ -111,7 +110,7 @@ namespace Tizen.NUI
             controlPoint0 = new Vector2(ret.X, ret.Y);\r
             controlPoint1 = new Vector2(ret.Z, ret.W);\r
         }\r
-        //changed\r
+\r
         internal SWIGTYPE_p_f_float__float GetCustomFunction()\r
         {\r
             global::System.IntPtr cPtr = NDalicPINVOKE.AlphaFunction_GetCustomFunction(swigCPtr);\r
@@ -119,7 +118,7 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         public AlphaFunction.BuiltinFunctions GetBuiltinFunction()\r
         {\r
             AlphaFunction.BuiltinFunctions ret = (AlphaFunction.BuiltinFunctions)NDalicPINVOKE.AlphaFunction_GetBuiltinFunction(swigCPtr);\r
@@ -127,14 +126,13 @@ namespace Tizen.NUI
             return ret;\r
         }\r
 \r
-        //changed\r
         public AlphaFunction.Modes GetMode()\r
         {\r
             AlphaFunction.Modes ret = (AlphaFunction.Modes)NDalicPINVOKE.AlphaFunction_GetMode(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         public enum BuiltinFunctions\r
         {\r
             Default,\r
@@ -154,7 +152,6 @@ namespace Tizen.NUI
             Count\r
         }\r
 \r
-        //changed\r
         public enum Modes\r
         {\r
             CustomFunction = 1,\r

diff --git a/Tizen.NUI/src/public/Animation.cs b/Tizen.NUI/src/public/Animation.cs
index ff31f42..fdcfe52 100755 (executable)
--- a/Tizen.NUI/src/public/Animation.cs
+++ b/Tizen.NUI/src/public/Animation.cs
@@ -10,25 +10,25 @@
 // particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
 // damages suffered by licensee as a result of using, modifying or distributing\r
 // this software or its derivatives.\r
-
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
+\r
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
 //
 
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-// Some have been manually changed
-
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+// Some have been manually changed\r
+\r
 namespace Tizen.NUI\r
 {\r
 \r
@@ -77,46 +77,8 @@ namespace Tizen.NUI
                 base.Dispose();\r
             }\r
         }\r
-        \r
-        //changed\r
-        /*\r
-        private EventCallbackDelegateType1 _animationFinishedEventCallbackDelegate;\r
-        private event EventHandler _animationFinishedEventHandler;\r
 \r
-        public event EventHandler Finished\r
-        {\r
-            add\r
-            {\r
-                lock (this)\r
-                {\r
-                    _animationFinishedEventHandler += value;\r
-                    _animationFinishedEventCallbackDelegate = OnFinished;\r
-                    this.FinishedSignal().Connect(_animationFinishedEventCallbackDelegate);\r
-                }\r
-            }\r
-            remove\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (_animationFinishedEventHandler != null)\r
-                    {\r
-                        this.FinishedSignal().Disconnect(_animationFinishedEventCallbackDelegate);\r
-                    }\r
-                    _animationFinishedEventHandler -= value;\r
-                }\r
-            }\r
-        }\r
 \r
-        // Callback for Animation FinishedSignal\r
-        private void OnFinished(IntPtr data)\r
-        {\r
-            if (_animationFinishedEventHandler != null)\r
-            {\r
-                //here we send all data to user event handlers\r
-                _animationFinishedEventHandler(this, null);\r
-            }\r
-        }\r
-        */\r
 \r
         private AnimationFinishedEventCallbackType _animationFinishedEventCallback;\r
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
@@ -216,7 +178,7 @@ namespace Tizen.NUI
                 return ret;\r
             }\r
         }\r
-        //changed\r
+\r
         public States State\r
         {\r
             get\r
@@ -262,7 +224,7 @@ namespace Tizen.NUI
                 return GetEndAction();\r
             }\r
         }\r
-        //changed\r
+\r
         public void Stop(EndActions action = EndActions.Cancel)\r
         {\r
             SetEndAction(action);\r
@@ -270,7 +232,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        //changed\r
         public int CurrentLoop\r
         {\r
             get\r
@@ -278,7 +239,7 @@ namespace Tizen.NUI
                 return GetCurrentLoop();\r
             }\r
         }\r
-        //changed\r
+\r
         public EndActions DisconnectAction\r
         {\r
             set\r
@@ -293,7 +254,7 @@ namespace Tizen.NUI
                 return ret;\r
             }\r
         }\r
-        //changed\r
+\r
         public float CurrentProgress\r
         {\r
             set\r
@@ -308,7 +269,7 @@ namespace Tizen.NUI
                 return ret;\r
             }\r
         }\r
-        //changed\r
+\r
         public float SpeedFactor\r
         {\r
             set\r
@@ -323,7 +284,7 @@ namespace Tizen.NUI
                 return ret;\r
             }\r
         }\r
-        //changed\r
+\r
         public Vector2 PlayRange\r
         {\r
             set\r
@@ -339,286 +300,7 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-        //changed\r
-        /*\r
-        public int StartTime { set; get; }\r
-        public int EndTime { set; get; }\r
-        public string TargetProperty { set; get; }\r
-        public object Destination { set; get; }\r
-        public Tizen.NUI.AlphaFunction AlphaFunction { set; get; }\r
-\r
-\r
-        public void AnimateBy(Actor target)\r
-        {\r
-            string _str1 = TargetProperty.Substring(0, 1);\r
-            string _str2 = TargetProperty.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)Destination;\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateBy(Actor target, string propertyIndex)\r
-        {\r
-            string _str1 = propertyIndex.Substring(0, 1);\r
-            string _str2 = propertyIndex.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)Destination;\r
 \r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateBy(Actor target, string propertyIndex, object relativeValue)\r
-        {\r
-            string _str1 = propertyIndex.Substring(0, 1);\r
-            string _str2 = propertyIndex.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)relativeValue;\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBy(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateTo(Actor target)\r
-        {\r
-            string _str1 = TargetProperty.Substring(0, 1);\r
-            string _str2 = TargetProperty.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)Destination;\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateTo(Actor target, string propertyIndex)\r
-        {\r
-            string _str1 = propertyIndex.Substring(0, 1);\r
-            string _str2 = propertyIndex.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)Destination;\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateTo(Actor target, string propertyIndex, object destinationValue)\r
-        {\r
-            string _str1 = propertyIndex.Substring(0, 1);\r
-            string _str2 = propertyIndex.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-            dynamic obj = (object)destinationValue;\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj));\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateTo(new Property(target, _str), new PropertyValue(obj), time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateBetween(Actor target, KeyFrames keyFrames)\r
-        {\r
-            string _str1 = TargetProperty.Substring(0, 1);\r
-            string _str2 = TargetProperty.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBetween(new Property(target, _str), keyFrames);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBetween(new Property(target, _str), keyFrames, time);\r
-                }\r
-            }\r
-        }\r
-\r
-        public void AnimateBetween(Actor target, KeyFrames keyFrames, Animation.Interpolation interpolation)\r
-        {\r
-            string _str1 = TargetProperty.Substring(0, 1);\r
-            string _str2 = TargetProperty.Substring(1);\r
-            string _str = _str1.ToLower() + _str2;\r
-\r
-\r
-            if (this.AlphaFunction != null)\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, interpolation);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time, interpolation);\r
-                }\r
-            }\r
-            else\r
-            {\r
-                if (this.StartTime == 0 && this.EndTime == 0)\r
-                {\r
-                    AnimateBetween(new Property(target, _str), keyFrames, interpolation);\r
-                }\r
-                else\r
-                {\r
-                    Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));\r
-                    AnimateBetween(new Property(target, _str), keyFrames, time, interpolation);\r
-                }\r
-            }\r
-        }\r
-        */\r
-        //changed\r
         public void AnimateBy(Actor target, string property, object relativeValue, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -642,7 +324,7 @@ namespace Tizen.NUI
                 AnimateBy(_prop, new PropertyValue(obj));\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimateBy(Actor target, string property, object relativeValue, int startTime, int endTime, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -668,7 +350,7 @@ namespace Tizen.NUI
                 AnimateBy(_prop, new PropertyValue(obj), time);\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimateTo(Actor target, string property, object destinationValue, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -692,7 +374,7 @@ namespace Tizen.NUI
                 AnimateTo(_prop, new PropertyValue(obj));\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimateTo(Actor target, string property, object destinationValue, int startTime, int endTime, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -718,7 +400,7 @@ namespace Tizen.NUI
                 AnimateTo(_prop, new PropertyValue(obj), time);\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -741,7 +423,7 @@ namespace Tizen.NUI
                 AnimateBetween(_prop, keyFrames, alphaFunction);\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, int startTime, int endTime, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null)\r
         {\r
             string _str1 = property.Substring(0, 1);\r
@@ -764,7 +446,7 @@ namespace Tizen.NUI
                 AnimateBetween(_prop, keyFrames, time, interpolation);\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimatePath(Actor actor, Path path, Vector3 forward, AlphaFunction alphaFunction = null)\r
         {\r
             if (alphaFunction == null)\r
@@ -776,7 +458,7 @@ namespace Tizen.NUI
                 Animate(actor, path, forward, alphaFunction);\r
             }\r
         }\r
-        //changed\r
+\r
         public void AnimatePath(Actor actor, Path path, Vector3 forward, int startTime, int endTime, AlphaFunction alphaFunction = null)\r
         {\r
             TimePeriod time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));\r
@@ -796,7 +478,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        //changed\r
         internal Animation(float durationSeconds) : this(NDalicPINVOKE.Animation_New(durationSeconds), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -808,12 +489,11 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Animation(Animation handle) : this(NDalicPINVOKE.new_Animation__SWIG_1(Animation.getCPtr(handle)), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
 \r
         internal Animation Assign(Animation rhs)\r
         {\r
@@ -821,14 +501,12 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
 \r
         internal void SetDuration(float seconds)\r
         {\r
             NDalicPINVOKE.Animation_SetDuration(swigCPtr, seconds);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
 \r
         internal float GetDuration()\r
         {\r
@@ -836,111 +514,111 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetLooping(bool looping)\r
         {\r
             NDalicPINVOKE.Animation_SetLooping(swigCPtr, looping);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetLoopCount(int count)\r
         {\r
             NDalicPINVOKE.Animation_SetLoopCount(swigCPtr, count);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal int GetLoopCount()\r
         {\r
             int ret = NDalicPINVOKE.Animation_GetLoopCount(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal int GetCurrentLoop()\r
         {\r
             int ret = NDalicPINVOKE.Animation_GetCurrentLoop(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsLooping()\r
         {\r
             bool ret = NDalicPINVOKE.Animation_IsLooping(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
-        internal void SetEndAction(EndActions action)\r
+\r
+        internal void SetEndAction(Animation.EndActions action)\r
         {\r
             NDalicPINVOKE.Animation_SetEndAction(swigCPtr, (int)action);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal EndActions GetEndAction()\r
+\r
+        internal Animation.EndActions GetEndAction()\r
         {\r
-            EndActions ret = (EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr);\r
+            Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
-        internal void SetDisconnectAction(EndActions disconnectAction)\r
+\r
+        internal void SetDisconnectAction(Animation.EndActions disconnectAction)\r
         {\r
             NDalicPINVOKE.Animation_SetDisconnectAction(swigCPtr, (int)disconnectAction);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal EndActions GetDisconnectAction()\r
+\r
+        internal Animation.EndActions GetDisconnectAction()\r
         {\r
             Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetDisconnectAction(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetDefaultAlphaFunction(AlphaFunction alpha)\r
         {\r
             NDalicPINVOKE.Animation_SetDefaultAlphaFunction(swigCPtr, AlphaFunction.getCPtr(alpha));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal AlphaFunction GetDefaultAlphaFunction()\r
         {\r
             AlphaFunction ret = new AlphaFunction(NDalicPINVOKE.Animation_GetDefaultAlphaFunction(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetCurrentProgress(float progress)\r
         {\r
             NDalicPINVOKE.Animation_SetCurrentProgress(swigCPtr, progress);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal float GetCurrentProgress()\r
         {\r
             float ret = NDalicPINVOKE.Animation_GetCurrentProgress(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetSpeedFactor(float factor)\r
         {\r
             NDalicPINVOKE.Animation_SetSpeedFactor(swigCPtr, factor);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal float GetSpeedFactor()\r
         {\r
             float ret = NDalicPINVOKE.Animation_GetSpeedFactor(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetPlayRange(Vector2 range)\r
         {\r
             NDalicPINVOKE.Animation_SetPlayRange(swigCPtr, Vector2.getCPtr(range));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Vector2 GetPlayRange()\r
         {\r
             Vector2 ret = new Vector2(NDalicPINVOKE.Animation_GetPlayRange(swigCPtr), true);\r
@@ -965,8 +643,8 @@ namespace Tizen.NUI
             NDalicPINVOKE.Animation_Pause(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
-        internal States GetState()\r
+\r
+        internal Animation.States GetState()\r
         {\r
             Animation.States ret = (Animation.States)NDalicPINVOKE.Animation_GetState(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -984,140 +662,140 @@ namespace Tizen.NUI
             NDalicPINVOKE.Animation_Clear(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal AnimationSignal FinishedSignal()\r
         {\r
             AnimationSignal ret = new AnimationSignal(NDalicPINVOKE.Animation_FinishedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void AnimateBy(Property target, PropertyValue relativeValue)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBy__SWIG_0(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBy(Property target, PropertyValue relativeValue, AlphaFunction alpha)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBy__SWIG_1(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBy(Property target, PropertyValue relativeValue, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBy__SWIG_2(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBy(Property target, PropertyValue relativeValue, AlphaFunction alpha, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBy__SWIG_3(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateTo(Property target, PropertyValue destinationValue)\r
         {\r
             NDalicPINVOKE.Animation_AnimateTo__SWIG_0(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateTo(Property target, PropertyValue destinationValue, AlphaFunction alpha)\r
         {\r
             NDalicPINVOKE.Animation_AnimateTo__SWIG_1(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateTo(Property target, PropertyValue destinationValue, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateTo__SWIG_2(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateTo(Property target, PropertyValue destinationValue, AlphaFunction alpha, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateTo__SWIG_3(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_0(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, Animation.Interpolation interpolation)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_1(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), (int)interpolation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_2(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, Animation.Interpolation interpolation)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_3(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), (int)interpolation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_4(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period, Animation.Interpolation interpolation)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_5(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period), (int)interpolation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_6(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period, Animation.Interpolation interpolation)\r
         {\r
             NDalicPINVOKE.Animation_AnimateBetween__SWIG_7(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period), (int)interpolation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Animate(Actor actor, Path path, Vector3 forward)\r
         {\r
             NDalicPINVOKE.Animation_Animate__SWIG_0(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha)\r
         {\r
             NDalicPINVOKE.Animation_Animate__SWIG_1(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Animate(Actor actor, Path path, Vector3 forward, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_Animate__SWIG_2(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha, TimePeriod period)\r
         {\r
             NDalicPINVOKE.Animation_Animate__SWIG_3(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Show(Actor actor, float delaySeconds)\r
         {\r
             NDalicPINVOKE.Animation_Show(swigCPtr, Actor.getCPtr(actor), delaySeconds);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void Hide(Actor actor, float delaySeconds)\r
         {\r
             NDalicPINVOKE.Animation_Hide(swigCPtr, Actor.getCPtr(actor), delaySeconds);\r

diff --git a/Tizen.NUI/src/public/Button.cs b/Tizen.NUI/src/public/Button.cs
index 22e9a96..4378eba 100755 (executable)
--- a/Tizen.NUI/src/public/Button.cs
+++ b/Tizen.NUI/src/public/Button.cs
@@ -18,14 +18,14 @@
 // You may obtain a copy of the License at\r
 //\r
 // http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
+//
 // Unless required by applicable law or agreed to in writing, software\r
 // distributed under the License is distributed on an "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
-//\r
-\r
+//
+
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
 \r
@@ -80,286 +80,6 @@ namespace Tizen.NUI
         }\r
 \r
 \r
-        //changed\r
-        /*\r
-        public class ClickedEventArgs : EventArgs\r
-        {\r
-            private Button _button;\r
-\r
-            public Button Button\r
-            {\r
-                get\r
-                {\r
-                    return _button;\r
-                }\r
-                set\r
-                {\r
-                    _button = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class PressedEventArgs : EventArgs\r
-        {\r
-            private Button _button;\r
-\r
-            public Button Button\r
-            {\r
-                get\r
-                {\r
-                    return _button;\r
-                }\r
-                set\r
-                {\r
-                    _button = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class ReleasedEventArgs : EventArgs\r
-        {\r
-            private Button _button;\r
-\r
-            public Button Button\r
-            {\r
-                get\r
-                {\r
-                    return _button;\r
-                }\r
-                set\r
-                {\r
-                    _button = value;\r
-                }\r
-            }\r
-        }\r
-\r
-        public class StateChangedEventArgs : EventArgs\r
-        {\r
-            private Button _button;\r
-\r
-            public Button Button\r
-            {\r
-                get\r
-                {\r
-                    return _button;\r
-                }\r
-                set\r
-                {\r
-                    _button = value;\r
-                }\r
-            }\r
-        }\r
-\r
-\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate bool ClickedCallbackDelegate(global::System.IntPtr data);\r
-        private DaliEventHandlerWithReturnType<object, ClickedEventArgs, bool> _buttonClickedEventHandler;\r
-        private ClickedCallbackDelegate _buttonClickedCallbackDelegate;\r
-\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate bool PressedCallbackDelegate(global::System.IntPtr data);\r
-        private DaliEventHandlerWithReturnType<object, PressedEventArgs, bool> _buttonPressedEventHandler;\r
-        private PressedCallbackDelegate _buttonPressedCallbackDelegate;\r
-\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate bool ReleasedCallbackDelegate(global::System.IntPtr data);\r
-        private DaliEventHandlerWithReturnType<object, ReleasedEventArgs, bool> _buttonReleasedEventHandler;\r
-        private ReleasedCallbackDelegate _buttonReleasedCallbackDelegate;\r
-\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate bool StateChangedCallbackDelegate(global::System.IntPtr data);\r
-        private DaliEventHandlerWithReturnType<object, StateChangedEventArgs, bool> _buttonStateChangedEventHandler;\r
-        private StateChangedCallbackDelegate _buttonStateChangedCallbackDelegate;\r
-\r
-\r
-        public event DaliEventHandlerWithReturnType<object, ClickedEventArgs, bool> Clicked\r
-        {\r
-            add\r
-            {\r
-                lock (this)\r
-                {\r
-                    // Restricted to only one listener\r
-                    if (_buttonClickedEventHandler == null)\r
-                    {\r
-                        _buttonClickedEventHandler += value;\r
-\r
-                        _buttonClickedCallbackDelegate = new ClickedCallbackDelegate(OnClicked);\r
-                        this.ClickedSignal().Connect(_buttonClickedCallbackDelegate);\r
-                    }\r
-                }\r
-            }\r
-\r
-            remove\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (_buttonClickedEventHandler != null)\r
-                    {\r
-                        this.ClickedSignal().Disconnect(_buttonClickedCallbackDelegate);\r
-                    }\r
-\r
-                    _buttonClickedEventHandler -= value;\r
-                }\r
-            }\r
-        }\r
-\r
-        // Callback for button click signal\r
-        private bool OnClicked(IntPtr data)\r
-        {\r
-            ClickedEventArgs e = new ClickedEventArgs();\r
-\r
-            e.Button = Button.GetButtonFromPtr(data);\r
-\r
-            if (_buttonClickedEventHandler != null)\r
-            {\r
-                //here we send all data to user event handlers\r
-                return _buttonClickedEventHandler(this, e);\r
-            }\r
-            return false;\r
-        }\r
-\r
-\r
-        public event DaliEventHandlerWithReturnType<object, PressedEventArgs, bool> Pressed\r
-        {\r
-            add\r
-            {\r
-                lock (this)\r
-                {\r
-                    // Restricted to only one listener\r
-                    if (_buttonPressedEventHandler == null)\r
-                    {\r
-                        _buttonPressedEventHandler += value;\r
-\r
-                        _buttonPressedCallbackDelegate = new PressedCallbackDelegate(OnPressed);\r
-                        this.PressedSignal().Connect(_buttonPressedCallbackDelegate);\r
-                    }\r
-                }\r
-            }\r
-\r
-            remove\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (_buttonPressedEventHandler != null)\r
-                    {\r
-                        this.PressedSignal().Disconnect(_buttonPressedCallbackDelegate);\r
-                    }\r
-\r
-                    _buttonPressedEventHandler -= value;\r
-                }\r
-            }\r
-        }\r
-\r
-        // Callback for button click signal\r
-        private bool OnPressed(IntPtr data)\r
-        {\r
-            PressedEventArgs e = new PressedEventArgs();\r
-\r
-            e.Button = Button.GetButtonFromPtr(data);\r
-\r
-            if (_buttonPressedEventHandler != null)\r
-            {\r
-                //here we send all data to user event handlers\r
-                return _buttonPressedEventHandler(this, e);\r
-            }\r
-            return false;\r
-        }\r
-\r
-\r
-        public event DaliEventHandlerWithReturnType<object, ReleasedEventArgs, bool> Released\r
-        {\r
-            add\r
-            {\r
-                lock (this)\r
-                {\r
-                    // Restricted to only one listener\r
-                    if (_buttonReleasedEventHandler == null)\r
-                    {\r
-                        _buttonReleasedEventHandler += value;\r
-\r
-                        _buttonReleasedCallbackDelegate = new ReleasedCallbackDelegate(OnReleased);\r
-                        this.ReleasedSignal().Connect(_buttonReleasedCallbackDelegate);\r
-                    }\r
-                }\r
-            }\r
-\r
-            remove\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (_buttonReleasedEventHandler != null)\r
-                    {\r
-                        this.ReleasedSignal().Disconnect(_buttonReleasedCallbackDelegate);\r
-                    }\r
-\r
-                    _buttonReleasedEventHandler -= value;\r
-                }\r
-            }\r
-        }\r
-\r
-        // Callback for button click signal\r
-        private bool OnReleased(IntPtr data)\r
-        {\r
-            ReleasedEventArgs e = new ReleasedEventArgs();\r
-\r
-            e.Button = Button.GetButtonFromPtr(data);\r
-\r
-            if (_buttonReleasedEventHandler != null)\r
-            {\r
-                //here we send all data to user event handlers\r
-                return _buttonReleasedEventHandler(this, e);\r
-            }\r
-            return false;\r
-        }\r
-\r
-\r
-        public event DaliEventHandlerWithReturnType<object, StateChangedEventArgs, bool> StateChanged\r
-        {\r
-            add\r
-            {\r
-                lock (this)\r
-                {\r
-                    // Restricted to only one listener\r
-                    if (_buttonStateChangedEventHandler == null)\r
-                    {\r
-                        _buttonStateChangedEventHandler += value;\r
-\r
-                        _buttonStateChangedCallbackDelegate = new StateChangedCallbackDelegate(OnStateChanged);\r
-                        this.StateChangedSignal().Connect(_buttonStateChangedCallbackDelegate);\r
-                    }\r
-                }\r
-            }\r
-\r
-            remove\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (_buttonStateChangedEventHandler != null)\r
-                    {\r
-                        this.StateChangedSignal().Disconnect(_buttonStateChangedCallbackDelegate);\r
-                    }\r
-\r
-                    _buttonStateChangedEventHandler -= value;\r
-                }\r
-            }\r
-        }\r
-\r
-        // Callback for button click signal\r
-        private bool OnStateChanged(IntPtr data)\r
-        {\r
-            StateChangedEventArgs e = new StateChangedEventArgs();\r
-\r
-            e.Button = Button.GetButtonFromPtr(data);\r
-\r
-            if (_buttonStateChangedEventHandler != null)\r
-            {\r
-                //here we send all data to user event handlers\r
-                return _buttonStateChangedEventHandler(this, e);\r
-            }\r
-            return false;\r
-        }\r
-        */\r
-        //changed <<<<\r
         private EventHandlerWithReturnType<object, EventArgs, bool> _clickedEventHandler;\r
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
         private delegate bool ClickedCallbackType(global::System.IntPtr data);\r
@@ -520,7 +240,8 @@ namespace Tizen.NUI
             }\r
             return false;\r
         }\r
-        //changed >>>\r
+\r
+\r
 \r
         public static Button GetButtonFromPtr(global::System.IntPtr cPtr)\r
         {\r
@@ -682,7 +403,7 @@ namespace Tizen.NUI
                 SetProperty(Button.Property.VISUAL_PADDING, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        //internal\r
+\r
         internal class Property : global::System.IDisposable\r
         {\r
             private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
@@ -720,7 +441,7 @@ namespace Tizen.NUI
                     global::System.GC.SuppressFinalize(this);\r
                 }\r
             }\r
-            //chagned\r
+\r
             internal static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get();\r
             internal static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get();\r
             internal static readonly int DISABLED_SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_VISUAL_get();\r
@@ -737,7 +458,7 @@ namespace Tizen.NUI
             {\r
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             }\r
-            //changed\r
+\r
             internal static readonly int DISABLED = NDalicPINVOKE.Button_Property_DISABLED_get();\r
             internal static readonly int AUTO_REPEATING = NDalicPINVOKE.Button_Property_AUTO_REPEATING_get();\r
             internal static readonly int INITIAL_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_INITIAL_AUTO_REPEATING_DELAY_get();\r
@@ -758,12 +479,12 @@ namespace Tizen.NUI
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Button(Button button) : this(NDalicPINVOKE.new_Button__SWIG_1(Button.getCPtr(button)), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Button Assign(Button button)\r
         {\r
             Button ret = new Button(NDalicPINVOKE.Button_Assign(swigCPtr, Button.getCPtr(button)), false);\r
@@ -777,42 +498,42 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsDisabled()\r
         {\r
             bool ret = NDalicPINVOKE.Button_IsDisabled(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsAutoRepeating()\r
         {\r
             bool ret = NDalicPINVOKE.Button_IsAutoRepeating(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal float GetInitialAutoRepeatingDelay()\r
         {\r
             float ret = NDalicPINVOKE.Button_GetInitialAutoRepeatingDelay(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal float GetNextAutoRepeatingDelay()\r
         {\r
             float ret = NDalicPINVOKE.Button_GetNextAutoRepeatingDelay(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsTogglableButton()\r
         {\r
             bool ret = NDalicPINVOKE.Button_IsTogglableButton(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal bool IsSelected()\r
         {\r
             bool ret = NDalicPINVOKE.Button_IsSelected(swigCPtr);\r
@@ -826,74 +547,74 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal string GetLabelText()\r
         {\r
             string ret = NDalicPINVOKE.Button_GetLabelText(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal void SetLabel(Actor label)\r
         {\r
             NDalicPINVOKE.Button_SetLabel(swigCPtr, Actor.getCPtr(label));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetButtonImage(Image image)\r
         {\r
             NDalicPINVOKE.Button_SetButtonImage(swigCPtr, Image.getCPtr(image));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal void SetSelectedImage(Image image)\r
         {\r
             NDalicPINVOKE.Button_SetSelectedImage(swigCPtr, Image.getCPtr(image));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
-        //changed\r
+\r
         internal Actor GetButtonImage()\r
         {\r
             Actor ret = new Actor(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal Actor GetSelectedImage()\r
         {\r
             Actor ret = new Actor(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ButtonSignal PressedSignal()\r
         {\r
             ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_PressedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ButtonSignal ReleasedSignal()\r
         {\r
             ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ReleasedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ButtonSignal ClickedSignal()\r
         {\r
             ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ClickedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal ButtonSignal StateChangedSignal()\r
         {\r
             ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_StateChangedSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
-        //changed\r
+\r
         internal enum PropertyRange\r
         {\r
             PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,\r
@@ -1070,6 +791,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-    }\r
-\r
+    }
+
 }
\ No newline at end of file

diff --git a/Tizen.NUI/src/public/CameraActor.cs b/Tizen.NUI/src/public/CameraActor.cs
index b076fc3..0783602 100755 (executable)
--- a/Tizen.NUI/src/public/CameraActor.cs
+++ b/Tizen.NUI/src/public/CameraActor.cs
@@ -1,480 +1,480 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    public class CameraActor : Actor\r
-    {\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-\r
-        internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn)\r
-        {\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CameraActor obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~CameraActor()\r
-        {\r
-            DisposeQueue.Instance.Add(this);\r
-        }\r
-\r
-        public override void Dispose()\r
-        {\r
-            if (!Stage.IsInstalled())\r
-            {\r
-                DisposeQueue.Instance.Add(this);\r
-                return;\r
-            }\r
-\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_CameraActor(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-                base.Dispose();\r
-            }\r
-        }\r
-\r
-\r
-        internal class Property : global::System.IDisposable\r
-        {\r
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-            protected bool swigCMemOwn;\r
-\r
-            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)\r
-            {\r
-                swigCMemOwn = cMemoryOwn;\r
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-            }\r
-\r
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)\r
-            {\r
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-            }\r
-\r
-            ~Property()\r
-            {\r
-                Dispose();\r
-            }\r
-\r
-            public virtual void Dispose()\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                    {\r
-                        if (swigCMemOwn)\r
-                        {\r
-                            swigCMemOwn = false;\r
-                            NDalicPINVOKE.delete_CameraActor_Property(swigCPtr);\r
-                        }\r
-                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                    }\r
-                    global::System.GC.SuppressFinalize(this);\r
-                }\r
-            }\r
-\r
-            internal Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true)\r
-            {\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-\r
-            internal static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get();\r
-            internal static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get();\r
-            internal static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get();\r
-            internal static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get();\r
-            internal static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get();\r
-            internal static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get();\r
-            internal static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get();\r
-            internal static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get();\r
-            internal static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get();\r
-            internal static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get();\r
-            internal static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get();\r
-            internal static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get();\r
-            internal static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get();\r
-            internal static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get();\r
-\r
-        }\r
-\r
-        public CameraActor() : this(NDalicPINVOKE.CameraActor_New__SWIG_0(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-\r
-        }\r
-        public CameraActor(Size2D size) : this(NDalicPINVOKE.CameraActor_New__SWIG_1(Size2D.getCPtr(size)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-\r
-        }\r
-        public new static CameraActor DownCast(BaseHandle handle)\r
-        {\r
-            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.getCPtr(copy)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal CameraActor Assign(CameraActor rhs)\r
-        {\r
-            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_Assign(swigCPtr, CameraActor.getCPtr(rhs)), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetType(CameraType type)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal CameraType GetType()\r
-        {\r
-            CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetProjectionMode(ProjectionMode mode)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal ProjectionMode GetProjectionMode()\r
-        {\r
-            ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetFieldOfView(float fieldOfView)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal float GetFieldOfView()\r
-        {\r
-            float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetAspectRatio(float aspectRatio)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal float GetAspectRatio()\r
-        {\r
-            float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetNearClippingPlane(float nearClippingPlane)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal float GetNearClippingPlane()\r
-        {\r
-            float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetFarClippingPlane(float farClippingPlane)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal float GetFarClippingPlane()\r
-        {\r
-            float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetTargetPosition(Vector3 targetPosition)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal Vector3 GetTargetPosition()\r
-        {\r
-            Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetInvertYAxis(bool invertYAxis)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal bool GetInvertYAxis()\r
-        {\r
-            bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal void SetPerspectiveProjection(Vector2 size)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal void SetOrthographicProjection(Vector2 size)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far)\r
-        {\r
-            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public string Type\r
-        {\r
-            get\r
-            {\r
-                string temp;\r
-                GetProperty(CameraActor.Property.TYPE).Get(out temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.TYPE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public string ProjectionMode\r
-        {\r
-            get\r
-            {\r
-                string temp;\r
-                GetProperty(CameraActor.Property.PROJECTION_MODE).Get(out temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float FieldOfView\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.FIELD_OF_VIEW).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float AspectRatio\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.ASPECT_RATIO).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float NearPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float FarPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.FAR_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float LeftPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float RightPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float TopPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.TOP_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public float BottomPlaneDistance\r
-        {\r
-            get\r
-            {\r
-                float temp = 0.0f;\r
-                GetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public Position TargetPosition\r
-        {\r
-            get\r
-            {\r
-                Position temp = new Position(0.0f, 0.0f, 0.0f);\r
-                GetProperty(CameraActor.Property.TARGET_POSITION).Get(temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        internal Matrix ProjectionMatrix\r
-        {\r
-            get\r
-            {\r
-                Matrix temp = new Matrix();\r
-                GetProperty(CameraActor.Property.PROJECTION_MATRIX).Get(temp);\r
-                return temp;\r
-            }\r
-        }\r
-\r
-        internal Matrix ViewMatrix\r
-        {\r
-            get\r
-            {\r
-                Matrix temp = new Matrix();\r
-                GetProperty(CameraActor.Property.VIEW_MATRIX).Get(temp);\r
-                return temp;\r
-            }\r
-        }\r
-        public bool InvertYAxis\r
-        {\r
-            get\r
-            {\r
-                bool temp = false;\r
-                GetProperty(CameraActor.Property.INVERT_Y_AXIS).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(CameraActor.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    public enum CameraType\r
-    {\r
-        FreeLook,\r
-        LookAtTarget\r
-    }\r
-\r
-    public enum ProjectionMode\r
-    {\r
-        PerspectiveProjection,\r
-        OrthographicProjection\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+
+    public class CameraActor : Actor
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CameraActor obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~CameraActor()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_CameraActor(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_CameraActor_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get();
+            internal static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get();
+            internal static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get();
+            internal static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get();
+            internal static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get();
+            internal static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get();
+            internal static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get();
+            internal static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get();
+            internal static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get();
+            internal static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get();
+            internal static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get();
+            internal static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get();
+            internal static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get();
+            internal static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get();
+
+        }
+
+        public CameraActor() : this(NDalicPINVOKE.CameraActor_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        public CameraActor(Size2D size) : this(NDalicPINVOKE.CameraActor_New__SWIG_1(Size2D.getCPtr(size)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        public new static CameraActor DownCast(BaseHandle handle)
+        {
+            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.getCPtr(copy)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal CameraActor Assign(CameraActor rhs)
+        {
+            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_Assign(swigCPtr, CameraActor.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetType(CameraType type)
+        {
+            NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal CameraType GetType()
+        {
+            CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetProjectionMode(ProjectionMode mode)
+        {
+            NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ProjectionMode GetProjectionMode()
+        {
+            ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetFieldOfView(float fieldOfView)
+        {
+            NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetFieldOfView()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetAspectRatio(float aspectRatio)
+        {
+            NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetAspectRatio()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetNearClippingPlane(float nearClippingPlane)
+        {
+            NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetNearClippingPlane()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetFarClippingPlane(float farClippingPlane)
+        {
+            NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetFarClippingPlane()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetTargetPosition(Vector3 targetPosition)
+        {
+            NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetTargetPosition()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetInvertYAxis(bool invertYAxis)
+        {
+            NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool GetInvertYAxis()
+        {
+            bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetPerspectiveProjection(Vector2 size)
+        {
+            NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetOrthographicProjection(Vector2 size)
+        {
+            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far)
+        {
+            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public string Type
+        {
+            get
+            {
+                string temp;
+                GetProperty(CameraActor.Property.TYPE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TYPE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public string ProjectionMode
+        {
+            get
+            {
+                string temp;
+                GetProperty(CameraActor.Property.PROJECTION_MODE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float FieldOfView
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.FIELD_OF_VIEW).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float AspectRatio
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.ASPECT_RATIO).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float NearPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float FarPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.FAR_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float LeftPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float RightPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float TopPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.TOP_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public float BottomPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public Position TargetPosition
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(CameraActor.Property.TARGET_POSITION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        internal Matrix ProjectionMatrix
+        {
+            get
+            {
+                Matrix temp = new Matrix();
+                GetProperty(CameraActor.Property.PROJECTION_MATRIX).Get(temp);
+                return temp;
+            }
+        }
+
+        internal Matrix ViewMatrix
+        {
+            get
+            {
+                Matrix temp = new Matrix();
+                GetProperty(CameraActor.Property.VIEW_MATRIX).Get(temp);
+                return temp;
+            }
+        }
+        public bool InvertYAxis
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(CameraActor.Property.INVERT_Y_AXIS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+    public enum CameraType
+    {
+        FreeLook,
+        LookAtTarget
+    }
+
+    public enum ProjectionMode
+    {
+        PerspectiveProjection,
+        OrthographicProjection
+    }
+
+}

diff --git a/Tizen.NUI/src/public/CustomView.cs b/Tizen.NUI/src/public/CustomView.cs
index c371734..e9c5042 100755 (executable)
--- a/Tizen.NUI/src/public/CustomView.cs
+++ b/Tizen.NUI/src/public/CustomView.cs
@@ -1,876 +1,876 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-namespace Tizen.NUI\r
-{\r
-    public class CustomView : ViewWrapper\r
-    {\r
-        public CustomView(ViewBehaviour behaviour) : base(new ViewWrapperImpl(behaviour))\r
-        {\r
-            // Registering CustomView virtual functions to viewWrapperImpl delegates.\r
-            viewWrapperImpl.OnStageConnection = new ViewWrapperImpl.OnStageConnectionDelegate(OnStageConnection);\r
-            viewWrapperImpl.OnStageDisconnection = new ViewWrapperImpl.OnStageDisconnectionDelegate(OnStageDisconnection);\r
-            viewWrapperImpl.OnChildAdd = new ViewWrapperImpl.OnChildAddDelegate(OnChildAdd);\r
-            viewWrapperImpl.OnChildRemove = new ViewWrapperImpl.OnChildRemoveDelegate(OnChildRemove);\r
-            viewWrapperImpl.OnPropertySet = new ViewWrapperImpl.OnPropertySetDelegate(OnPropertySet);\r
-            viewWrapperImpl.OnSizeSet = new ViewWrapperImpl.OnSizeSetDelegate(OnSizeSet);\r
-            viewWrapperImpl.OnSizeAnimation = new ViewWrapperImpl.OnSizeAnimationDelegate(OnSizeAnimation);\r
-            viewWrapperImpl.OnTouch = new ViewWrapperImpl.OnTouchDelegate(OnTouch);\r
-            viewWrapperImpl.OnHover = new ViewWrapperImpl.OnHoverDelegate(OnHover);\r
-            viewWrapperImpl.OnKey = new ViewWrapperImpl.OnKeyDelegate(OnKey);\r
-            viewWrapperImpl.OnWheel = new ViewWrapperImpl.OnWheelDelegate(OnWheel);\r
-            viewWrapperImpl.OnRelayout = new ViewWrapperImpl.OnRelayoutDelegate(OnRelayout);\r
-            viewWrapperImpl.OnSetResizePolicy = new ViewWrapperImpl.OnSetResizePolicyDelegate(OnSetResizePolicy);\r
-            viewWrapperImpl.GetNaturalSize = new ViewWrapperImpl.GetNaturalSizeDelegate(GetNaturalSize);\r
-            viewWrapperImpl.CalculateChildSize = new ViewWrapperImpl.CalculateChildSizeDelegate(CalculateChildSize);\r
-            viewWrapperImpl.GetHeightForWidth = new ViewWrapperImpl.GetHeightForWidthDelegate(GetHeightForWidth);\r
-            viewWrapperImpl.GetWidthForHeight = new ViewWrapperImpl.GetWidthForHeightDelegate(GetWidthForHeight);\r
-            viewWrapperImpl.RelayoutDependentOnChildrenDimension = new ViewWrapperImpl.RelayoutDependentOnChildrenDimensionDelegate(RelayoutDependentOnChildren);\r
-            viewWrapperImpl.RelayoutDependentOnChildren = new ViewWrapperImpl.RelayoutDependentOnChildrenDelegate(RelayoutDependentOnChildren);\r
-            viewWrapperImpl.OnCalculateRelayoutSize = new ViewWrapperImpl.OnCalculateRelayoutSizeDelegate(OnCalculateRelayoutSize);\r
-            viewWrapperImpl.OnLayoutNegotiated = new ViewWrapperImpl.OnLayoutNegotiatedDelegate(OnLayoutNegotiated);\r
-            viewWrapperImpl.OnControlChildAdd = new ViewWrapperImpl.OnControlChildAddDelegate(OnControlChildAdd);\r
-            viewWrapperImpl.OnControlChildRemove = new ViewWrapperImpl.OnControlChildRemoveDelegate(OnControlChildRemove);\r
-            viewWrapperImpl.OnStyleChange = new ViewWrapperImpl.OnStyleChangeDelegate(OnStyleChange);\r
-            viewWrapperImpl.OnAccessibilityActivated = new ViewWrapperImpl.OnAccessibilityActivatedDelegate(OnAccessibilityActivated);\r
-            viewWrapperImpl.OnAccessibilityPan = new ViewWrapperImpl.OnAccessibilityPanDelegate(OnAccessibilityPan);\r
-            viewWrapperImpl.OnAccessibilityTouch = new ViewWrapperImpl.OnAccessibilityTouchDelegate(OnAccessibilityTouch);\r
-            viewWrapperImpl.OnAccessibilityValueChange = new ViewWrapperImpl.OnAccessibilityValueChangeDelegate(OnAccessibilityValueChange);\r
-            viewWrapperImpl.OnAccessibilityZoom = new ViewWrapperImpl.OnAccessibilityZoomDelegate(OnAccessibilityZoom);\r
-            viewWrapperImpl.OnKeyInputFocusGained = new ViewWrapperImpl.OnKeyInputFocusGainedDelegate(OnFocusGained);\r
-            viewWrapperImpl.OnKeyInputFocusLost = new ViewWrapperImpl.OnKeyInputFocusLostDelegate(OnFocusLost);\r
-            viewWrapperImpl.GetNextFocusableView = new ViewWrapperImpl.GetNextFocusableViewDelegate(GetNextFocusableView);\r
-            viewWrapperImpl.OnFocusChangeCommitted = new ViewWrapperImpl.OnFocusChangeCommittedDelegate(OnFocusChangeCommitted);\r
-            viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyEnter);\r
-            viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch);\r
-            viewWrapperImpl.OnPan = new ViewWrapperImpl.OnPanDelegate(OnPan);\r
-            viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap);\r
-            viewWrapperImpl.OnLongPress = new ViewWrapperImpl.OnLongPressDelegate(OnLongPress);\r
-            viewWrapperImpl.SignalConnected = new ViewWrapperImpl.SignalConnectedDelegate(SignalConnected);\r
-            viewWrapperImpl.SignalDisconnected = new ViewWrapperImpl.SignalDisconnectedDelegate(SignalDisconnected);\r
-\r
-            // Make sure CustomView is initialized.\r
-            OnInitialize();\r
-\r
-            // Make sure the style of actors/visuals initialized above are applied by the style manager.\r
-            viewWrapperImpl.ApplyThemeStyle();\r
-        }\r
-\r
-        /**\r
-         * @brief Set the background with a property map.\r
-         *\r
-         * @param[in] map The background property map.\r
-         */\r
-        public void SetBackground(Tizen.NUI.PropertyMap map)\r
-        {\r
-            viewWrapperImpl.SetBackground(map);\r
-        }\r
-\r
-        /**\r
-         * @brief Allows deriving classes to enable any of the gesture detectors that are available.\r
-         *\r
-         * Gesture detection can be enabled one at a time or in bitwise format as shown:\r
-         * @code\r
-         * EnableGestureDetection(Gesture.Type.Pinch | Gesture.Type.Tap | Gesture.Type.Pan));\r
-         * @endcode\r
-         * @param[in]  type  The gesture type(s) to enable.\r
-         */\r
-        internal void EnableGestureDetection(Gesture.GestureType type)\r
-        {\r
-            viewWrapperImpl.EnableGestureDetection(type);\r
-        }\r
-\r
-        /**\r
-         * @brief Allows deriving classes to disable any of the gesture detectors.\r
-         *\r
-         * Like EnableGestureDetection, this can also be called using bitwise or.\r
-         * @param[in]  type  The gesture type(s) to disable.\r
-         * @see EnableGetureDetection\r
-         */\r
-        internal void DisableGestureDetection(Gesture.GestureType type)\r
-        {\r
-            viewWrapperImpl.DisableGestureDetection(type);\r
-        }\r
-\r
-        /**\r
-         * @brief Sets whether this control supports two dimensional\r
-         * keyboard navigation (i.e. whether it knows how to handle the\r
-         * keyboard focus movement between its child actors).\r
-         *\r
-         * The control doesn't support it by default.\r
-         * @param[in] isSupported Whether this control supports two dimensional keyboard navigation.\r
-         */\r
-\r
-        public bool FocusNavigationSupport\r
-        {\r
-            get\r
-            {\r
-                return IsKeyboardNavigationSupported();\r
-            }\r
-            set\r
-            {\r
-                SetKeyboardNavigationSupport(value);\r
-            }\r
-        }\r
-\r
-        internal void SetKeyboardNavigationSupport(bool isSupported)\r
-        {\r
-            viewWrapperImpl.SetKeyboardNavigationSupport(isSupported);\r
-        }\r
-\r
-\r
-        /**\r
-         * @brief Gets whether this control supports two dimensional keyboard navigation.\r
-         *\r
-         * @return true if this control supports two dimensional keyboard navigation.\r
-         */\r
-        internal bool IsKeyboardNavigationSupported()\r
-        {\r
-            return viewWrapperImpl.IsKeyboardNavigationSupported();\r
-        }\r
-\r
-\r
-        public bool FocusGroup\r
-        {\r
-            get\r
-            {\r
-                return IsKeyboardFocusGroup();\r
-            }\r
-            set\r
-            {\r
-                SetAsKeyboardFocusGroup(value);\r
-            }\r
-        }\r
-\r
-        /**\r
-         * @brief Sets whether this control is a focus group for keyboard navigation.\r
-         *\r
-         * (i.e. the scope of keyboard focus movement\r
-         * can be limitied to its child actors). The control is not a focus group by default.\r
-         * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation.\r
-         */\r
-        internal void SetAsKeyboardFocusGroup(bool isFocusGroup)\r
-        {\r
-            viewWrapperImpl.SetAsKeyboardFocusGroup(isFocusGroup);\r
-        }\r
-\r
-        /**\r
-         * @brief Gets whether this control is a focus group for keyboard navigation.\r
-         *\r
-         * @return true if this control is set as a focus group for keyboard navigation.\r
-         */\r
-        internal bool IsKeyboardFocusGroup()\r
-        {\r
-            return viewWrapperImpl.IsKeyboardFocusGroup();\r
-        }\r
-\r
-        /**\r
-         * @brief Called by the AccessibilityManager to activate the Control.\r
-         * @SINCE_1_0.0\r
-         */\r
-        internal void AccessibilityActivate()\r
-        {\r
-            viewWrapperImpl.AccessibilityActivate();\r
-        }\r
-\r
-        /**\r
-         * @brief Called by the KeyboardFocusManager.\r
-         */\r
-        public void KeyboardEnter()\r
-        {\r
-            viewWrapperImpl.KeyboardEnter();\r
-        }\r
-\r
-        /**\r
-         * @brief Called by the KeyInputFocusManager to emit key event signals.\r
-         *\r
-         * @param[in] key The key event.\r
-         * @return True if the event was consumed.\r
-         */\r
-        public bool EmitKeyEventSignal(Key key)\r
-        {\r
-            return viewWrapperImpl.EmitKeyEventSignal(key);\r
-        }\r
-\r
-        /**\r
-         * @brief Request a relayout, which means performing a size negotiation on this actor, its parent and children (and potentially whole scene).\r
-         *\r
-         * This method can also be called from a derived class every time it needs a different size.\r
-         * At the end of event processing, the relayout process starts and\r
-         * all controls which requested Relayout will have their sizes (re)negotiated.\r
-         *\r
-         * @note RelayoutRequest() can be called multiple times; the size negotiation is still\r
-         * only performed once, i.e. there is no need to keep track of this in the calling side.\r
-         */\r
-        protected void RelayoutRequest()\r
-        {\r
-            viewWrapperImpl.RelayoutRequest();\r
-        }\r
-\r
-        /**\r
-         * @brief Provides the Actor implementation of GetHeightForWidth.\r
-         * @param width Width to use.\r
-         * @return The height based on the width.\r
-         */\r
-        protected float GetHeightForWidthBase(float width)\r
-        {\r
-            return viewWrapperImpl.GetHeightForWidthBase(width);\r
-        }\r
-\r
-        /**\r
-         * @brief Provides the Actor implementation of GetWidthForHeight.\r
-         * @param height Height to use.\r
-         * @return The width based on the height.\r
-         */\r
-        protected float GetWidthForHeightBase(float height)\r
-        {\r
-            return viewWrapperImpl.GetWidthForHeightBase(height);\r
-        }\r
-\r
-        /**\r
-         * @brief Calculate the size for a child using the base actor object.\r
-         *\r
-         * @param[in] child The child actor to calculate the size for\r
-         * @param[in] dimension The dimension to calculate the size for. E.g. width or height\r
-         * @return Return the calculated size for the given dimension. If more than one dimension is requested, just return the first one found.\r
-         */\r
-        protected float CalculateChildSizeBase(Actor child, DimensionType dimension)\r
-        {\r
-            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);\r
-        }\r
-\r
-        /**\r
-         * @brief Determine if this actor is dependent on it's children for relayout from the base class.\r
-         *\r
-         * @param dimension The dimension(s) to check for\r
-         * @return Return if the actor is dependent on it's children.\r
-         */\r
-        protected bool RelayoutDependentOnChildrenBase(DimensionType dimension)\r
-        {\r
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);\r
-        }\r
-\r
-        /**\r
-         * @brief Determine if this actor is dependent on it's children for relayout from the base class.\r
-         *\r
-         * @param dimension The dimension(s) to check for\r
-         * @return Return if the actor is dependent on it's children.\r
-         */\r
-        protected bool RelayoutDependentOnChildrenBase()\r
-        {\r
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase();\r
-        }\r
-\r
-        /**\r
-         * @brief Register a visual by Property Index, linking an Actor to visual when required.\r
-         * In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.\r
-         * No parenting is done during registration, this should be done by derived class.\r
-         *\r
-         * @param[in] index The Property index of the visual, used to reference visual\r
-         * @param[in] visual The visual to register\r
-         * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage.\r
-         *       Use below API with enabled set to false if derived class wishes to control when visual is staged.\r
-         */\r
-        protected void RegisterVisual(int index, VisualBase visual)\r
-        {\r
-            viewWrapperImpl.RegisterVisual(index, visual);\r
-        }\r
-\r
-        /**\r
-         * @brief Register a visual by Property Index, linking an Actor to visual when required.\r
-         * In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.\r
-         * If enabled is false then the visual is not set on stage until enabled by the derived class.\r
-         * @see EnableVisual\r
-         *\r
-         * @param[in] index The Property index of the visual, used to reference visual\r
-         * @param[in] visual The visual to register\r
-         * @param[in] enabled false if derived class wants to control when visual is set on stage.\r
-         *\r
-         */\r
-        protected void RegisterVisual(int index, VisualBase visual, bool enabled)\r
-        {\r
-            viewWrapperImpl.RegisterVisual(index, visual, enabled);\r
-        }\r
-\r
-        /**\r
-         * @brief Erase the entry matching the given index from the list of registered visuals\r
-         * @param[in] index The Property index of the visual, used to reference visual\r
-         *\r
-         */\r
-        protected void UnregisterVisual(int index)\r
-        {\r
-            viewWrapperImpl.UnregisterVisual(index);\r
-        }\r
-\r
-        /**\r
-         * @brief Retrieve the visual associated with the given property index.\r
-         *\r
-         * @param[in] index The Property index of the visual.\r
-         * @return The registered visual if exist, otherwise empty handle.\r
-         * @note For managing object life-cycle, do not store the returned visual as a member which increments its reference count.\r
-         */\r
-        protected VisualBase GetVisual(int index)\r
-        {\r
-            return viewWrapperImpl.GetVisual(index);\r
-        }\r
-\r
-        /**\r
-         * @brief Sets the given visual to be displayed or not when parent staged.\r
-         *\r
-         * @param[in] index The Property index of the visual\r
-         * @param[in] enable flag to set enabled or disabled.\r
-         */\r
-        protected void EnableVisual(int index, bool enable)\r
-        {\r
-            viewWrapperImpl.EnableVisual(index, enable);\r
-        }\r
-\r
-        /**\r
-         * @brief Queries if the given visual is to be displayed when parent staged.\r
-         *\r
-         * @param[in] index The Property index of the visual\r
-         * @return bool whether visual is enabled or not\r
-         */\r
-        protected bool IsVisualEnabled(int index)\r
-        {\r
-            return viewWrapperImpl.IsVisualEnabled(index);\r
-        }\r
-\r
-        /**\r
-         * @brief Create a transition effect on the control.\r
-         *\r
-         * @param[in] transitionData The transition data describing the effect to create\r
-         * @return A handle to an animation defined with the given effect, or an empty\r
-         * handle if no properties match.\r
-         */\r
-        protected Animation CreateTransition(TransitionData transitionData)\r
-        {\r
-            return viewWrapperImpl.CreateTransition(transitionData);\r
-        }\r
-\r
-        /**\r
-         * @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal\r
-         *\r
-         * Should be called last by the control after it acts on the Input Focus change.\r
-         *\r
-         * @param[in] focusGained True if gained, False if lost\r
-         */\r
-        protected void EmitKeyInputFocusSignal(bool focusGained)\r
-        {\r
-            viewWrapperImpl.EmitKeyInputFocusSignal(focusGained);\r
-        }\r
-\r
-        /**\r
-         * @brief This method is called after the Control has been initialized.\r
-         *\r
-         * Derived classes should do any second phase initialization by overriding this method.\r
-         */\r
-        public virtual void OnInitialize()\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called after the actor has been connected to the stage.\r
-         *\r
-         * When an actor is connected, it will be directly or indirectly parented to the root Actor.\r
-         * @param[in] depth The depth in the hierarchy for the actor\r
-         *\r
-         * @note The root Actor is provided automatically by Dali::Stage, and is always considered to be connected.\r
-         * When the parent of a set of actors is connected to the stage, then all of the children\r
-         * will received this callback.\r
-         * For the following actor tree, the callback order will be A, B, D, E, C, and finally F.\r
-         *\r
-         * @code\r
-         *\r
-         *       A (parent)\r
-         *      / \\r
-         *     B   C\r
-         *    / \   \\r
-         *   D   E   F\r
-         *\r
-         * @endcode\r
-         * @param[in] depth The depth in the hierarchy for the actor\r
-         */\r
-        public virtual void OnStageConnection(int depth)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called after the actor has been disconnected from Stage.\r
-         *\r
-         * If an actor is disconnected it either has no parent, or is parented to a disconnected actor.\r
-         *\r
-         * @note When the parent of a set of actors is disconnected to the stage, then all of the children\r
-         * will received this callback, starting with the leaf actors.\r
-         * For the following actor tree, the callback order will be D, E, B, F, C, and finally A.\r
-         *\r
-         * @code\r
-         *\r
-         *       A (parent)\r
-         *      / \\r
-         *     B   C\r
-         *    / \   \\r
-         *   D   E   F\r
-         *\r
-         * @endcode\r
-         */\r
-        public virtual void OnStageDisconnection()\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called after a child has been added to the owning actor.\r
-         *\r
-         * @param[in] child The child which has been added\r
-         */\r
-        public virtual void OnChildAdd(Actor actor)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called after the owning actor has attempted to remove a child( regardless of whether it succeeded or not ).\r
-         *\r
-         * @param[in] child The child being removed\r
-         */\r
-        public virtual void OnChildRemove(Actor actor)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called when the owning actor property is set.\r
-         *\r
-         * @param[in] index The Property index that was set\r
-         * @param[in] propertyValue The value to set\r
-         */\r
-        public virtual void OnPropertySet(int index, Tizen.NUI.PropertyValue propertyValue)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called when the owning actor's size is set e.g. using Actor::SetSize().\r
-         *\r
-         * @param[in] targetSize The target size. Note that this target size may not match the size returned via Actor.GetTargetSize.\r
-         */\r
-        public virtual void OnSizeSet(Vector3 targetSize)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called when the owning actor's size is animated e.g. using Animation::AnimateTo( Property( actor, Actor::Property::SIZE ), ... ).\r
-         *\r
-         * @param[in] animation The object which is animating the owning actor.\r
-         * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor.GetTargetSize.\r
-         */\r
-        public virtual void OnSizeAnimation(Animation animation, Vector3 targetSize)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @DEPRECATED_1_1.37 Connect to TouchSignal() instead.\r
-         *\r
-         * @brief Called after a touch-event is received by the owning actor.\r
-         *\r
-         * @param[in] touch The touch event\r
-         * @return True if the event should be consumed.\r
-         * @note CustomViewBehaviour.REQUIRES_TOUCH_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).\r
-         */\r
-        public virtual bool OnTouch(Touch touch)\r
-        {\r
-            return false; // Do not consume\r
-        }\r
-\r
-        /**\r
-         * @brief Called after a hover-event is received by the owning actor.\r
-         *\r
-         * @param[in] hover The hover event\r
-         * @return True if the hover event should be consumed.\r
-         * @note CustomViewBehaviour.REQUIRES_HOVER_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).\r
-         */\r
-        public virtual bool OnHover(Hover hover)\r
-        {\r
-            return false; // Do not consume\r
-        }\r
-\r
-        /**\r
-         * @brief Called after a key-event is received by the actor that has had its focus set.\r
-         *\r
-         * @param[in] key the Key Event\r
-         * @return True if the event should be consumed.\r
-         */\r
-        public virtual bool OnKey(Key key)\r
-        {\r
-            return false; // Do not consume\r
-        }\r
-\r
-        /**\r
-         * @brief Called after a wheel-event is received by the owning actor.\r
-         *\r
-         * @param[in] wheel The wheel event\r
-         * @return True if the event should be consumed.\r
-         * @note CustomViewBehaviour.REQUIRES_WHEEL_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).\r
-         */\r
-        public virtual bool OnWheel(Wheel wheel)\r
-        {\r
-            return false; // Do not consume\r
-        }\r
-\r
-        /**\r
-         * @brief Called after the size negotiation has been finished for this control.\r
-         *\r
-         * The control is expected to assign this given size to itself/its children.\r
-         *\r
-         * Should be overridden by derived classes if they need to layout\r
-         * actors differently after certain operations like add or remove\r
-         * actors, resize or after changing specific properties.\r
-         *\r
-         * @param[in]      size       The allocated size.\r
-         * @param[in,out]  container  The control should add actors to this container that it is not able\r
-         *                            to allocate a size for.\r
-         * @note  As this function is called from inside the size negotiation algorithm, you cannot\r
-         * call RequestRelayout (the call would just be ignored).\r
-         */\r
-        public virtual void OnRelayout(Vector2 size, RelayoutContainer container)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Notification for deriving classes\r
-         *\r
-         * @param[in] policy The policy being set\r
-         * @param[in] dimension The dimension the policy is being set for\r
-         */\r
-        public virtual void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Return the natural size of the actor.\r
-         *\r
-         * @return The actor's natural size\r
-         */\r
-        public virtual Size GetNaturalSize()\r
-        {\r
-            return new Size(0.0f, 0.0f, 0.0f);\r
-        }\r
-\r
-        /**\r
-         * @brief Calculate the size for a child.\r
-         *\r
-         * @param[in] child The child actor to calculate the size for\r
-         * @param[in] dimension The dimension to calculate the size for. E.g. width or height.\r
-         * @return Return the calculated size for the given dimension.\r
-         */\r
-        public virtual float CalculateChildSize(Actor child, DimensionType dimension)\r
-        {\r
-            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);\r
-        }\r
-\r
-        /**\r
-         * @brief This method is called during size negotiation when a height is required for a given width.\r
-         *\r
-         * Derived classes should override this if they wish to customize the height returned.\r
-         *\r
-         * @param width Width to use.\r
-         * @return The height based on the width.\r
-         */\r
-        public virtual float GetHeightForWidth(float width)\r
-        {\r
-            return viewWrapperImpl.GetHeightForWidthBase(width);\r
-        }\r
-\r
-        /**\r
-         * @brief This method is called during size negotiation when a width is required for a given height.\r
-         *\r
-         * Derived classes should override this if they wish to customize the width returned.\r
-         *\r
-         * @param height Height to use.\r
-         * @return The width based on the width.\r
-         */\r
-        public virtual float GetWidthForHeight(float height)\r
-        {\r
-            return viewWrapperImpl.GetWidthForHeightBase(height);\r
-        }\r
-\r
-        /**\r
-         * @brief Determine if this actor is dependent on it's children for relayout.\r
-         *\r
-         * @param dimension The dimension(s) to check for\r
-         * @return Return if the actor is dependent on it's children.\r
-         */\r
-        public virtual bool RelayoutDependentOnChildren(DimensionType dimension)\r
-        {\r
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);\r
-        }\r
-\r
-        /**\r
-         * @brief Determine if this actor is dependent on it's children for relayout from the base class.\r
-         *\r
-         * @return Return if the actor is dependent on it's children.\r
-         */\r
-        public virtual bool RelayoutDependentOnChildren()\r
-        {\r
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase();\r
-        }\r
-\r
-        /**\r
-         * @brief Virtual method to notify deriving classes that relayout dependencies have been\r
-         * met and the size for this object is about to be calculated for the given dimension\r
-         *\r
-         * @param dimension The dimension that is about to be calculated\r
-         */\r
-        public virtual void OnCalculateRelayoutSize(DimensionType dimension)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Virtual method to notify deriving classes that the size for a dimension\r
-         * has just been negotiated\r
-         *\r
-         * @param[in] size The new size for the given dimension\r
-         * @param[in] dimension The dimension that was just negotiated\r
-         */\r
-        public virtual void OnLayoutNegotiated(float size, DimensionType dimension)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes requiring notifications when the style changes.\r
-         *\r
-         * @param[in] styleManager  The StyleManager object.\r
-         * @param[in] change  Information denoting what has changed.\r
-         */\r
-        public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief This method is called when the control is accessibility activated.\r
-         *\r
-         * Derived classes should override this to perform custom accessibility activation.\r
-         * @return true if this control can perform accessibility activation.\r
-         */\r
-        internal virtual bool OnAccessibilityActivated()\r
-        {\r
-            return false;\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes when they wish to respond the accessibility\r
-         * pan gesture.\r
-         *\r
-         * @param[in] gesture The pan gesture.\r
-         * @return true if the pan gesture has been consumed by this control\r
-         */\r
-        internal virtual bool OnAccessibilityPan(PanGesture gestures)\r
-        {\r
-            return false;\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes when they wish to respond the accessibility\r
-         * touch event.\r
-         *\r
-         * @param[in] touch The touch event.\r
-         * @return true if the touch event has been consumed by this control\r
-         */\r
-        internal virtual bool OnAccessibilityTouch(Touch touch)\r
-        {\r
-            return false;\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes when they wish to respond\r
-         * the accessibility up and down action (i.e. value change of slider control).\r
-         *\r
-         * @param[in] isIncrease Whether the value should be increased or decreased\r
-         * @return true if the value changed action has been consumed by this control\r
-         */\r
-        internal virtual bool OnAccessibilityValueChange(bool isIncrease)\r
-        {\r
-            return false;\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes when they wish to respond\r
-         * the accessibility zoom action.\r
-         *\r
-         * @return true if the zoom action has been consumed by this control\r
-         */\r
-        internal virtual bool OnAccessibilityZoom()\r
-        {\r
-            return false;\r
-        }\r
-\r
-        /**\r
-         * @brief This method should be overridden by deriving classes when they wish to respond\r
-         * the accessibility zoom action.\r
-         *\r
-         * @return true if the zoom action has been consumed by this control\r
-         */\r
-        public virtual void OnFocusGained()\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called when the control loses key input focus.\r
-         *\r
-         * Should be overridden by derived classes if they need to customize what happens when focus is lost.\r
-         */\r
-        public virtual void OnFocusLost()\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Gets the next keyboard focusable actor in this control towards the given direction.\r
-         *\r
-         * A control needs to override this function in order to support two dimensional keyboard navigation.\r
-         * @param[in] currentFocusedActor The current focused actor.\r
-         * @param[in] direction The direction to move the focus towards.\r
-         * @param[in] loopEnabled Whether the focus movement should be looped within the control.\r
-         * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.\r
-         */\r
-        public virtual View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)\r
-        {\r
-            return new View();\r
-        }\r
-\r
-        /**\r
-         * @brief Informs this control that its chosen focusable actor will be focused.\r
-         *\r
-         * This allows the application to preform any actions if wishes\r
-         * before the focus is actually moved to the chosen actor.\r
-         *\r
-         * @param[in] commitedFocusableActor The commited focusable actor.\r
-         */\r
-        public virtual void OnFocusChangeCommitted(View commitedFocusableView)\r
-        {\r
-        }\r
-\r
-\r
-        /**\r
-         * @brief This method is called when the control has enter pressed on it.\r
-         *\r
-         * Derived classes should override this to perform custom actions.\r
-         * @return true if this control supported this action.\r
-         */\r
-        public virtual bool OnKeyEnter()\r
-        {\r
-            return false;\r
-        }\r
-\r
-\r
-        /**\r
-         * @brief Called whenever a pinch gesture is detected on this control.\r
-         *\r
-         * This can be overridden by deriving classes when pinch detection\r
-         * is enabled.  The default behaviour is to scale the control by the\r
-         * pinch scale.\r
-         *\r
-         * @param[in]  pinch  The pinch gesture.\r
-         * @note If overridden, then the default behaviour will not occur.\r
-         * @note Pinch detection should be enabled via EnableGestureDetection().\r
-         * @see EnableGestureDetection\r
-         */\r
-        internal virtual void OnPinch(PinchGesture pinch)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called whenever a pan gesture is detected on this control.\r
-         *\r
-         * This should be overridden by deriving classes when pan detection\r
-         * is enabled.\r
-         *\r
-         * @param[in]  pan  The pan gesture.\r
-         * @note There is no default behaviour with panning.\r
-         * @note Pan detection should be enabled via EnableGestureDetection().\r
-         * @see EnableGestureDetection\r
-         */\r
-        internal virtual void OnPan(PanGesture pan)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called whenever a tap gesture is detected on this control.\r
-         *\r
-         * This should be overridden by deriving classes when tap detection\r
-         * is enabled.\r
-         *\r
-         * @param[in]  tap  The tap gesture.\r
-         * @note There is no default behaviour with a tap.\r
-         * @note Tap detection should be enabled via EnableGestureDetection().\r
-         * @see EnableGestureDetection\r
-         */\r
-        internal virtual void OnTap(TapGesture tap)\r
-        {\r
-        }\r
-\r
-        /**\r
-         * @brief Called whenever a long press gesture is detected on this control.\r
-         *\r
-         * This should be overridden by deriving classes when long press\r
-         * detection is enabled.\r
-         *\r
-         * @param[in]  longPress  The long press gesture.\r
-         * @note There is no default behaviour associated with a long press.\r
-         * @note Long press detection should be enabled via EnableGestureDetection().\r
-         * @see EnableGestureDetection\r
-         */\r
-        internal virtual void OnLongPress(LongPressGesture longPress)\r
-        {\r
-        }\r
-\r
-        private void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)\r
-        {\r
-        }\r
-\r
-        private void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)\r
-        {\r
-        }\r
-\r
-        private void OnControlChildAdd(Actor child)\r
-        {\r
-        }\r
-\r
-        private void OnControlChildRemove(Actor child)\r
-        {\r
-        }\r
-    }\r
-    public enum ViewBehaviour\r
-    {\r
-        ViewBehaviourDefault = 0,\r
-        DisableSizeNegotiation = 1 << 0,\r
-        RequiresKeyboardNavigationSupport = 1 << 5,\r
-        DisableStyleChangeSignals = 1 << 6,\r
-        LastViewBehaviourFlag\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+    public class CustomView : ViewWrapper
+    {
+        public CustomView(string typeName, ViewBehaviour behaviour) : base(typeName, new ViewWrapperImpl(behaviour))
+        {
+            // Registering CustomView virtual functions to viewWrapperImpl delegates.
+            viewWrapperImpl.OnStageConnection = new ViewWrapperImpl.OnStageConnectionDelegate(OnStageConnection);
+            viewWrapperImpl.OnStageDisconnection = new ViewWrapperImpl.OnStageDisconnectionDelegate(OnStageDisconnection);
+            viewWrapperImpl.OnChildAdd = new ViewWrapperImpl.OnChildAddDelegate(OnChildAdd);
+            viewWrapperImpl.OnChildRemove = new ViewWrapperImpl.OnChildRemoveDelegate(OnChildRemove);
+            viewWrapperImpl.OnPropertySet = new ViewWrapperImpl.OnPropertySetDelegate(OnPropertySet);
+            viewWrapperImpl.OnSizeSet = new ViewWrapperImpl.OnSizeSetDelegate(OnSizeSet);
+            viewWrapperImpl.OnSizeAnimation = new ViewWrapperImpl.OnSizeAnimationDelegate(OnSizeAnimation);
+            viewWrapperImpl.OnTouch = new ViewWrapperImpl.OnTouchDelegate(OnTouch);
+            viewWrapperImpl.OnHover = new ViewWrapperImpl.OnHoverDelegate(OnHover);
+            viewWrapperImpl.OnKey = new ViewWrapperImpl.OnKeyDelegate(OnKey);
+            viewWrapperImpl.OnWheel = new ViewWrapperImpl.OnWheelDelegate(OnWheel);
+            viewWrapperImpl.OnRelayout = new ViewWrapperImpl.OnRelayoutDelegate(OnRelayout);
+            viewWrapperImpl.OnSetResizePolicy = new ViewWrapperImpl.OnSetResizePolicyDelegate(OnSetResizePolicy);
+            viewWrapperImpl.GetNaturalSize = new ViewWrapperImpl.GetNaturalSizeDelegate(GetNaturalSize);
+            viewWrapperImpl.CalculateChildSize = new ViewWrapperImpl.CalculateChildSizeDelegate(CalculateChildSize);
+            viewWrapperImpl.GetHeightForWidth = new ViewWrapperImpl.GetHeightForWidthDelegate(GetHeightForWidth);
+            viewWrapperImpl.GetWidthForHeight = new ViewWrapperImpl.GetWidthForHeightDelegate(GetWidthForHeight);
+            viewWrapperImpl.RelayoutDependentOnChildrenDimension = new ViewWrapperImpl.RelayoutDependentOnChildrenDimensionDelegate(RelayoutDependentOnChildren);
+            viewWrapperImpl.RelayoutDependentOnChildren = new ViewWrapperImpl.RelayoutDependentOnChildrenDelegate(RelayoutDependentOnChildren);
+            viewWrapperImpl.OnCalculateRelayoutSize = new ViewWrapperImpl.OnCalculateRelayoutSizeDelegate(OnCalculateRelayoutSize);
+            viewWrapperImpl.OnLayoutNegotiated = new ViewWrapperImpl.OnLayoutNegotiatedDelegate(OnLayoutNegotiated);
+            viewWrapperImpl.OnControlChildAdd = new ViewWrapperImpl.OnControlChildAddDelegate(OnControlChildAdd);
+            viewWrapperImpl.OnControlChildRemove = new ViewWrapperImpl.OnControlChildRemoveDelegate(OnControlChildRemove);
+            viewWrapperImpl.OnStyleChange = new ViewWrapperImpl.OnStyleChangeDelegate(OnStyleChange);
+            viewWrapperImpl.OnAccessibilityActivated = new ViewWrapperImpl.OnAccessibilityActivatedDelegate(OnAccessibilityActivated);
+            viewWrapperImpl.OnAccessibilityPan = new ViewWrapperImpl.OnAccessibilityPanDelegate(OnAccessibilityPan);
+            viewWrapperImpl.OnAccessibilityTouch = new ViewWrapperImpl.OnAccessibilityTouchDelegate(OnAccessibilityTouch);
+            viewWrapperImpl.OnAccessibilityValueChange = new ViewWrapperImpl.OnAccessibilityValueChangeDelegate(OnAccessibilityValueChange);
+            viewWrapperImpl.OnAccessibilityZoom = new ViewWrapperImpl.OnAccessibilityZoomDelegate(OnAccessibilityZoom);
+            viewWrapperImpl.OnKeyInputFocusGained = new ViewWrapperImpl.OnKeyInputFocusGainedDelegate(OnFocusGained);
+            viewWrapperImpl.OnKeyInputFocusLost = new ViewWrapperImpl.OnKeyInputFocusLostDelegate(OnFocusLost);
+            viewWrapperImpl.GetNextFocusableView = new ViewWrapperImpl.GetNextFocusableViewDelegate(GetNextFocusableView);
+            viewWrapperImpl.OnFocusChangeCommitted = new ViewWrapperImpl.OnFocusChangeCommittedDelegate(OnFocusChangeCommitted);
+            viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyEnter);
+            viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch);
+            viewWrapperImpl.OnPan = new ViewWrapperImpl.OnPanDelegate(OnPan);
+            viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap);
+            viewWrapperImpl.OnLongPress = new ViewWrapperImpl.OnLongPressDelegate(OnLongPress);
+            viewWrapperImpl.SignalConnected = new ViewWrapperImpl.SignalConnectedDelegate(SignalConnected);
+            viewWrapperImpl.SignalDisconnected = new ViewWrapperImpl.SignalDisconnectedDelegate(SignalDisconnected);
+
+            // Make sure CustomView is initialized.
+            OnInitialize();
+
+            // Make sure the style of actors/visuals initialized above are applied by the style manager.
+            viewWrapperImpl.ApplyThemeStyle();
+        }
+
+        /**
+         * @brief Set the background with a property map.
+         *
+         * @param[in] map The background property map.
+         */
+        public void SetBackground(Tizen.NUI.PropertyMap map)
+        {
+            viewWrapperImpl.SetBackground(map);
+        }
+
+        /**
+         * @brief Allows deriving classes to enable any of the gesture detectors that are available.
+         *
+         * Gesture detection can be enabled one at a time or in bitwise format as shown:
+         * @code
+         * EnableGestureDetection(Gesture.Type.Pinch | Gesture.Type.Tap | Gesture.Type.Pan));
+         * @endcode
+         * @param[in]  type  The gesture type(s) to enable.
+         */
+        internal void EnableGestureDetection(Gesture.GestureType type)
+        {
+            viewWrapperImpl.EnableGestureDetection(type);
+        }
+
+        /**
+         * @brief Allows deriving classes to disable any of the gesture detectors.
+         *
+         * Like EnableGestureDetection, this can also be called using bitwise or.
+         * @param[in]  type  The gesture type(s) to disable.
+         * @see EnableGetureDetection
+         */
+        internal void DisableGestureDetection(Gesture.GestureType type)
+        {
+            viewWrapperImpl.DisableGestureDetection(type);
+        }
+
+        /**
+         * @brief Sets whether this control supports two dimensional
+         * keyboard navigation (i.e. whether it knows how to handle the
+         * keyboard focus movement between its child actors).
+         *
+         * The control doesn't support it by default.
+         * @param[in] isSupported Whether this control supports two dimensional keyboard navigation.
+         */
+
+        public bool FocusNavigationSupport
+        {
+            get
+            {
+                return IsKeyboardNavigationSupported();
+            }
+            set
+            {
+                SetKeyboardNavigationSupport(value);
+            }
+        }
+
+        internal void SetKeyboardNavigationSupport(bool isSupported)
+        {
+            viewWrapperImpl.SetKeyboardNavigationSupport(isSupported);
+        }
+
+
+        /**
+         * @brief Gets whether this control supports two dimensional keyboard navigation.
+         *
+         * @return true if this control supports two dimensional keyboard navigation.
+         */
+        internal bool IsKeyboardNavigationSupported()
+        {
+            return viewWrapperImpl.IsKeyboardNavigationSupported();
+        }
+
+
+        public bool FocusGroup
+        {
+            get
+            {
+                return IsKeyboardFocusGroup();
+            }
+            set
+            {
+                SetAsKeyboardFocusGroup(value);
+            }
+        }
+
+        /**
+         * @brief Sets whether this control is a focus group for keyboard navigation.
+         *
+         * (i.e. the scope of keyboard focus movement
+         * can be limitied to its child actors). The control is not a focus group by default.
+         * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation.
+         */
+        internal void SetAsKeyboardFocusGroup(bool isFocusGroup)
+        {
+            viewWrapperImpl.SetAsKeyboardFocusGroup(isFocusGroup);
+        }
+
+        /**
+         * @brief Gets whether this control is a focus group for keyboard navigation.
+         *
+         * @return true if this control is set as a focus group for keyboard navigation.
+         */
+        internal bool IsKeyboardFocusGroup()
+        {
+            return viewWrapperImpl.IsKeyboardFocusGroup();
+        }
+
+        /**
+         * @brief Called by the AccessibilityManager to activate the Control.
+         * @SINCE_1_0.0
+         */
+        internal void AccessibilityActivate()
+        {
+            viewWrapperImpl.AccessibilityActivate();
+        }
+
+        /**
+         * @brief Called by the KeyboardFocusManager.
+         */
+        public void KeyboardEnter()
+        {
+            viewWrapperImpl.KeyboardEnter();
+        }
+
+        /**
+         * @brief Called by the KeyInputFocusManager to emit key event signals.
+         *
+         * @param[in] key The key event.
+         * @return True if the event was consumed.
+         */
+        public bool EmitKeyEventSignal(Key key)
+        {
+            return viewWrapperImpl.EmitKeyEventSignal(key);
+        }
+
+        /**
+         * @brief Request a relayout, which means performing a size negotiation on this actor, its parent and children (and potentially whole scene).
+         *
+         * This method can also be called from a derived class every time it needs a different size.
+         * At the end of event processing, the relayout process starts and
+         * all controls which requested Relayout will have their sizes (re)negotiated.
+         *
+         * @note RelayoutRequest() can be called multiple times; the size negotiation is still
+         * only performed once, i.e. there is no need to keep track of this in the calling side.
+         */
+        protected void RelayoutRequest()
+        {
+            viewWrapperImpl.RelayoutRequest();
+        }
+
+        /**
+         * @brief Provides the Actor implementation of GetHeightForWidth.
+         * @param width Width to use.
+         * @return The height based on the width.
+         */
+        protected float GetHeightForWidthBase(float width)
+        {
+            return viewWrapperImpl.GetHeightForWidthBase(width);
+        }
+
+        /**
+         * @brief Provides the Actor implementation of GetWidthForHeight.
+         * @param height Height to use.
+         * @return The width based on the height.
+         */
+        protected float GetWidthForHeightBase(float height)
+        {
+            return viewWrapperImpl.GetWidthForHeightBase(height);
+        }
+
+        /**
+         * @brief Calculate the size for a child using the base actor object.
+         *
+         * @param[in] child The child actor to calculate the size for
+         * @param[in] dimension The dimension to calculate the size for. E.g. width or height
+         * @return Return the calculated size for the given dimension. If more than one dimension is requested, just return the first one found.
+         */
+        protected float CalculateChildSizeBase(Actor child, DimensionType dimension)
+        {
+            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);
+        }
+
+        /**
+         * @brief Determine if this actor is dependent on it's children for relayout from the base class.
+         *
+         * @param dimension The dimension(s) to check for
+         * @return Return if the actor is dependent on it's children.
+         */
+        protected bool RelayoutDependentOnChildrenBase(DimensionType dimension)
+        {
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);
+        }
+
+        /**
+         * @brief Determine if this actor is dependent on it's children for relayout from the base class.
+         *
+         * @param dimension The dimension(s) to check for
+         * @return Return if the actor is dependent on it's children.
+         */
+        protected bool RelayoutDependentOnChildrenBase()
+        {
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase();
+        }
+
+        /**
+         * @brief Register a visual by Property Index, linking an Actor to visual when required.
+         * In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.
+         * No parenting is done during registration, this should be done by derived class.
+         *
+         * @param[in] index The Property index of the visual, used to reference visual
+         * @param[in] visual The visual to register
+         * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage.
+         *       Use below API with enabled set to false if derived class wishes to control when visual is staged.
+         */
+        protected void RegisterVisual(int index, VisualBase visual)
+        {
+            viewWrapperImpl.RegisterVisual(index, visual);
+        }
+
+        /**
+         * @brief Register a visual by Property Index, linking an Actor to visual when required.
+         * In the case of the visual being an actor or control deeming visual not required then visual should be an empty handle.
+         * If enabled is false then the visual is not set on stage until enabled by the derived class.
+         * @see EnableVisual
+         *
+         * @param[in] index The Property index of the visual, used to reference visual
+         * @param[in] visual The visual to register
+         * @param[in] enabled false if derived class wants to control when visual is set on stage.
+         *
+         */
+        protected void RegisterVisual(int index, VisualBase visual, bool enabled)
+        {
+            viewWrapperImpl.RegisterVisual(index, visual, enabled);
+        }
+
+        /**
+         * @brief Erase the entry matching the given index from the list of registered visuals
+         * @param[in] index The Property index of the visual, used to reference visual
+         *
+         */
+        protected void UnregisterVisual(int index)
+        {
+            viewWrapperImpl.UnregisterVisual(index);
+        }
+
+        /**
+         * @brief Retrieve the visual associated with the given property index.
+         *
+         * @param[in] index The Property index of the visual.
+         * @return The registered visual if exist, otherwise empty handle.
+         * @note For managing object life-cycle, do not store the returned visual as a member which increments its reference count.
+         */
+        protected VisualBase GetVisual(int index)
+        {
+            return viewWrapperImpl.GetVisual(index);
+        }
+
+        /**
+         * @brief Sets the given visual to be displayed or not when parent staged.
+         *
+         * @param[in] index The Property index of the visual
+         * @param[in] enable flag to set enabled or disabled.
+         */
+        protected void EnableVisual(int index, bool enable)
+        {
+            viewWrapperImpl.EnableVisual(index, enable);
+        }
+
+        /**
+         * @brief Queries if the given visual is to be displayed when parent staged.
+         *
+         * @param[in] index The Property index of the visual
+         * @return bool whether visual is enabled or not
+         */
+        protected bool IsVisualEnabled(int index)
+        {
+            return viewWrapperImpl.IsVisualEnabled(index);
+        }
+
+        /**
+         * @brief Create a transition effect on the control.
+         *
+         * @param[in] transitionData The transition data describing the effect to create
+         * @return A handle to an animation defined with the given effect, or an empty
+         * handle if no properties match.
+         */
+        protected Animation CreateTransition(TransitionData transitionData)
+        {
+            return viewWrapperImpl.CreateTransition(transitionData);
+        }
+
+        /**
+         * @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal
+         *
+         * Should be called last by the control after it acts on the Input Focus change.
+         *
+         * @param[in] focusGained True if gained, False if lost
+         */
+        protected void EmitKeyInputFocusSignal(bool focusGained)
+        {
+            viewWrapperImpl.EmitKeyInputFocusSignal(focusGained);
+        }
+
+        /**
+         * @brief This method is called after the Control has been initialized.
+         *
+         * Derived classes should do any second phase initialization by overriding this method.
+         */
+        public virtual void OnInitialize()
+        {
+        }
+
+        /**
+         * @brief Called after the actor has been connected to the stage.
+         *
+         * When an actor is connected, it will be directly or indirectly parented to the root Actor.
+         * @param[in] depth The depth in the hierarchy for the actor
+         *
+         * @note The root Actor is provided automatically by Dali::Stage, and is always considered to be connected.
+         * When the parent of a set of actors is connected to the stage, then all of the children
+         * will received this callback.
+         * For the following actor tree, the callback order will be A, B, D, E, C, and finally F.
+         *
+         * @code
+         *
+         *       A (parent)
+         *      / \
+         *     B   C
+         *    / \   \
+         *   D   E   F
+         *
+         * @endcode
+         * @param[in] depth The depth in the hierarchy for the actor
+         */
+        public virtual void OnStageConnection(int depth)
+        {
+        }
+
+        /**
+         * @brief Called after the actor has been disconnected from Stage.
+         *
+         * If an actor is disconnected it either has no parent, or is parented to a disconnected actor.
+         *
+         * @note When the parent of a set of actors is disconnected to the stage, then all of the children
+         * will received this callback, starting with the leaf actors.
+         * For the following actor tree, the callback order will be D, E, B, F, C, and finally A.
+         *
+         * @code
+         *
+         *       A (parent)
+         *      / \
+         *     B   C
+         *    / \   \
+         *   D   E   F
+         *
+         * @endcode
+         */
+        public virtual void OnStageDisconnection()
+        {
+        }
+
+        /**
+         * @brief Called after a child has been added to the owning actor.
+         *
+         * @param[in] child The child which has been added
+         */
+        public virtual void OnChildAdd(Actor actor)
+        {
+        }
+
+        /**
+         * @brief Called after the owning actor has attempted to remove a child( regardless of whether it succeeded or not ).
+         *
+         * @param[in] child The child being removed
+         */
+        public virtual void OnChildRemove(Actor actor)
+        {
+        }
+
+        /**
+         * @brief Called when the owning actor property is set.
+         *
+         * @param[in] index The Property index that was set
+         * @param[in] propertyValue The value to set
+         */
+        public virtual void OnPropertySet(int index, Tizen.NUI.PropertyValue propertyValue)
+        {
+        }
+
+        /**
+         * @brief Called when the owning actor's size is set e.g. using Actor::SetSize().
+         *
+         * @param[in] targetSize The target size. Note that this target size may not match the size returned via Actor.GetTargetSize.
+         */
+        public virtual void OnSizeSet(Vector3 targetSize)
+        {
+        }
+
+        /**
+         * @brief Called when the owning actor's size is animated e.g. using Animation::AnimateTo( Property( actor, Actor::Property::SIZE ), ... ).
+         *
+         * @param[in] animation The object which is animating the owning actor.
+         * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor.GetTargetSize.
+         */
+        public virtual void OnSizeAnimation(Animation animation, Vector3 targetSize)
+        {
+        }
+
+        /**
+         * @DEPRECATED_1_1.37 Connect to TouchSignal() instead.
+         *
+         * @brief Called after a touch-event is received by the owning actor.
+         *
+         * @param[in] touch The touch event
+         * @return True if the event should be consumed.
+         * @note CustomViewBehaviour.REQUIRES_TOUCH_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
+         */
+        public virtual bool OnTouch(Touch touch)
+        {
+            return false; // Do not consume
+        }
+
+        /**
+         * @brief Called after a hover-event is received by the owning actor.
+         *
+         * @param[in] hover The hover event
+         * @return True if the hover event should be consumed.
+         * @note CustomViewBehaviour.REQUIRES_HOVER_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
+         */
+        public virtual bool OnHover(Hover hover)
+        {
+            return false; // Do not consume
+        }
+
+        /**
+         * @brief Called after a key-event is received by the actor that has had its focus set.
+         *
+         * @param[in] key the Key Event
+         * @return True if the event should be consumed.
+         */
+        public virtual bool OnKey(Key key)
+        {
+            return false; // Do not consume
+        }
+
+        /**
+         * @brief Called after a wheel-event is received by the owning actor.
+         *
+         * @param[in] wheel The wheel event
+         * @return True if the event should be consumed.
+         * @note CustomViewBehaviour.REQUIRES_WHEEL_EVENTS must be enabled during construction. See CustomView(ViewWrapperImpl.CustomViewBehaviour behaviour).
+         */
+        public virtual bool OnWheel(Wheel wheel)
+        {
+            return false; // Do not consume
+        }
+
+        /**
+         * @brief Called after the size negotiation has been finished for this control.
+         *
+         * The control is expected to assign this given size to itself/its children.
+         *
+         * Should be overridden by derived classes if they need to layout
+         * actors differently after certain operations like add or remove
+         * actors, resize or after changing specific properties.
+         *
+         * @param[in]      size       The allocated size.
+         * @param[in,out]  container  The control should add actors to this container that it is not able
+         *                            to allocate a size for.
+         * @note  As this function is called from inside the size negotiation algorithm, you cannot
+         * call RequestRelayout (the call would just be ignored).
+         */
+        public virtual void OnRelayout(Vector2 size, RelayoutContainer container)
+        {
+        }
+
+        /**
+         * @brief Notification for deriving classes
+         *
+         * @param[in] policy The policy being set
+         * @param[in] dimension The dimension the policy is being set for
+         */
+        public virtual void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension)
+        {
+        }
+
+        /**
+         * @brief Return the natural size of the actor.
+         *
+         * @return The actor's natural size
+         */
+        public virtual Size GetNaturalSize()
+        {
+            return new Size(0.0f, 0.0f, 0.0f);
+        }
+
+        /**
+         * @brief Calculate the size for a child.
+         *
+         * @param[in] child The child actor to calculate the size for
+         * @param[in] dimension The dimension to calculate the size for. E.g. width or height.
+         * @return Return the calculated size for the given dimension.
+         */
+        public virtual float CalculateChildSize(Actor child, DimensionType dimension)
+        {
+            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);
+        }
+
+        /**
+         * @brief This method is called during size negotiation when a height is required for a given width.
+         *
+         * Derived classes should override this if they wish to customize the height returned.
+         *
+         * @param width Width to use.
+         * @return The height based on the width.
+         */
+        public virtual float GetHeightForWidth(float width)
+        {
+            return viewWrapperImpl.GetHeightForWidthBase(width);
+        }
+
+        /**
+         * @brief This method is called during size negotiation when a width is required for a given height.
+         *
+         * Derived classes should override this if they wish to customize the width returned.
+         *
+         * @param height Height to use.
+         * @return The width based on the width.
+         */
+        public virtual float GetWidthForHeight(float height)
+        {
+            return viewWrapperImpl.GetWidthForHeightBase(height);
+        }
+
+        /**
+         * @brief Determine if this actor is dependent on it's children for relayout.
+         *
+         * @param dimension The dimension(s) to check for
+         * @return Return if the actor is dependent on it's children.
+         */
+        public virtual bool RelayoutDependentOnChildren(DimensionType dimension)
+        {
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);
+        }
+
+        /**
+         * @brief Determine if this actor is dependent on it's children for relayout from the base class.
+         *
+         * @return Return if the actor is dependent on it's children.
+         */
+        public virtual bool RelayoutDependentOnChildren()
+        {
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase();
+        }
+
+        /**
+         * @brief Virtual method to notify deriving classes that relayout dependencies have been
+         * met and the size for this object is about to be calculated for the given dimension
+         *
+         * @param dimension The dimension that is about to be calculated
+         */
+        public virtual void OnCalculateRelayoutSize(DimensionType dimension)
+        {
+        }
+
+        /**
+         * @brief Virtual method to notify deriving classes that the size for a dimension
+         * has just been negotiated
+         *
+         * @param[in] size The new size for the given dimension
+         * @param[in] dimension The dimension that was just negotiated
+         */
+        public virtual void OnLayoutNegotiated(float size, DimensionType dimension)
+        {
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes requiring notifications when the style changes.
+         *
+         * @param[in] styleManager  The StyleManager object.
+         * @param[in] change  Information denoting what has changed.
+         */
+        public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change)
+        {
+        }
+
+        /**
+         * @brief This method is called when the control is accessibility activated.
+         *
+         * Derived classes should override this to perform custom accessibility activation.
+         * @return true if this control can perform accessibility activation.
+         */
+        internal virtual bool OnAccessibilityActivated()
+        {
+            return false;
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes when they wish to respond the accessibility
+         * pan gesture.
+         *
+         * @param[in] gesture The pan gesture.
+         * @return true if the pan gesture has been consumed by this control
+         */
+        internal virtual bool OnAccessibilityPan(PanGesture gestures)
+        {
+            return false;
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes when they wish to respond the accessibility
+         * touch event.
+         *
+         * @param[in] touch The touch event.
+         * @return true if the touch event has been consumed by this control
+         */
+        internal virtual bool OnAccessibilityTouch(Touch touch)
+        {
+            return false;
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes when they wish to respond
+         * the accessibility up and down action (i.e. value change of slider control).
+         *
+         * @param[in] isIncrease Whether the value should be increased or decreased
+         * @return true if the value changed action has been consumed by this control
+         */
+        internal virtual bool OnAccessibilityValueChange(bool isIncrease)
+        {
+            return false;
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes when they wish to respond
+         * the accessibility zoom action.
+         *
+         * @return true if the zoom action has been consumed by this control
+         */
+        internal virtual bool OnAccessibilityZoom()
+        {
+            return false;
+        }
+
+        /**
+         * @brief This method should be overridden by deriving classes when they wish to respond
+         * the accessibility zoom action.
+         *
+         * @return true if the zoom action has been consumed by this control
+         */
+        public virtual void OnFocusGained()
+        {
+        }
+
+        /**
+         * @brief Called when the control loses key input focus.
+         *
+         * Should be overridden by derived classes if they need to customize what happens when focus is lost.
+         */
+        public virtual void OnFocusLost()
+        {
+        }
+
+        /**
+         * @brief Gets the next keyboard focusable actor in this control towards the given direction.
+         *
+         * A control needs to override this function in order to support two dimensional keyboard navigation.
+         * @param[in] currentFocusedActor The current focused actor.
+         * @param[in] direction The direction to move the focus towards.
+         * @param[in] loopEnabled Whether the focus movement should be looped within the control.
+         * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.
+         */
+        public virtual View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
+        {
+            return new View();
+        }
+
+        /**
+         * @brief Informs this control that its chosen focusable actor will be focused.
+         *
+         * This allows the application to preform any actions if wishes
+         * before the focus is actually moved to the chosen actor.
+         *
+         * @param[in] commitedFocusableActor The commited focusable actor.
+         */
+        public virtual void OnFocusChangeCommitted(View commitedFocusableView)
+        {
+        }
+
+
+        /**
+         * @brief This method is called when the control has enter pressed on it.
+         *
+         * Derived classes should override this to perform custom actions.
+         * @return true if this control supported this action.
+         */
+        public virtual bool OnKeyEnter()
+        {
+            return false;
+        }
+
+
+        /**
+         * @brief Called whenever a pinch gesture is detected on this control.
+         *
+         * This can be overridden by deriving classes when pinch detection
+         * is enabled.  The default behaviour is to scale the control by the
+         * pinch scale.
+         *
+         * @param[in]  pinch  The pinch gesture.
+         * @note If overridden, then the default behaviour will not occur.
+         * @note Pinch detection should be enabled via EnableGestureDetection().
+         * @see EnableGestureDetection
+         */
+        internal virtual void OnPinch(PinchGesture pinch)
+        {
+        }
+
+        /**
+         * @brief Called whenever a pan gesture is detected on this control.
+         *
+         * This should be overridden by deriving classes when pan detection
+         * is enabled.
+         *
+         * @param[in]  pan  The pan gesture.
+         * @note There is no default behaviour with panning.
+         * @note Pan detection should be enabled via EnableGestureDetection().
+         * @see EnableGestureDetection
+         */
+        internal virtual void OnPan(PanGesture pan)
+        {
+        }
+
+        /**
+         * @brief Called whenever a tap gesture is detected on this control.
+         *
+         * This should be overridden by deriving classes when tap detection
+         * is enabled.
+         *
+         * @param[in]  tap  The tap gesture.
+         * @note There is no default behaviour with a tap.
+         * @note Tap detection should be enabled via EnableGestureDetection().
+         * @see EnableGestureDetection
+         */
+        internal virtual void OnTap(TapGesture tap)
+        {
+        }
+
+        /**
+         * @brief Called whenever a long press gesture is detected on this control.
+         *
+         * This should be overridden by deriving classes when long press
+         * detection is enabled.
+         *
+         * @param[in]  longPress  The long press gesture.
+         * @note There is no default behaviour associated with a long press.
+         * @note Long press detection should be enabled via EnableGestureDetection().
+         * @see EnableGestureDetection
+         */
+        internal virtual void OnLongPress(LongPressGesture longPress)
+        {
+        }
+
+        private void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
+        {
+        }
+
+        private void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
+        {
+        }
+
+        private void OnControlChildAdd(Actor child)
+        {
+        }
+
+        private void OnControlChildRemove(Actor child)
+        {
+        }
+    }
+    public enum ViewBehaviour
+    {
+        ViewBehaviourDefault = 0,
+        DisableSizeNegotiation = 1 << 0,
+        RequiresKeyboardNavigationSupport = 1 << 5,
+        DisableStyleChangeSignals = 1 << 6,
+        LastViewBehaviourFlag
+    }
+
+}

diff --git a/Tizen.NUI/src/internal/Degree.cs b/Tizen.NUI/src/public/Degree.cs
similarity index 97%
rename from Tizen.NUI/src/internal/Degree.cs
rename to Tizen.NUI/src/public/Degree.cs
index d82ee6f..b8e90b2 100755 (executable)
--- a/Tizen.NUI/src/internal/Degree.cs
+++ b/Tizen.NUI/src/public/Degree.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Degree : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    public class Degree : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/public/FlexContainer.cs b/Tizen.NUI/src/public/FlexContainer.cs
index fa2aead..9359885 100755 (executable)
--- a/Tizen.NUI/src/public/FlexContainer.cs
+++ b/Tizen.NUI/src/public/FlexContainer.cs
@@ -1,331 +1,331 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    public class FlexContainer : View\r
-    {\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-\r
-        internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn)\r
-        {\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~FlexContainer()\r
-        {\r
-            DisposeQueue.Instance.Add(this);\r
-        }\r
-\r
-        public override void Dispose()\r
-        {\r
-            if (!Stage.IsInstalled())\r
-            {\r
-                DisposeQueue.Instance.Add(this);\r
-                return;\r
-            }\r
-\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_FlexContainer(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-                base.Dispose();\r
-            }\r
-        }\r
-\r
-\r
-        internal class Property : global::System.IDisposable\r
-        {\r
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-            protected bool swigCMemOwn;\r
-\r
-            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)\r
-            {\r
-                swigCMemOwn = cMemoryOwn;\r
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-            }\r
-\r
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)\r
-            {\r
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-            }\r
-\r
-            ~Property()\r
-            {\r
-                Dispose();\r
-            }\r
-\r
-            public virtual void Dispose()\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                    {\r
-                        if (swigCMemOwn)\r
-                        {\r
-                            swigCMemOwn = false;\r
-                            NDalicPINVOKE.delete_FlexContainer_Property(swigCPtr);\r
-                        }\r
-                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                    }\r
-                    global::System.GC.SuppressFinalize(this);\r
-                }\r
-            }\r
-\r
-            internal Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true)\r
-            {\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-\r
-            internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();\r
-            internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();\r
-            internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();\r
-            internal static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();\r
-            internal static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();\r
-            internal static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();\r
-\r
-        }\r
-\r
-        public class ChildProperty : global::System.IDisposable\r
-        {\r
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-            protected bool swigCMemOwn;\r
-\r
-            internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn)\r
-            {\r
-                swigCMemOwn = cMemoryOwn;\r
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-            }\r
-\r
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj)\r
-            {\r
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-            }\r
-\r
-            ~ChildProperty()\r
-            {\r
-                Dispose();\r
-            }\r
-\r
-            public virtual void Dispose()\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                    {\r
-                        if (swigCMemOwn)\r
-                        {\r
-                            swigCMemOwn = false;\r
-                            NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr);\r
-                        }\r
-                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                    }\r
-                    global::System.GC.SuppressFinalize(this);\r
-                }\r
-            }\r
-\r
-            internal ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true)\r
-            {\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-\r
-            internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();\r
-            internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();\r
-            internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();\r
-\r
-        }\r
-\r
-        public FlexContainer() : this(NDalicPINVOKE.FlexContainer_New(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-\r
-        }\r
-        internal FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal FlexContainer Assign(FlexContainer handle)\r
-        {\r
-            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal new static FlexContainer DownCast(BaseHandle handle)\r
-        {\r
-            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public enum FlexDirectionType\r
-        {\r
-            Column,\r
-            ColumnReverse,\r
-            Row,\r
-            RowReverse\r
-        }\r
-\r
-        public enum ContentDirectionType\r
-        {\r
-            Inherit,\r
-            LTR,\r
-            RTL\r
-        }\r
-\r
-        public enum Justification\r
-        {\r
-            JustifyFlexStart,\r
-            JustifyCenter,\r
-            JustifyFlexEnd,\r
-            JustifySpaceBetween,\r
-            JustifySpaceAround\r
-        }\r
-\r
-        public enum Alignment\r
-        {\r
-            AlignAuto,\r
-            AlignFlexStart,\r
-            AlignCenter,\r
-            AlignFlexEnd,\r
-            AlignStretch\r
-        }\r
-        public enum WrapType\r
-        {\r
-            NoWrap,\r
-            Wrap\r
-        }\r
-\r
-        internal enum PropertyRange\r
-        {\r
-            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,\r
-            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000,\r
-            CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,\r
-            CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000\r
-        }\r
-\r
-        public int ContentDirection\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public int FlexDirection\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public int FlexWrap\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public int JustifyContent\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public int AlignItems\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public int AlignContent\r
-        {\r
-            get\r
-            {\r
-                int temp = 0;\r
-                GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+
+    public class FlexContainer : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~FlexContainer()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_FlexContainer(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_FlexContainer_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();
+            internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();
+            internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();
+            internal static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();
+            internal static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();
+            internal static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();
+
+        }
+
+        public class ChildProperty : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~ChildProperty()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();
+            internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();
+            internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();
+
+        }
+
+        public FlexContainer() : this(NDalicPINVOKE.FlexContainer_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal FlexContainer Assign(FlexContainer handle)
+        {
+            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal new static FlexContainer DownCast(BaseHandle handle)
+        {
+            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public enum FlexDirectionType
+        {
+            Column,
+            ColumnReverse,
+            Row,
+            RowReverse
+        }
+
+        public enum ContentDirectionType
+        {
+            Inherit,
+            LTR,
+            RTL
+        }
+
+        public enum Justification
+        {
+            JustifyFlexStart,
+            JustifyCenter,
+            JustifyFlexEnd,
+            JustifySpaceBetween,
+            JustifySpaceAround
+        }
+
+        public enum Alignment
+        {
+            AlignAuto,
+            AlignFlexStart,
+            AlignCenter,
+            AlignFlexEnd,
+            AlignStretch
+        }
+        public enum WrapType
+        {
+            NoWrap,
+            Wrap
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000,
+            CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,
+            CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000
+        }
+
+        public int ContentDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int FlexDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int FlexWrap
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int JustifyContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int AlignItems
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public int AlignContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+}

diff --git a/Tizen.NUI/src/internal/Gesture.cs b/Tizen.NUI/src/public/Gesture.cs
similarity index 100%
rename from Tizen.NUI/src/internal/Gesture.cs
rename to Tizen.NUI/src/public/Gesture.cs

diff --git a/Tizen.NUI/src/public/Layer.cs b/Tizen.NUI/src/public/Layer.cs
index 5005ced..49e2a3f 100755 (executable)
--- a/Tizen.NUI/src/public/Layer.cs
+++ b/Tizen.NUI/src/public/Layer.cs
@@ -18,14 +18,14 @@
 // You may obtain a copy of the License at\r
 //\r
 // http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
+//
 // Unless required by applicable law or agreed to in writing, software\r
 // distributed under the License is distributed on an "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
-//\r
-\r
+//
+
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
 \r
@@ -244,15 +244,15 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal void SetClippingBox(RectInteger box)\r
+        public void SetClippingBox(Rectangle box)\r
         {\r
-            NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, RectInteger.getCPtr(box));\r
+            NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal RectInteger GetClippingBox()\r
+        public Rectangle GetClippingBox()\r
         {\r
-            RectInteger ret = new RectInteger(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true);\r
+            Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
@@ -327,11 +327,11 @@ namespace Tizen.NUI
                 SetProperty(Layer.Property.CLIPPING_ENABLE, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public RectInteger ClippingBox\r
+        public Rectangle ClippingBox\r
         {\r
             get\r
             {\r
-                RectInteger temp = new RectInteger(0, 0, 0, 0);\r
+                Rectangle temp = new Rectangle(0, 0, 0, 0);\r
                 GetProperty(Layer.Property.CLIPPING_BOX).Get(temp);\r
                 return temp;\r
             }\r
@@ -340,7 +340,7 @@ namespace Tizen.NUI
                 SetProperty(Layer.Property.CLIPPING_BOX, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public LayerBehavior Behavior\r
+        public Layer.LayerBehavior Behavior\r
         {\r
             get\r
             {\r
@@ -352,6 +352,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-    }\r
-\r
-}\r
+    }
+
+}

diff --git a/Tizen.NUI/src/internal/LongPressGesture.cs b/Tizen.NUI/src/public/LongPressGesture.cs
similarity index 100%
rename from Tizen.NUI/src/internal/LongPressGesture.cs
rename to Tizen.NUI/src/public/LongPressGesture.cs

diff --git a/Tizen.NUI/src/internal/DaliApplication.cs b/Tizen.NUI/src/public/NUIApplication.cs
similarity index 82%
rename from Tizen.NUI/src/internal/DaliApplication.cs
rename to Tizen.NUI/src/public/NUIApplication.cs
index 1f5316e..a6030e4 100755 (executable)
--- a/Tizen.NUI/src/internal/DaliApplication.cs
+++ b/Tizen.NUI/src/public/NUIApplication.cs
@@ -25,22 +25,22 @@ using Tizen.NUI;
 namespace Tizen.Applications
 {
     /// <summary>
-    /// Represents an application that have UI screen. The DaliApplication class has a default stage.
+    /// Represents an application that have UI screen. The NUIApplication class has a default stage.
     /// </summary>
-    public class DaliApplication : CoreUIApplication
+    public class NUIApplication : CoreUIApplication
     {
         /// <summary>
         /// The instance of the Dali Application.
         /// </summary>
         /// <remarks>
-        /// This application is created before OnCreate() or created event. And the DaliApplication will be terminated when this application is closed.
+        /// This application is created before OnCreate() or created event. And the NUIApplication will be terminated when this application is closed.
         /// </remarks>
         protected Tizen.NUI.Application application;
 
         /// <summary>
         /// The instance of the Dali Application extension.
         /// </summary>
-        protected Tizen.NUI.ApplicationExtensions applicationExt;
+        internal Tizen.NUI.ApplicationExtensions applicationExt;
 
         /// <summary>
         /// Store the stylesheet value.
@@ -55,7 +55,7 @@ namespace Tizen.Applications
         /// <summary>
         /// Store the app mode value.
         /// </summary>
-        protected APP_MODE appMode;
+        protected AppMode appMode;
 
         /// <summary>
         /// The instance of the Dali Stage.
@@ -65,29 +65,29 @@ namespace Tizen.Applications
         /// <summary>
         /// The default constructor.
         /// </summary>
-        public DaliApplication():base()
+        public NUIApplication():base()
         {
-            appMode = APP_MODE.DEFAULT;
+            appMode = AppMode.Default;
         }
 
         /// <summary>
         /// The constructor with stylesheet.
         /// </summary>
-        public DaliApplication(string stylesheet):base()
+        public NUIApplication(string stylesheet):base()
         {
             //handle the stylesheet
-            appMode = APP_MODE.STYLESHEETONLY;
+            appMode = AppMode.StyleSheetOnly;
             m_stylesheet = stylesheet;
         }
 
         /// <summary>
         /// The constructor with stylesheet and window mode.
         /// </summary>
-        public DaliApplication(string stylesheet, Tizen.NUI.Application.WINDOW_MODE windowMode)
+        public NUIApplication(string stylesheet, Tizen.NUI.Application.WINDOW_MODE windowMode)
             : base()
         {
             //handle the stylesheet and windowMode
-            appMode = APP_MODE.STYLESHEETWITHWINDOWMODE;
+            appMode = AppMode.StyleSheetWithWindowMode;
             m_stylesheet = stylesheet;
             m_windowMode = windowMode;
         }
@@ -100,13 +100,13 @@ namespace Tizen.Applications
         {
             switch(appMode)
             {
-                case APP_MODE.DEFAULT:
+                case AppMode.Default:
                     application = Tizen.NUI.Application.NewApplication();
                     break;
-                case APP_MODE.STYLESHEETONLY:
+                case AppMode.StyleSheetOnly:
                     application = Tizen.NUI.Application.NewApplication(m_stylesheet);
                     break;
-                case APP_MODE.STYLESHEETWITHWINDOWMODE:
+                case AppMode.StyleSheetWithWindowMode:
                     application = Tizen.NUI.Application.NewApplication(m_stylesheet, m_windowMode);
                     break;
                 default:
@@ -159,11 +159,11 @@ namespace Tizen.Applications
         /// <summary>
         /// The mode of creating Dali application.
         /// </summary>
-        protected enum APP_MODE
+        protected enum AppMode
         {
-            DEFAULT = 0,
-            STYLESHEETONLY = 1,
-            STYLESHEETWITHWINDOWMODE = 2
+            Default = 0,
+            StyleSheetOnly = 1,
+            StyleSheetWithWindowMode = 2
         }
     }
 }

diff --git a/Tizen.NUI/src/internal/PanGesture.cs b/Tizen.NUI/src/public/PanGesture.cs
similarity index 100%
rename from Tizen.NUI/src/internal/PanGesture.cs
rename to Tizen.NUI/src/public/PanGesture.cs

diff --git a/Tizen.NUI/src/internal/PinchGesture.cs b/Tizen.NUI/src/public/PinchGesture.cs
similarity index 100%
rename from Tizen.NUI/src/internal/PinchGesture.cs
rename to Tizen.NUI/src/public/PinchGesture.cs

diff --git a/Tizen.NUI/src/public/Popup.cs b/Tizen.NUI/src/public/Popup.cs
index 801fd41..450cc14 100755 (executable)
--- a/Tizen.NUI/src/public/Popup.cs
+++ b/Tizen.NUI/src/public/Popup.cs
@@ -704,11 +704,11 @@ namespace Tizen.NUI
                 SetProperty(Popup.Property.POPUP_BACKGROUND_IMAGE, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public RectInteger PopupBackgroundBorder\r
+        public Rectangle PopupBackgroundBorder\r
         {\r
             get\r
             {\r
-                RectInteger temp = new RectInteger(0, 0, 0, 0);\r
+                Rectangle temp = new Rectangle(0, 0, 0, 0);\r
                 GetProperty(Popup.Property.POPUP_BACKGROUND_BORDER).Get(temp);\r
                 return temp;\r
             }\r

diff --git a/Tizen.NUI/src/public/Position.cs b/Tizen.NUI/src/public/Position.cs
index 3946baa..1b358f4 100755 (executable)
--- a/Tizen.NUI/src/public/Position.cs
+++ b/Tizen.NUI/src/public/Position.cs
@@ -1,477 +1,477 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    public class Position : global::System.IDisposable\r
-    {\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-        protected bool swigCMemOwn;\r
-\r
-        internal Position(global::System.IntPtr cPtr, bool cMemoryOwn)\r
-        {\r
-            swigCMemOwn = cMemoryOwn;\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Position obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~Position()\r
-        {\r
-            DisposeQueue.Instance.Add(this);\r
-        }\r
-\r
-        public virtual void Dispose()\r
-        {\r
-            if (!Stage.IsInstalled())\r
-            {\r
-                DisposeQueue.Instance.Add(this);\r
-                return;\r
-            }\r
-\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_Vector3(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-            }\r
-        }\r
-\r
-        internal static Position GetVector3FromPtr(global::System.IntPtr cPtr)\r
-        {\r
-            Position ret = new Position(cPtr, false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Position() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public Position(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public float X\r
-        {\r
-            set\r
-            {\r
-                NDalicPINVOKE.Vector3_X_set(swigCPtr, value);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public float Y\r
-        {\r
-            set\r
-            {\r
-                NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public float Z\r
-        {\r
-            set\r
-            {\r
-                NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float ParentOriginTop\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.ParentOriginTop_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float ParentOriginBottom\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.ParentOriginBottom_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float ParentOriginLeft\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.ParentOriginLeft_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float ParentOriginRight\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.ParentOriginRight_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float ParentOriginMiddle\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.ParentOriginMiddle_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginTopLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginTopCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginTopRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginCenterLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginCenterRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginBottomLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginBottomCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position ParentOriginBottomRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float AnchorPointTop\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.AnchorPointTop_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float AnchorPointBottom\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.AnchorPointBottom_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float AnchorPointLeft\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.AnchorPointLeft_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float AnchorPointRight\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.AnchorPointRight_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static float AnchorPointMiddle\r
-        {\r
-            get\r
-            {\r
-                float ret = NDalicPINVOKE.AnchorPointMiddle_get();\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointTopLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointTopCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointTopRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointCenterLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointCenterRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointBottomLeft\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointBottomCenter\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-        public static Position AnchorPointBottomRight\r
-        {\r
-            get\r
-            {\r
-                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get();\r
-                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-                return ret;\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    public struct ParentOrigin\r
-    {\r
-        public static readonly float Top = Position.ParentOriginTop;\r
-        public static readonly float Bottom = Position.ParentOriginBottom;\r
-        public static readonly float Left = Position.ParentOriginLeft;\r
-        public static readonly float Right = Position.ParentOriginRight;\r
-        public static readonly float Middle = Position.ParentOriginMiddle;\r
-        public static readonly Position TopLeft = Position.ParentOriginTopLeft;\r
-        public static readonly Position TopCenter = Position.ParentOriginTopCenter;\r
-        public static readonly Position TopRight = Position.ParentOriginTopRight;\r
-        public static readonly Position CenterLeft = Position.ParentOriginCenterLeft;\r
-        public static readonly Position Center = Position.ParentOriginCenter;\r
-        public static readonly Position CenterRight = Position.ParentOriginCenterRight;\r
-        public static readonly Position BottomLeft = Position.ParentOriginBottomLeft;\r
-        public static readonly Position BottomCenter = Position.ParentOriginBottomCenter;\r
-        public static readonly Position BottomRight = Position.ParentOriginBottomRight;\r
-    }\r
-    public struct AnchorPoint\r
-    {\r
-        public static readonly float Top = Position.AnchorPointTop;\r
-        public static readonly float Bottom = Position.AnchorPointBottom;\r
-        public static readonly float Left = Position.AnchorPointLeft;\r
-        public static readonly float Right = Position.AnchorPointRight;\r
-        public static readonly float Middle = Position.AnchorPointMiddle;\r
-        public static readonly Position TopLeft = Position.AnchorPointTopLeft;\r
-        public static readonly Position TopCenter = Position.AnchorPointTopCenter;\r
-        public static readonly Position TopRight = Position.AnchorPointTopRight;\r
-        public static readonly Position CenterLeft = Position.AnchorPointCenterLeft;\r
-        public static readonly Position Center = Position.AnchorPointCenter;\r
-        public static readonly Position CenterRight = Position.AnchorPointCenterRight;\r
-        public static readonly Position BottomLeft = Position.AnchorPointBottomLeft;\r
-        public static readonly Position BottomCenter = Position.AnchorPointBottomCenter;\r
-        public static readonly Position BottomRight = Position.AnchorPointBottomRight;\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+
+namespace Tizen.NUI
+{
+
+    public class Position : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Position(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Position obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Position()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Vector3(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        internal static Position GetVector3FromPtr(global::System.IntPtr cPtr)
+        {
+            Position ret = new Position(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Position() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Position(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float X
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_X_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public float Y
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public float Z
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float ParentOriginTop
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginTop_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float ParentOriginBottom
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginBottom_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float ParentOriginLeft
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginLeft_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float ParentOriginRight
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginRight_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float ParentOriginMiddle
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginMiddle_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginTopLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginTopCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginTopRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginCenterLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginCenterRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginBottomLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginBottomCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position ParentOriginBottomRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float AnchorPointTop
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointTop_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float AnchorPointBottom
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointBottom_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float AnchorPointLeft
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointLeft_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float AnchorPointRight
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointRight_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static float AnchorPointMiddle
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointMiddle_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointTopLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointTopCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointTopRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointCenterLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointCenterRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointBottomLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointBottomCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public static Position AnchorPointBottomRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
+
+    public struct ParentOrigin
+    {
+        public static readonly float Top = Position.ParentOriginTop;
+        public static readonly float Bottom = Position.ParentOriginBottom;
+        public static readonly float Left = Position.ParentOriginLeft;
+        public static readonly float Right = Position.ParentOriginRight;
+        public static readonly float Middle = Position.ParentOriginMiddle;
+        public static readonly Position TopLeft = Position.ParentOriginTopLeft;
+        public static readonly Position TopCenter = Position.ParentOriginTopCenter;
+        public static readonly Position TopRight = Position.ParentOriginTopRight;
+        public static readonly Position CenterLeft = Position.ParentOriginCenterLeft;
+        public static readonly Position Center = Position.ParentOriginCenter;
+        public static readonly Position CenterRight = Position.ParentOriginCenterRight;
+        public static readonly Position BottomLeft = Position.ParentOriginBottomLeft;
+        public static readonly Position BottomCenter = Position.ParentOriginBottomCenter;
+        public static readonly Position BottomRight = Position.ParentOriginBottomRight;
+    }
+    public struct AnchorPoint
+    {
+        public static readonly float Top = Position.AnchorPointTop;
+        public static readonly float Bottom = Position.AnchorPointBottom;
+        public static readonly float Left = Position.AnchorPointLeft;
+        public static readonly float Right = Position.AnchorPointRight;
+        public static readonly float Middle = Position.AnchorPointMiddle;
+        public static readonly Position TopLeft = Position.AnchorPointTopLeft;
+        public static readonly Position TopCenter = Position.AnchorPointTopCenter;
+        public static readonly Position TopRight = Position.AnchorPointTopRight;
+        public static readonly Position CenterLeft = Position.AnchorPointCenterLeft;
+        public static readonly Position Center = Position.AnchorPointCenter;
+        public static readonly Position CenterRight = Position.AnchorPointCenterRight;
+        public static readonly Position BottomLeft = Position.AnchorPointBottomLeft;
+        public static readonly Position BottomCenter = Position.AnchorPointBottomCenter;
+        public static readonly Position BottomRight = Position.AnchorPointBottomRight;
+    }
+
+}

diff --git a/Tizen.NUI/src/public/Property.cs b/Tizen.NUI/src/public/Property.cs
index da6d26e..013ef8c 100755 (executable)
--- a/Tizen.NUI/src/public/Property.cs
+++ b/Tizen.NUI/src/public/Property.cs
@@ -18,14 +18,14 @@
 // You may obtain a copy of the License at\r
 //\r
 // http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
+//
 // Unless required by applicable law or agreed to in writing, software\r
 // distributed under the License is distributed on an "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
-//\r
-\r
+//
+
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
 \r
@@ -776,27 +776,27 @@ namespace Tizen.NUI
 \r
 \r
         public PropertyValue() : this(NDalicPINVOKE.new_Property_Value__SWIG_0(), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(bool boolValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_1(boolValue), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(int integerValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_2(integerValue), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(float floatValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_3(floatValue), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(Vector2 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Vector2.getCPtr(vectorValue)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
         public PropertyValue(Size2D vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Size2D.getCPtr(vectorValue)), true)\r
@@ -805,7 +805,7 @@ namespace Tizen.NUI
         }\r
 \r
         public PropertyValue(Vector3 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Vector3.getCPtr(vectorValue)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
         public PropertyValue(Size vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Size.getCPtr(vectorValue)), true)\r
@@ -819,7 +819,7 @@ namespace Tizen.NUI
         }\r
 \r
         public PropertyValue(Vector4 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Vector4.getCPtr(vectorValue)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
         public PropertyValue(Color vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Color.getCPtr(vectorValue)), true)\r
@@ -827,53 +827,53 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public PropertyValue(Matrix3 matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_7(Matrix3.getCPtr(matrixValue)), true)\r
-            {\r
+        internal PropertyValue(Matrix3 matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_7(Matrix3.getCPtr(matrixValue)), true)\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public PropertyValue(Matrix matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_8(Matrix.getCPtr(matrixValue)), true)\r
-            {\r
+        internal PropertyValue(Matrix matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_8(Matrix.getCPtr(matrixValue)), true)\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public PropertyValue(RectInteger vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_9(RectInteger.getCPtr(vectorValue)), true)\r
+        public PropertyValue(Rectangle vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_9(Rectangle.getCPtr(vectorValue)), true)\r
             {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public PropertyValue(AngleAxis angleAxis) : this(NDalicPINVOKE.new_Property_Value__SWIG_10(AngleAxis.getCPtr(angleAxis)), true)\r
-            {\r
+        internal PropertyValue(AngleAxis angleAxis) : this(NDalicPINVOKE.new_Property_Value__SWIG_10(AngleAxis.getCPtr(angleAxis)), true)\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public PropertyValue(Quaternion quaternion) : this(NDalicPINVOKE.new_Property_Value__SWIG_11(Quaternion.getCPtr(quaternion)), true)\r
+        public PropertyValue(Rotation quaternion) : this(NDalicPINVOKE.new_Property_Value__SWIG_11(Rotation.getCPtr(quaternion)), true)\r
             {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(string stringValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_12(stringValue), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(PropertyArray arrayValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_14(PropertyArray.getCPtr(arrayValue)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(PropertyMap mapValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_15(PropertyMap.getCPtr(mapValue)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(PropertyType type) : this(NDalicPINVOKE.new_Property_Value__SWIG_16((int)type), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
         public PropertyValue(PropertyValue value) : this(NDalicPINVOKE.new_Property_Value__SWIG_17(PropertyValue.getCPtr(value)), true)\r
-            {\r
+        {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
@@ -912,9 +912,9 @@ namespace Tizen.NUI
             return ret;\r
         }\r
 \r
-        public bool Get(RectInteger rect)\r
+        public bool Get(Rectangle rect)\r
         {\r
-            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_4(swigCPtr, RectInteger.getCPtr(rect));\r
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_4(swigCPtr, Rectangle.getCPtr(rect));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
@@ -981,16 +981,16 @@ namespace Tizen.NUI
             return ret;\r
         }\r
 \r
-        public bool Get(AngleAxis angleAxisValue)\r
+        internal bool Get(AngleAxis angleAxisValue)\r
         {\r
             bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_10(swigCPtr, AngleAxis.getCPtr(angleAxisValue));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
 \r
-        public bool Get(Quaternion quaternionValue)\r
+        public bool Get(Rotation quaternionValue)\r
         {\r
-            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_11(swigCPtr, Quaternion.getCPtr(quaternionValue));\r
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_11(swigCPtr, Rotation.getCPtr(quaternionValue));\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
@@ -1058,6 +1058,6 @@ namespace Tizen.NUI
         ReadWrite,\r
         Animatable,\r
         AccessModeCount\r
-    }\r
-\r
-}\r
+    }
+
+}

diff --git a/Tizen.NUI/src/public/PushButton.cs b/Tizen.NUI/src/public/PushButton.cs
index afb13a7..3d81649 100755 (executable)
--- a/Tizen.NUI/src/public/PushButton.cs
+++ b/Tizen.NUI/src/public/PushButton.cs
@@ -214,12 +214,6 @@ namespace Tizen.NUI
 \r
         public string UnselectedIcon\r
         {\r
-            get\r
-            {\r
-                string temp;\r
-                GetProperty(PushButton.Property.UNSELECTED_ICON).Get(out temp);\r
-                return temp;\r
-            }\r
             set\r
             {\r
                 SetProperty(PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.PropertyValue(value));\r
@@ -227,12 +221,6 @@ namespace Tizen.NUI
         }\r
         public string SelectedIcon\r
         {\r
-            get\r
-            {\r
-                string temp;\r
-                GetProperty(PushButton.Property.SELECTED_ICON).Get(out temp);\r
-                return temp;\r
-            }\r
             set\r
             {\r
                 SetProperty(PushButton.Property.SELECTED_ICON, new Tizen.NUI.PropertyValue(value));\r
@@ -251,12 +239,12 @@ namespace Tizen.NUI
                 SetProperty(PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public string LabelPadding\r
+        public Vector4 LabelPadding\r
         {\r
             get\r
             {\r
-                string temp;\r
-                GetProperty(PushButton.Property.LABEL_PADDING).Get(out temp);\r
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);\r
+                GetProperty(PushButton.Property.LABEL_PADDING).Get(temp);\r
                 return temp;\r
             }\r
             set\r
@@ -264,6 +252,7 @@ namespace Tizen.NUI
                 SetProperty(PushButton.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
+\r
         public string IconPadding\r
         {\r
             get\r

diff --git a/Tizen.NUI/src/internal/Radian.cs b/Tizen.NUI/src/public/Radian.cs
similarity index 98%
rename from Tizen.NUI/src/internal/Radian.cs
rename to Tizen.NUI/src/public/Radian.cs
index 683b611..b4ee712 100755 (executable)
--- a/Tizen.NUI/src/internal/Radian.cs
+++ b/Tizen.NUI/src/public/Radian.cs
@@ -8,9 +8,9 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class Radian : global::System.IDisposable {
+namespace Tizen.NUI {\r
+\r
+    public class Radian : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 

diff --git a/Tizen.NUI/src/internal/RectFloat.cs b/Tizen.NUI/src/public/Rectangle.cs
similarity index 56%
rename from Tizen.NUI/src/internal/RectFloat.cs
rename to Tizen.NUI/src/public/Rectangle.cs
index fb121a7..f4aa817 100755 (executable)
--- a/Tizen.NUI/src/internal/RectFloat.cs
+++ b/Tizen.NUI/src/public/Rectangle.cs
@@ -10,20 +10,20 @@
 
 namespace Tizen.NUI {
 
-public class RectFloat : global::System.IDisposable {
+public class Rectangle : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal RectFloat(global::System.IntPtr cPtr, bool cMemoryOwn) {
+  internal Rectangle(global::System.IntPtr cPtr, bool cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RectFloat obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Rectangle obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~RectFloat() {
+  ~Rectangle() {
     DisposeQueue.Instance.Add(this);
   }
 
@@ -37,7 +37,7 @@ public class RectFloat : global::System.IDisposable {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {
           swigCMemOwn = false;
-          NDalicPINVOKE.delete_RectFloat(swigCPtr);
+          NDalicPINVOKE.delete_Rectangle(swigCPtr);
         }
         swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
@@ -46,168 +46,243 @@ public class RectFloat : global::System.IDisposable {
   }
 
 
-  public RectFloat() : this(NDalicPINVOKE.new_RectFloat__SWIG_0(), true) {
+    public static bool operator ==(Rectangle a, Rectangle b)
+    {
+        // If both are null, or both are same instance, return true.
+        if (System.Object.ReferenceEquals(a, b))
+        {
+            return true;
+        }
+
+        // If one is null, but not both, return false.
+        if (((object)a == null) || ((object)b == null))
+        {
+            return false;
+        }
+
+        // Return true if the fields match:
+        return a.X == b.X && a.Y == b.Y && a.Width == b.Width && a.Height == b.Height;
+    }
+
+    public static bool operator !=(Rectangle a, Rectangle b)
+    {
+        return !(a == b);
+    }
+
+    ///< X position of the rectangle
+    public int X
+    {
+        set
+        {
+            x = value;
+        }
+        get
+        {
+            return x;
+        }
+    }
+
+    ///< Y position of the rectangle
+    public int Y
+    {
+        set
+        {
+            y = value;
+        }
+        get
+        {
+            return y;
+        }
+    }
+
+    ///< Width of the rectangle
+    public int Width
+    {
+        set
+        {
+            width = value;
+        }
+        get
+        {
+            return width;
+        }
+    }
+
+    ///< Height of the rectangle
+    public int Height
+    {
+        set
+        {
+            height = value;
+        }
+        get
+        {
+            return height;
+        }
+    }
+
+  public Rectangle() : this(NDalicPINVOKE.new_Rectangle__SWIG_0(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public RectFloat(float x, float y, float width, float height) : this(NDalicPINVOKE.new_RectFloat__SWIG_1(x, y, width, height), true) {
+  public Rectangle(int x, int y, int width, int height) : this(NDalicPINVOKE.new_Rectangle__SWIG_1(x, y, width, height), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public RectFloat(RectFloat rhs) : this(NDalicPINVOKE.new_RectFloat__SWIG_2(RectFloat.getCPtr(rhs)), true) {
+  public Rectangle(Rectangle rhs) : this(NDalicPINVOKE.new_Rectangle__SWIG_2(Rectangle.getCPtr(rhs)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public RectFloat Assign(RectFloat rhs) {
-    RectFloat ret = new RectFloat(NDalicPINVOKE.RectFloat_Assign(swigCPtr, RectFloat.getCPtr(rhs)), false);
+  public Rectangle Assign(Rectangle rhs) {
+    Rectangle ret = new Rectangle(NDalicPINVOKE.Rectangle_Assign(swigCPtr, Rectangle.getCPtr(rhs)), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void Set(float newX, float newY, float newWidth, float newHeight) {
-    NDalicPINVOKE.RectFloat_Set(swigCPtr, newX, newY, newWidth, newHeight);
+  public void Set(int newX, int newY, int newWidth, int newHeight) {
+    NDalicPINVOKE.Rectangle_Set(swigCPtr, newX, newY, newWidth, newHeight);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
   public bool IsEmpty() {
-    bool ret = NDalicPINVOKE.RectFloat_IsEmpty(swigCPtr);
+    bool ret = NDalicPINVOKE.Rectangle_IsEmpty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float Left() {
-    float ret = NDalicPINVOKE.RectFloat_Left(swigCPtr);
+  public int Left() {
+    int ret = NDalicPINVOKE.Rectangle_Left(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float Right() {
-    float ret = NDalicPINVOKE.RectFloat_Right(swigCPtr);
+  public int Right() {
+    int ret = NDalicPINVOKE.Rectangle_Right(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float Top() {
-    float ret = NDalicPINVOKE.RectFloat_Top(swigCPtr);
+  public int Top() {
+    int ret = NDalicPINVOKE.Rectangle_Top(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float Bottom() {
-    float ret = NDalicPINVOKE.RectFloat_Bottom(swigCPtr);
+  public int Bottom() {
+    int ret = NDalicPINVOKE.Rectangle_Bottom(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float Area() {
-    float ret = NDalicPINVOKE.RectFloat_Area(swigCPtr);
+  public int Area() {
+    int ret = NDalicPINVOKE.Rectangle_Area(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public bool Intersects(RectFloat other) {
-    bool ret = NDalicPINVOKE.RectFloat_Intersects(swigCPtr, RectFloat.getCPtr(other));
+  public bool Intersects(Rectangle other) {
+    bool ret = NDalicPINVOKE.Rectangle_Intersects(swigCPtr, Rectangle.getCPtr(other));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public bool Contains(RectFloat other) {
-    bool ret = NDalicPINVOKE.RectFloat_Contains(swigCPtr, RectFloat.getCPtr(other));
+  public bool Contains(Rectangle other) {
+    bool ret = NDalicPINVOKE.Rectangle_Contains(swigCPtr, Rectangle.getCPtr(other));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public float x {
+  private int x {
     set {
-      NDalicPINVOKE.RectFloat_x_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_x_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_x_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_x_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float left {
+  private int left {
     set {
-      NDalicPINVOKE.RectFloat_left_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_left_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_left_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_left_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float y {
+  private int y {
     set {
-      NDalicPINVOKE.RectFloat_y_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_y_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_y_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_y_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float right {
+  private int right {
     set {
-      NDalicPINVOKE.RectFloat_right_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_right_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_right_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_right_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float width {
+  private int width {
     set {
-      NDalicPINVOKE.RectFloat_width_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_width_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_width_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_width_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float bottom {
+  private int bottom {
     set {
-      NDalicPINVOKE.RectFloat_bottom_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_bottom_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_bottom_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_bottom_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float height {
+  private int height {
     set {
-      NDalicPINVOKE.RectFloat_height_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_height_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_height_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_height_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
   }
 
-  public float top {
+  private int top {
     set {
-      NDalicPINVOKE.RectFloat_top_set(swigCPtr, value);
+      NDalicPINVOKE.Rectangle_top_set(swigCPtr, value);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
-      float ret = NDalicPINVOKE.RectFloat_top_get(swigCPtr);
+      int ret = NDalicPINVOKE.Rectangle_top_get(swigCPtr);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 

diff --git a/Tizen.NUI/src/public/Rotation.cs b/Tizen.NUI/src/public/Rotation.cs
new file mode 100755 (executable)
index 0000000..040f928
--- /dev/null
+++ b/Tizen.NUI/src/public/Rotation.cs
@@ -0,0 +1,283 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// 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 Rotation : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal Rotation(global::System.IntPtr cPtr, bool cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+  }
+
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Rotation obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~Rotation() {
+    DisposeQueue.Instance.Add(this);
+  }
+
+  public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
+
+    lock(this) {
+      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          NDalicPINVOKE.delete_Rotation(swigCPtr);
+        }
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+      }
+      global::System.GC.SuppressFinalize(this);
+    }
+  }
+
+
+  public static Rotation operator+(Rotation arg1, Rotation arg2) {
+    return arg1.Add(arg2);
+  }
+
+  public static Rotation operator-(Rotation arg1, Rotation arg2) {
+    return arg1.Subtract(arg2);
+  }
+
+  public static Rotation operator-(Rotation arg1) {
+    return arg1.Subtract();
+  }
+
+  public static Rotation operator*(Rotation arg1, Rotation arg2) {
+    return arg1.Multiply(arg2);
+  }
+
+  public static Vector3 operator*(Rotation arg1, Vector3 arg2) {
+    return arg1.Multiply(arg2);
+  }
+
+  public static Rotation operator*(Rotation arg1, float arg2) {
+    return arg1.Multiply(arg2);
+  }
+
+  public static Rotation operator/(Rotation arg1, Rotation arg2) {
+    return arg1.Divide(arg2);
+  }
+
+  public static Rotation operator/(Rotation arg1, float arg2) {
+    return arg1.Divide(arg2);
+  }
+
+  public Rotation() : this(NDalicPINVOKE.new_Rotation__SWIG_0(), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public Rotation(Radian angle, Vector3 axis) : this(NDalicPINVOKE.new_Rotation__SWIG_1(Radian.getCPtr(angle), Vector3.getCPtr(axis)), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public static Rotation IDENTITY {
+    get {
+      global::System.IntPtr cPtr = NDalicPINVOKE.Rotation_IDENTITY_get();
+      Rotation ret = (cPtr == global::System.IntPtr.Zero) ? null : new Rotation(cPtr, false);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+      return ret;
+    } 
+  }
+
+  public bool IsIdentity() {
+    bool ret = NDalicPINVOKE.Rotation_IsIdentity(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public bool GetAxisAngle(Vector3 axis, Radian angle) {
+    bool ret = NDalicPINVOKE.Rotation_GetAxisAngle(swigCPtr, Vector3.getCPtr(axis), Radian.getCPtr(angle));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Add(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Add(swigCPtr, Rotation.getCPtr(other)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Subtract(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Subtract__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Multiply(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Multiply__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Vector3 Multiply(Vector3 other) {
+    Vector3 ret = new Vector3(NDalicPINVOKE.Rotation_Multiply__SWIG_1(swigCPtr, Vector3.getCPtr(other)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Divide(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Divide__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Multiply(float scale) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Multiply__SWIG_2(swigCPtr, scale), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Divide(float scale) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Divide__SWIG_1(swigCPtr, scale), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation Subtract() {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Subtract__SWIG_1(swigCPtr), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation AddAssign(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_AddAssign(swigCPtr, Rotation.getCPtr(other)), false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation SubtractAssign(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_SubtractAssign(swigCPtr, Rotation.getCPtr(other)), false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation MultiplyAssign(Rotation other) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_MultiplyAssign__SWIG_0(swigCPtr, Rotation.getCPtr(other)), false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation MultiplyAssign(float scale) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_MultiplyAssign__SWIG_1(swigCPtr, scale), false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Rotation DivideAssign(float scale) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_DivideAssign(swigCPtr, scale), false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private bool EqualTo(Rotation rhs) {
+    bool ret = NDalicPINVOKE.Rotation_EqualTo(swigCPtr, Rotation.getCPtr(rhs));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private bool NotEqualTo(Rotation rhs) {
+    bool ret = NDalicPINVOKE.Rotation_NotEqualTo(swigCPtr, Rotation.getCPtr(rhs));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public float Length() {
+    float ret = NDalicPINVOKE.Rotation_Length(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public float LengthSquared() {
+    float ret = NDalicPINVOKE.Rotation_LengthSquared(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public void Normalize() {
+    NDalicPINVOKE.Rotation_Normalize(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public Rotation Normalized() {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Normalized(swigCPtr), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public void Conjugate() {
+    NDalicPINVOKE.Rotation_Conjugate(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public void Invert() {
+    NDalicPINVOKE.Rotation_Invert(swigCPtr);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public Rotation Log() {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Log(swigCPtr), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public Rotation Exp() {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Exp(swigCPtr), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float Dot(Rotation q1, Rotation q2) {
+    float ret = NDalicPINVOKE.Rotation_Dot(Rotation.getCPtr(q1), Rotation.getCPtr(q2));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static Rotation Lerp(Rotation q1, Rotation q2, float t) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Lerp(Rotation.getCPtr(q1), Rotation.getCPtr(q2), t), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static Rotation Slerp(Rotation q1, Rotation q2, float progress) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Slerp(Rotation.getCPtr(q1), Rotation.getCPtr(q2), progress), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static Rotation SlerpNoInvert(Rotation q1, Rotation q2, float t) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_SlerpNoInvert(Rotation.getCPtr(q1), Rotation.getCPtr(q2), t), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static Rotation Squad(Rotation start, Rotation end, Rotation ctrl1, Rotation ctrl2, float t) {
+    Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Squad(Rotation.getCPtr(start), Rotation.getCPtr(end), Rotation.getCPtr(ctrl1), Rotation.getCPtr(ctrl2), t), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public static float AngleBetween(Rotation q1, Rotation q2) {
+    float ret = NDalicPINVOKE.Rotation_AngleBetween(Rotation.getCPtr(q1), Rotation.getCPtr(q2));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+}
+
+}

diff --git a/Tizen.NUI/src/internal/TapGesture.cs b/Tizen.NUI/src/public/TapGesture.cs
similarity index 100%
rename from Tizen.NUI/src/internal/TapGesture.cs
rename to Tizen.NUI/src/public/TapGesture.cs

diff --git a/Tizen.NUI/src/public/TextEditor.cs b/Tizen.NUI/src/public/TextEditor.cs
index f44022c..aeb8969 100755 (executable)
--- a/Tizen.NUI/src/public/TextEditor.cs
+++ b/Tizen.NUI/src/public/TextEditor.cs
@@ -659,11 +659,11 @@ namespace Tizen.NUI
                 SetProperty(TextEditor.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public RectInteger DecorationBoundingBox\r
+        public Rectangle DecorationBoundingBox\r
         {\r
             get\r
             {\r
-                RectInteger temp = new RectInteger(0, 0, 0, 0);\r
+                Rectangle temp = new Rectangle(0, 0, 0, 0);\r
                 GetProperty(TextEditor.Property.DECORATION_BOUNDING_BOX).Get(temp);\r
                 return temp;\r
             }\r

diff --git a/Tizen.NUI/src/public/TextField.cs b/Tizen.NUI/src/public/TextField.cs
index 94350eb..ddce4bb 100755 (executable)
--- a/Tizen.NUI/src/public/TextField.cs
+++ b/Tizen.NUI/src/public/TextField.cs
@@ -827,11 +827,11 @@ namespace Tizen.NUI
                 SetProperty(TextField.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-        public RectInteger DecorationBoundingBox\r
+        public Rectangle DecorationBoundingBox\r
         {\r
             get\r
             {\r
-                RectInteger temp = new RectInteger(0, 0, 0, 0);\r
+                Rectangle temp = new Rectangle(0, 0, 0, 0);\r
                 GetProperty(TextField.Property.DECORATION_BOUNDING_BOX).Get(temp);\r
                 return temp;\r
             }\r

diff --git a/Tizen.NUI/src/public/Timer.cs b/Tizen.NUI/src/public/Timer.cs
index 98ea103..0cae3cb 100755 (executable)
--- a/Tizen.NUI/src/public/Timer.cs
+++ b/Tizen.NUI/src/public/Timer.cs
@@ -153,7 +153,7 @@ namespace Tizen.NUI
 \r
 \r
 \r
-        public TimerSignalType TickSignal()\r
+        internal TimerSignalType TickSignal()\r
         {\r
             TimerSignalType ret = new TimerSignalType(NDalicPINVOKE.Timer_TickSignal(swigCPtr), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r

diff --git a/Tizen.NUI/src/public/Touch.cs b/Tizen.NUI/src/public/Touch.cs
index 59ea8c0..c93706b 100755 (executable)
--- a/Tizen.NUI/src/public/Touch.cs
+++ b/Tizen.NUI/src/public/Touch.cs
@@ -1,173 +1,173 @@
-//------------------------------------------------------------------------------\r
-// <auto-generated />\r
-//\r
-// This file was automatically generated by SWIG (http://www.swig.org).\r
-// Version 3.0.9\r
-//\r
-// Do not make changes to this file unless you know what you are doing--modify\r
-// the SWIG interface file instead.\r
-//------------------------------------------------------------------------------\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    public class Touch : BaseHandle\r
-    {\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-\r
-        internal Touch(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Touch_SWIGUpcast(cPtr), cMemoryOwn)\r
-        {\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Touch obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~Touch()\r
-        {\r
-            DisposeQueue.Instance.Add(this);\r
-        }\r
-\r
-        public override void Dispose()\r
-        {\r
-            if (!Stage.IsInstalled())\r
-            {\r
-                DisposeQueue.Instance.Add(this);\r
-                return;\r
-            }\r
-\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_Touch(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-                base.Dispose();\r
-            }\r
-        }\r
-\r
-\r
-        internal static Touch GetTouchFromPtr(global::System.IntPtr cPtr)\r
-        {\r
-            Touch ret = new Touch(cPtr, false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Touch() : this(NDalicPINVOKE.new_Touch__SWIG_0(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal Touch(Touch other) : this(NDalicPINVOKE.new_Touch__SWIG_1(Touch.getCPtr(other)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal Touch Assign(Touch other)\r
-        {\r
-            Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public uint GetTime()\r
-        {\r
-            uint ret = NDalicPINVOKE.Touch_GetTime(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public uint GetPointCount()\r
-        {\r
-            uint ret = NDalicPINVOKE.Touch_GetPointCount(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public int GetDeviceId(uint point)\r
-        {\r
-            int ret = NDalicPINVOKE.Touch_GetDeviceId(swigCPtr, point);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public PointStateType GetState(uint point)\r
-        {\r
-            PointStateType ret = (PointStateType)NDalicPINVOKE.Touch_GetState(swigCPtr, point);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Actor GetHitActor(uint point)\r
-        {\r
-            Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Vector2 GetLocalPosition(uint point)\r
-        {\r
-            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetLocalPosition(swigCPtr, point), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Vector2 GetScreenPosition(uint point)\r
-        {\r
-            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetScreenPosition(swigCPtr, point), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public float GetRadius(uint point)\r
-        {\r
-            float ret = NDalicPINVOKE.Touch_GetRadius(swigCPtr, point);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public Vector2 GetEllipseRadius(uint point)\r
-        {\r
-            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetEllipseRadius(swigCPtr, point), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public float GetPressure(uint point)\r
-        {\r
-            float ret = NDalicPINVOKE.Touch_GetPressure(swigCPtr, point);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal Degree GetAngle(uint point)\r
-        {\r
-            Degree ret = new Degree(NDalicPINVOKE.Touch_GetAngle(swigCPtr, point), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-    }\r
-\r
-    public enum PointStateType\r
-    {\r
-        Started,\r
-        Finished,\r
-        Down = Started,\r
-        Up = Finished,\r
-        Motion,\r
-        Leave,\r
-        Stationary,\r
-        Interrupted\r
-    }\r
-\r
-}\r
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// 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 Touch : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Touch(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Touch_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Touch obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Touch()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Touch(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+
+        internal static Touch GetTouchFromPtr(global::System.IntPtr cPtr)
+        {
+            Touch ret = new Touch(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Touch() : this(NDalicPINVOKE.new_Touch__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Touch(Touch other) : this(NDalicPINVOKE.new_Touch__SWIG_1(Touch.getCPtr(other)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Touch Assign(Touch other)
+        {
+            Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public uint GetTime()
+        {
+            uint ret = NDalicPINVOKE.Touch_GetTime(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public uint GetPointCount()
+        {
+            uint ret = NDalicPINVOKE.Touch_GetPointCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public int GetDeviceId(uint point)
+        {
+            int ret = NDalicPINVOKE.Touch_GetDeviceId(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public PointStateType GetState(uint point)
+        {
+            PointStateType ret = (PointStateType)NDalicPINVOKE.Touch_GetState(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Actor GetHitActor(uint point)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Vector2 GetLocalPosition(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetLocalPosition(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Vector2 GetScreenPosition(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetScreenPosition(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public float GetRadius(uint point)
+        {
+            float ret = NDalicPINVOKE.Touch_GetRadius(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Vector2 GetEllipseRadius(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetEllipseRadius(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public float GetPressure(uint point)
+        {
+            float ret = NDalicPINVOKE.Touch_GetPressure(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Degree GetAngle(uint point)
+        {
+            Degree ret = new Degree(NDalicPINVOKE.Touch_GetAngle(swigCPtr, point), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
+
+    public enum PointStateType
+    {
+        Started,
+        Finished,
+        Down = Started,
+        Up = Finished,
+        Motion,
+        Leave,
+        Stationary,
+        Interrupted
+    }
+
+}

diff --git a/Tizen.NUI/src/public/Vector3.cs b/Tizen.NUI/src/public/Vector3.cs
index ec03a6a..eaeab18 100755 (executable)
--- a/Tizen.NUI/src/public/Vector3.cs
+++ b/Tizen.NUI/src/public/Vector3.cs
@@ -10,26 +10,26 @@
 // particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
 // damages suffered by licensee as a result of using, modifying or distributing\r
 // this software or its derivatives.\r
-
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-// Some have been manually changed
-
-
+\r
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+// Some have been manually changed\r
+\r
+\r
 namespace Tizen.NUI\r
 {\r
 \r
@@ -319,9 +319,9 @@ namespace Tizen.NUI
             return ret;\r
         }\r
 \r
-        internal Vector3 MultiplyAssign(Quaternion rhs)\r
+        internal Vector3 MultiplyAssign(Rotation rhs)\r
         {\r
-            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Quaternion.getCPtr(rhs)), false);\r
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Rotation.getCPtr(rhs)), false);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
             return ret;\r
         }\r
@@ -579,6 +579,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-    }
-
-}
+    }\r
+\r
+}\r

diff --git a/Tizen.NUI/src/public/Vector4.cs b/Tizen.NUI/src/public/Vector4.cs
index 9bf82d0..84d0c1e 100755 (executable)
--- a/Tizen.NUI/src/public/Vector4.cs
+++ b/Tizen.NUI/src/public/Vector4.cs
@@ -10,26 +10,26 @@
 // particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
 // damages suffered by licensee as a result of using, modifying or distributing\r
 // this software or its derivatives.\r
-
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-// Some have been manually changed
-
-
+\r
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+// Some have been manually changed\r
+\r
+\r
 namespace Tizen.NUI\r
 {\r
 \r
@@ -584,6 +584,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-    }
-
-}
+    }\r
+\r
+}\r

diff --git a/Tizen.NUI/src/public/VideoView.cs b/Tizen.NUI/src/public/VideoView.cs
index c9170d7..a2a7a16 100755 (executable)
--- a/Tizen.NUI/src/public/VideoView.cs
+++ b/Tizen.NUI/src/public/VideoView.cs
@@ -1,339 +1,339 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    using System;\r
-    using System.Runtime.InteropServices;\r
-\r
-\r
-    public class VideoView : View\r
-    {\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-\r
-        internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn)\r
-        {\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~VideoView()\r
-        {\r
-            DisposeQueue.Instance.Add(this);\r
-        }\r
-\r
-        public override void Dispose()\r
-        {\r
-            if (!Stage.IsInstalled())\r
-            {\r
-                DisposeQueue.Instance.Add(this);\r
-                return;\r
-            }\r
-\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_VideoView(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-                base.Dispose();\r
-            }\r
-        }\r
-\r
-\r
-\r
-        /**\r
-          * @brief Event arguments that passed via Finished signal\r
-          *\r
-          */\r
-        public class FinishedEventArgs : EventArgs\r
-        {\r
-            private VideoView _videoView;\r
-\r
-            /**\r
-              * @brief VideoView - VideoView is a control for video playback and display.\r
-              *\r
-              */\r
-            public VideoView VideoView\r
-            {\r
-                get\r
-                {\r
-                    return _videoView;\r
-                }\r
-                set\r
-                {\r
-                    _videoView = value;\r
-                }\r
-            }\r
-        }\r
-\r
-\r
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
-        private delegate void FinishedCallback(IntPtr data);\r
-        private FinishedCallback _videoViewFinishedCallback;\r
-        private EventHandler<FinishedEventArgs> _videoViewFinishedEventHandler;\r
-\r
-\r
-        /**\r
-          * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler\r
-          * (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.\r
-          * Finished signal is emitted when a video playback have finished.\r
-          */\r
-        public event EventHandler<FinishedEventArgs> Finished\r
-        {\r
-            add\r
-            {\r
-                if (_videoViewFinishedCallback == null)\r
-                {\r
-                    _videoViewFinishedCallback = OnFinished;\r
-                    FinishedSignal().Connect(_videoViewFinishedCallback);\r
-                }\r
-                _videoViewFinishedEventHandler += value;\r
-            }\r
-            remove\r
-            {\r
-                if (_videoViewFinishedCallback != null)\r
-                {\r
-                    FinishedSignal().Disconnect(_videoViewFinishedCallback);\r
-                }\r
-                _videoViewFinishedEventHandler -= value;\r
-            }\r
-        }\r
-\r
-        private void OnFinished(IntPtr data)\r
-        {\r
-            FinishedEventArgs e = new FinishedEventArgs();\r
-\r
-            e.VideoView = VideoView.GetVideoViewFromPtr(data);\r
-\r
-            if (_videoViewFinishedEventHandler != null)\r
-            {\r
-                _videoViewFinishedEventHandler(this, e);\r
-            }\r
-        }\r
-\r
-        internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr)\r
-        {\r
-            VideoView ret = new VideoView(cPtr, false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-\r
-        internal class Property : global::System.IDisposable\r
-        {\r
-            private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-            protected bool swigCMemOwn;\r
-\r
-            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)\r
-            {\r
-                swigCMemOwn = cMemoryOwn;\r
-                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-            }\r
-\r
-            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)\r
-            {\r
-                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-            }\r
-\r
-            ~Property()\r
-            {\r
-                Dispose();\r
-            }\r
-\r
-            public virtual void Dispose()\r
-            {\r
-                lock (this)\r
-                {\r
-                    if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                    {\r
-                        if (swigCMemOwn)\r
-                        {\r
-                            swigCMemOwn = false;\r
-                            NDalicPINVOKE.delete_VideoView_Property(swigCPtr);\r
-                        }\r
-                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                    }\r
-                    global::System.GC.SuppressFinalize(this);\r
-                }\r
-            }\r
-\r
-            internal Property() : this(NDalicPINVOKE.new_VideoView_Property(), true)\r
-            {\r
-                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            }\r
-\r
-            internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();\r
-            internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();\r
-            internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();\r
-            internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();\r
-\r
-        }\r
-\r
-        public VideoView() : this(NDalicPINVOKE.VideoView_New__SWIG_0(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-\r
-        }\r
-        public VideoView(string url) : this(NDalicPINVOKE.VideoView_New__SWIG_1(url), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-\r
-        }\r
-        internal VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal VideoView Assign(VideoView videoView)\r
-        {\r
-            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public new static VideoView DownCast(BaseHandle handle)\r
-        {\r
-            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public void Play()\r
-        {\r
-            NDalicPINVOKE.VideoView_Play(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public void Pause()\r
-        {\r
-            NDalicPINVOKE.VideoView_Pause(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public void Stop()\r
-        {\r
-            NDalicPINVOKE.VideoView_Stop(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public void Forward(int millisecond)\r
-        {\r
-            NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public void Backward(int millisecond)\r
-        {\r
-            NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal VideoViewSignal FinishedSignal()\r
-        {\r
-            VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        internal enum PropertyRange\r
-        {\r
-            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX\r
-        }\r
-\r
-        public PropertyMap Video\r
-        {\r
-            get\r
-            {\r
-                PropertyMap temp = new PropertyMap();\r
-                GetProperty(VideoView.Property.VIDEO).Get(temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(VideoView.Property.VIDEO, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public bool Looping\r
-        {\r
-            get\r
-            {\r
-                bool temp = false;\r
-                GetProperty(VideoView.Property.LOOPING).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(VideoView.Property.LOOPING, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public bool Muted\r
-        {\r
-            get\r
-            {\r
-                bool temp = false;\r
-                GetProperty(VideoView.Property.MUTED).Get(ref temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(VideoView.Property.MUTED, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-        public PropertyMap Volume\r
-        {\r
-            get\r
-            {\r
-                PropertyMap temp = new PropertyMap();\r
-                GetProperty(VideoView.Property.VOLUME).Get(temp);\r
-                return temp;\r
-            }\r
-            set\r
-            {\r
-                SetProperty(VideoView.Property.VOLUME, new Tizen.NUI.PropertyValue(value));\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+
+    public class VideoView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~VideoView()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_VideoView(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+
+
+        /**
+          * @brief Event arguments that passed via Finished signal
+          *
+          */
+        public class FinishedEventArgs : EventArgs
+        {
+            private VideoView _videoView;
+
+            /**
+              * @brief VideoView - VideoView is a control for video playback and display.
+              *
+              */
+            public VideoView VideoView
+            {
+                get
+                {
+                    return _videoView;
+                }
+                set
+                {
+                    _videoView = value;
+                }
+            }
+        }
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FinishedCallback(IntPtr data);
+        private FinishedCallback _videoViewFinishedCallback;
+        private EventHandler<FinishedEventArgs> _videoViewFinishedEventHandler;
+
+
+        /**
+          * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.
+          * Finished signal is emitted when a video playback have finished.
+          */
+        public event EventHandler<FinishedEventArgs> Finished
+        {
+            add
+            {
+                if (_videoViewFinishedCallback == null)
+                {
+                    _videoViewFinishedCallback = OnFinished;
+                    FinishedSignal().Connect(_videoViewFinishedCallback);
+                }
+                _videoViewFinishedEventHandler += value;
+            }
+            remove
+            {
+                if (_videoViewFinishedCallback != null)
+                {
+                    FinishedSignal().Disconnect(_videoViewFinishedCallback);
+                }
+                _videoViewFinishedEventHandler -= value;
+            }
+        }
+
+        private void OnFinished(IntPtr data)
+        {
+            FinishedEventArgs e = new FinishedEventArgs();
+
+            e.VideoView = VideoView.GetVideoViewFromPtr(data);
+
+            if (_videoViewFinishedEventHandler != null)
+            {
+                _videoViewFinishedEventHandler(this, e);
+            }
+        }
+
+        internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr)
+        {
+            VideoView ret = new VideoView(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_VideoView_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_VideoView_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();
+            internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();
+            internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();
+            internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();
+
+        }
+
+        public VideoView() : this(NDalicPINVOKE.VideoView_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        public VideoView(string url) : this(NDalicPINVOKE.VideoView_New__SWIG_1(url), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VideoView Assign(VideoView videoView)
+        {
+            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public new static VideoView DownCast(BaseHandle handle)
+        {
+            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void Play()
+        {
+            NDalicPINVOKE.VideoView_Play(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Pause()
+        {
+            NDalicPINVOKE.VideoView_Pause(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Stop()
+        {
+            NDalicPINVOKE.VideoView_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Forward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Backward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VideoViewSignal FinishedSignal()
+        {
+            VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX
+        }
+
+        public PropertyMap Video
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VIDEO).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VIDEO, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public bool Looping
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.LOOPING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.LOOPING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public bool Muted
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.MUTED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.MUTED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public PropertyMap Volume
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VOLUME).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VOLUME, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
+
+}

diff --git a/Tizen.NUI/src/public/View.cs b/Tizen.NUI/src/public/View.cs
index da30045..cc67900 100755 (executable)
--- a/Tizen.NUI/src/public/View.cs
+++ b/Tizen.NUI/src/public/View.cs
@@ -58,6 +58,12 @@ namespace Tizen.NUI
 \r
         public override void Dispose()\r
         {\r
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+\r
             lock (this)\r
             {\r
                 if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
@@ -74,7 +80,6 @@ namespace Tizen.NUI
             }\r
         }\r
 \r
-\r
         private EventHandler _keyInputFocusGainedEventHandler;\r
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]\r
         private delegate void KeyInputFocusGainedCallbackType(IntPtr control);\r

diff --git a/Tizen.NUI/src/public/VisualBase.cs b/Tizen.NUI/src/public/VisualBase.cs
index 4327ace..255206c 100755 (executable)
--- a/Tizen.NUI/src/public/VisualBase.cs
+++ b/Tizen.NUI/src/public/VisualBase.cs
@@ -1,186 +1,186 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved\r
-// PROPRIETARY/CONFIDENTIAL \r
-// This software is the confidential and proprietary\r
-// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall\r
-// not disclose such Confidential Information and shall use it only in\r
-// accordance with the terms of the license agreement you entered into with\r
-// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the\r
-// suitability of the software, either express or implied, including but not\r
-// limited to the implied warranties of merchantability, fitness for a\r
-// particular purpose, or non-infringement. SAMSUNG shall not be liable for any\r
-// damages suffered by licensee as a result of using, modifying or distributing\r
-// this software or its derivatives.\r
-\r
-// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-// http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-\r
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
-// Some have been manually changed\r
-\r
-\r
-namespace Tizen.NUI\r
-{\r
-\r
-    public class VisualBase : BaseHandle\r
-    {\r
-\r
-        private global::System.Runtime.InteropServices.HandleRef swigCPtr;\r
-\r
-        internal VisualBase(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualBase_SWIGUpcast(cPtr), cMemoryOwn)\r
-        {\r
-            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);\r
-        }\r
-\r
-        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualBase obj)\r
-        {\r
-            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;\r
-        }\r
-\r
-        ~VisualBase()\r
-        {\r
-            Dispose();\r
-        }\r
-\r
-        public override void Dispose()\r
-        {\r
-            lock (this)\r
-            {\r
-                if (swigCPtr.Handle != global::System.IntPtr.Zero)\r
-                {\r
-                    if (swigCMemOwn)\r
-                    {\r
-                        swigCMemOwn = false;\r
-                        NDalicPINVOKE.delete_VisualBase(swigCPtr);\r
-                    }\r
-                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);\r
-                }\r
-                global::System.GC.SuppressFinalize(this);\r
-                base.Dispose();\r
-            }\r
-        }\r
-\r
-        public VisualBase() : this(NDalicPINVOKE.new_VisualBase__SWIG_0(), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal VisualBase(VisualBase handle) : this(NDalicPINVOKE.new_VisualBase__SWIG_1(VisualBase.getCPtr(handle)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal VisualBase Assign(VisualBase handle)\r
-        {\r
-            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public string Name\r
-        {\r
-            set\r
-            {\r
-                SetName(value);\r
-            }\r
-            get\r
-            {\r
-                return GetName();\r
-            }\r
-        }\r
-\r
-        internal void SetName(string name)\r
-        {\r
-            NDalicPINVOKE.VisualBase_SetName(swigCPtr, name);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal string GetName()\r
-        {\r
-            string ret = NDalicPINVOKE.VisualBase_GetName(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public void SetTransformAndSize(PropertyMap transform, Vector2 controlSize)\r
-        {\r
-            NDalicPINVOKE.VisualBase_SetTransformAndSize(swigCPtr, PropertyMap.getCPtr(transform), Vector2.getCPtr(controlSize));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public float GetHeightForWidth(float width)\r
-        {\r
-            float ret = NDalicPINVOKE.VisualBase_GetHeightForWidth(swigCPtr, width);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public float GetWidthForHeight(float height)\r
-        {\r
-            float ret = NDalicPINVOKE.VisualBase_GetWidthForHeight(swigCPtr, height);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public void GetNaturalSize(Size2D naturalSize)\r
-        {\r
-            NDalicPINVOKE.VisualBase_GetNaturalSize(swigCPtr, Size2D.getCPtr(naturalSize));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        public float DepthIndex\r
-        {\r
-            set\r
-            {\r
-                SetDepthIndex(value);\r
-            }\r
-            get\r
-            {\r
-                return GetDepthIndex();\r
-            }\r
-        }\r
-        internal void SetDepthIndex(float index)\r
-        {\r
-            NDalicPINVOKE.VisualBase_SetDepthIndex(swigCPtr, index);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal float GetDepthIndex()\r
-        {\r
-            float ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr);\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-            return ret;\r
-        }\r
-\r
-        public PropertyMap Creation\r
-        {\r
-            set\r
-            {\r
-                CreatePropertyMap(value);\r
-            }\r
-        }\r
-        internal void CreatePropertyMap(PropertyMap map)\r
-        {\r
-            NDalicPINVOKE.VisualBase_CreatePropertyMap(swigCPtr, PropertyMap.getCPtr(map));\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-        internal VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true)\r
-        {\r
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
-        }\r
-\r
-    }\r
-\r
-}\r
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// PROPRIETARY/CONFIDENTIAL 
+// This software is the confidential and proprietary
+// information of SAMSUNG ELECTRONICS ("Confidential Information"). You shall
+// not disclose such Confidential Information and shall use it only in
+// accordance with the terms of the license agreement you entered into with
+// SAMSUNG ELECTRONICS. SAMSUNG make no representations or warranties about the
+// suitability of the software, either express or implied, including but not
+// limited to the implied warranties of merchantability, fitness for a
+// particular purpose, or non-infringement. SAMSUNG shall not be liable for any
+// damages suffered by licensee as a result of using, modifying or distributing
+// this software or its derivatives.
+
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+
+namespace Tizen.NUI
+{
+
+    public class VisualBase : BaseHandle
+    {
+
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal VisualBase(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualBase_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualBase obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~VisualBase()
+        {
+            Dispose();
+        }
+
+        public override void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_VisualBase(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+        public VisualBase() : this(NDalicPINVOKE.new_VisualBase__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase(VisualBase handle) : this(NDalicPINVOKE.new_VisualBase__SWIG_1(VisualBase.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase Assign(VisualBase handle)
+        {
+            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public string Name
+        {
+            set
+            {
+                SetName(value);
+            }
+            get
+            {
+                return GetName();
+            }
+        }
+
+        internal void SetName(string name)
+        {
+            NDalicPINVOKE.VisualBase_SetName(swigCPtr, name);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal string GetName()
+        {
+            string ret = NDalicPINVOKE.VisualBase_GetName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetTransformAndSize(PropertyMap transform, Vector2 controlSize)
+        {
+            NDalicPINVOKE.VisualBase_SetTransformAndSize(swigCPtr, PropertyMap.getCPtr(transform), Vector2.getCPtr(controlSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float GetHeightForWidth(float width)
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetHeightForWidth(swigCPtr, width);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public float GetWidthForHeight(float height)
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetWidthForHeight(swigCPtr, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void GetNaturalSize(Size2D naturalSize)
+        {
+            NDalicPINVOKE.VisualBase_GetNaturalSize(swigCPtr, Size2D.getCPtr(naturalSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float DepthIndex
+        {
+            set
+            {
+                SetDepthIndex(value);
+            }
+            get
+            {
+                return GetDepthIndex();
+            }
+        }
+        internal void SetDepthIndex(float index)
+        {
+            NDalicPINVOKE.VisualBase_SetDepthIndex(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetDepthIndex()
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public PropertyMap Creation
+        {
+            set
+            {
+                CreatePropertyMap(value);
+            }
+        }
+        internal void CreatePropertyMap(PropertyMap map)
+        {
+            NDalicPINVOKE.VisualBase_CreatePropertyMap(swigCPtr, PropertyMap.getCPtr(map));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+    }
+
+}

diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs
index 0a96ee4..b95dd75 100755 (executable)
--- a/Tizen.NUI/src/public/Window.cs
+++ b/Tizen.NUI/src/public/Window.cs
@@ -18,14 +18,14 @@
 // You may obtain a copy of the License at\r
 //\r
 // http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
+//
 // Unless required by applicable law or agreed to in writing, software\r
 // distributed under the License is distributed on an "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
-//\r
-\r
+//
+
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
 \r
@@ -77,22 +77,22 @@ namespace Tizen.NUI
         }\r
 \r
 \r
-        public Window(RectInteger windowPosition, string name, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_0(RectInteger.getCPtr(windowPosition), name, isTransparent), true)\r
+        public Window(Rectangle windowPosition, string name, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_0(Rectangle.getCPtr(windowPosition), name, isTransparent), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
 \r
         }\r
-        public Window(RectInteger windowPosition, string name) : this(NDalicPINVOKE.Window_New__SWIG_1(RectInteger.getCPtr(windowPosition), name), true)\r
+        public Window(Rectangle windowPosition, string name) : this(NDalicPINVOKE.Window_New__SWIG_1(Rectangle.getCPtr(windowPosition), name), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
 \r
         }\r
-        public Window(RectInteger windowPosition, string name, string className, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_2(RectInteger.getCPtr(windowPosition), name, className, isTransparent), true)\r
+        public Window(Rectangle windowPosition, string name, string className, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_2(Rectangle.getCPtr(windowPosition), name, className, isTransparent), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
 \r
         }\r
-        public Window(RectInteger windowPosition, string name, string className) : this(NDalicPINVOKE.Window_New__SWIG_3(RectInteger.getCPtr(windowPosition), name, className), true)\r
+        public Window(Rectangle windowPosition, string name, string className) : this(NDalicPINVOKE.Window_New__SWIG_3(Rectangle.getCPtr(windowPosition), name, className), true)\r
         {\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
 \r
@@ -109,19 +109,19 @@ namespace Tizen.NUI
             return ret;\r
         }\r
 \r
-        public void ShowIndicator(IndicatorVisibleMode visibleMode)\r
+        public void ShowIndicator(Window.IndicatorVisibleMode visibleMode)\r
         {\r
             NDalicPINVOKE.Window_ShowIndicator(swigCPtr, (int)visibleMode);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public void SetIndicatorBgOpacity(IndicatorBgOpacity opacity)\r
+        public void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity)\r
         {\r
             NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        public void RotateIndicator(WindowOrientation orientation)\r
+        public void RotateIndicator(Window.WindowOrientation orientation)\r
         {\r
             NDalicPINVOKE.Window_RotateIndicator(swigCPtr, (int)orientation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -151,25 +151,25 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal void AddAvailableOrientation(WindowOrientation orientation)\r
+        internal void AddAvailableOrientation(Window.WindowOrientation orientation)\r
         {\r
             NDalicPINVOKE.Window_AddAvailableOrientation(swigCPtr, (int)orientation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal void RemoveAvailableOrientation(WindowOrientation orientation)\r
+        internal void RemoveAvailableOrientation(Window.WindowOrientation orientation)\r
         {\r
             NDalicPINVOKE.Window_RemoveAvailableOrientation(swigCPtr, (int)orientation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal void SetPreferredOrientation(WindowOrientation orientation)\r
+        internal void SetPreferredOrientation(Window.WindowOrientation orientation)\r
         {\r
             NDalicPINVOKE.Window_SetPreferredOrientation(swigCPtr, (int)orientation);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
         }\r
 \r
-        internal WindowOrientation GetPreferredOrientation()\r
+        internal Window.WindowOrientation GetPreferredOrientation()\r
         {\r
             Window.WindowOrientation ret = (Window.WindowOrientation)NDalicPINVOKE.Window_GetPreferredOrientation(swigCPtr);\r
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();\r
@@ -219,6 +219,6 @@ namespace Tizen.NUI
             Auto = 2\r
         }\r
 \r
-    }\r
-\r
-}\r
+    }
+
+}

diff --git a/Tizen.NUI/src/public/spin.cs b/Tizen.NUI/src/public/spin.cs
new file mode 100755 (executable)
index 0000000..16c0c49
--- /dev/null
+++ b/Tizen.NUI/src/public/spin.cs
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using System.Runtime.InteropServices;
+using Tizen.NUI;
+
+// A spin control (for continously changing values when users can easily predict a set of values)
+
+namespace Tizen.NUI
+{
+public class Spin : CustomView
+  {
+    private VisualBase _arrowVisual;
+    private TextField _textField;
+    private int _arrowVisualPropertyIndex;
+    private string _arrowImage;
+    private int _currentValue;
+    private int _minValue;
+    private int _maxValue;
+    private int _singleStep;
+    private bool _wrappingEnabled;
+    private string _fontFamily;
+    private string _fontStyle;
+    private int _pointSize;
+    private Color _textColor;
+    private Color _textBackgroundColor;
+    private int _maxTextLength;
+
+    // Called by DALi Builder if it finds a Spin control in a JSON file
+    static CustomView CreateInstance()
+    {
+      return new Spin();
+    }
+
+    // static constructor registers the control type (only runs once)
+    static Spin()
+    {
+      // ViewRegistry registers control type with DALi type registery
+      // also uses introspection to find any properties that need to be registered with type registry
+      ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
+    }
+
+    public Spin() : base(typeof(Spin).Name, ViewBehaviour.RequiresKeyboardNavigationSupport | ViewBehaviour.DisableStyleChangeSignals)
+    {
+
+    }
+
+    public override void OnInitialize()
+    {
+      // Initialize the propertiesControl
+      _arrowImage = "./images/arrow.png";
+      _textBackgroundColor = new Color(0.6f, 0.6f, 0.6f, 1.0f);
+      _currentValue = 0;
+      _minValue = 0;
+      _maxValue = 0;
+      _singleStep = 1;
+      _maxTextLength = 0;
+
+      // Create image visual for the arrow keys
+      _arrowVisualPropertyIndex = RegisterProperty("ArrowImage", new PropertyValue(_arrowImage), Tizen.NUI.PropertyAccessMode.ReadWrite);
+      _arrowVisual =  VisualFactory.Get().CreateVisual( _arrowImage, new Uint16Pair(150, 150) );
+      RegisterVisual( _arrowVisualPropertyIndex, _arrowVisual );
+
+      // Create a text field
+      _textField = new TextField();
+      _textField.ParentOrigin = Tizen.NUI.ParentOrigin.Center;
+      _textField.AnchorPoint = Tizen.NUI.AnchorPoint.Center;\r
+            _textField.WidthResizePolicy = ResizePolicyType.SizeRelativeToParent;
+      _textField.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent;\r
+            _textField.SizeModeFactor = new Vector3( 1.0f, 0.45f, 1.0f );
+      _textField.PlaceholderText = "----";
+      _textField.BackgroundColor = _textBackgroundColor;
+      _textField.HorizontalAlignment = "Center";
+      _textField.VerticalAlignment = "Center";
+      _textField.SetKeyboardFocusable(true);
+      _textField.Name = "_textField";
+
+      this.Add(_textField);
+
+      _textField.FocusGained += TextFieldKeyInputFocusGained;
+      _textField.FocusLost += TextFieldKeyInputFocusLost;
+    }
+
+    public override Size GetNaturalSize()
+    {
+      return new Size(150.0f, 150.0f, 0.0f);
+    }
+
+    public void TextFieldKeyInputFocusGained(object source, EventArgs e)
+    {
+      // Make sure when the current spin that takes input focus also takes the keyboard focus
+      // For example, when you tap the spin directly
+      FocusManager.Instance.SetCurrentFocusView(_textField);
+    }
+
+    public void TextFieldKeyInputFocusLost(object source, EventArgs e)
+    {
+      int previousValue = _currentValue;
+
+      // If the input value is invalid, change it back to the previous valid value
+      if(int.TryParse(_textField.Text, out _currentValue))
+      {
+        if (_currentValue < _minValue || _currentValue > _maxValue)
+        {
+          _currentValue = previousValue;
+        }
+      }
+      else
+      {
+        _currentValue = previousValue;
+      }
+
+      // Otherwise take the new value
+      this.Value = _currentValue;
+    }
+
+    public override View GetNextFocusableView(View currentFocusedActor, View.FocusDirection direction, bool loopEnabled)
+    {
+      // Respond to Up/Down keys to change the value while keeping the current spin focused
+      View nextFocusedActor = currentFocusedActor;
+      if (direction == View.FocusDirection.Up)
+      {
+        this.Value += this.Step;
+        nextFocusedActor = _textField;
+      }
+      else if (direction == View.FocusDirection.Down)
+      {
+        this.Value -= this.Step;
+        nextFocusedActor = _textField;
+      }
+      else
+      {
+        // Return a native empty handle as nothing can be focused in the left or right
+        nextFocusedActor = new View();
+        nextFocusedActor.Reset();
+      }
+
+      return nextFocusedActor;
+    }
+
+
+    [ScriptableProperty()]
+    public int Value
+    {
+      get
+      {
+        return _currentValue;
+      }
+      set
+      {
+
+        Console.WriteLine ("Value set to "  + value );
+        _currentValue = value;
+
+        // Make sure no invalid value is accepted
+        if (_currentValue < _minValue)
+        {
+          _currentValue = _minValue;
+        }
+
+        if (_currentValue > _maxValue)
+        {
+          _currentValue = _maxValue;
+        }
+
+        _textField.Text = _currentValue.ToString();
+      }
+    }
+    // MinValue property of type int:
+    [ScriptableProperty()]
+    public int MinValue
+    {
+      get
+      {
+        return _minValue;
+      }
+      set
+      {
+        _minValue = value;
+      }
+    }
+
+    // MaxValue property of type int:
+    [ScriptableProperty()]
+    public int MaxValue
+    {
+      get
+      {
+        return _maxValue;
+      }
+      set
+      {
+        _maxValue = value;
+      }
+    }
+
+    // Step property of type int:
+    [ScriptableProperty()]
+    public int Step
+    {
+      get
+      {
+        return _singleStep;
+      }
+      set
+      {
+        _singleStep = value;
+      }
+    }
+
+    // WrappingEnabled property of type bool:
+    [ScriptableProperty()]
+    public bool WrappingEnabled
+    {
+      get
+      {
+        return _wrappingEnabled;
+      }
+      set
+      {
+        _wrappingEnabled = value;
+      }
+    }
+
+    // TextPointSize property of type int:
+    [ScriptableProperty()]
+    public int TextPointSize
+    {
+      get
+      {
+        return _pointSize;
+      }
+      set
+      {
+        _pointSize = value;
+        _textField.PointSize = _pointSize;
+      }
+    }
+
+    // TextColor property of type Color:
+    [ScriptableProperty()]
+    public Color TextColor
+    {
+      get
+      {
+        return _textColor;
+      }
+      set
+      {
+          Console.WriteLine ("TextColor set to "  + value.R + "," + value.G + ","+ value.B);
+
+        _textColor = value;
+        _textField.TextColor = _textColor;
+      }
+    }
+
+    // MaxTextLength property of type int:
+    [ScriptableProperty()]
+    public int MaxTextLength
+    {
+      get
+      {
+        return _maxTextLength;
+      }
+      set
+      {
+        _maxTextLength = value;
+        _textField.MaxLength = _maxTextLength;
+      }
+    }
+
+    public TextField SpinText
+    {
+      get
+      {
+        return _textField;
+      }
+      set
+      {
+        _textField = value;
+      }
+    }
+
+    // Indicator property of type string:
+    public string IndicatorImage
+    {
+      get
+      {
+        return _arrowImage;
+      }
+      set
+      {
+        _arrowImage = value;
+        _arrowVisual =  VisualFactory.Get().CreateVisual( _arrowImage, new Uint16Pair(150, 150) );
+        RegisterVisual( _arrowVisualPropertyIndex, _arrowVisual );
+      }
+  }
+}
+}
\ No newline at end of file

diff --git a/packaging/dali-sharp.manifest b/packaging/csapi-nui.manifest
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from packaging/dali-sharp.manifest
rename to packaging/csapi-nui.manifest

diff --git a/packaging/dali-sharp.spec b/packaging/csapi-nui.spec
old mode 100644 (file)
new mode 100755 (executable)
similarity index 88%
rename from packaging/dali-sharp.spec
rename to packaging/csapi-nui.spec
index c94e865..b7241c2
--- a/packaging/dali-sharp.spec
+++ b/packaging/csapi-nui.spec
@@ -1,4 +1,4 @@
-Name:       dali-sharp
+Name:       csapi-nui
 Summary:    dali-NUI
 Version:    1.0.0
 Release:    0
@@ -14,14 +14,14 @@ ExcludeArch: aarch64
 BuildRequires: dotnet-build-tools
 
 # C# API Requires
-BuildRequires: csapi-tizen-nuget
+BuildRequires: csapi-application-nuget
 
 %define Assemblies Tizen.NUI
 
 %description
 %{summary}
 
-%dotnet_import_sub_packages
+%_nuget_package
 
 %prep
 %setup -q