Remove Actor class and move Actor APIs into View 97/125997/15
authorUmar <m.umar@partner.samsung.com>
Wed, 19 Apr 2017 18:19:36 +0000 (19:19 +0100)
committerUmar <m.umar@partner.samsung.com>
Wed, 26 Apr 2017 13:14:46 +0000 (14:14 +0100)
Change-Id: I061e3b65c030dfaa4a3186414a1c35a633b77405

57 files changed:
plugins/dali-sharp/.gitignore [new file with mode: 0644]
plugins/dali-sharp/dali-bindings/keyboard_focus_manager_wrap.cpp
plugins/dali-sharp/examples/control-dashboard.cs
plugins/dali-sharp/examples/scroll-view.cs
plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs
plugins/dali-sharp/sharp/internal/AccessibilityManager.cs
plugins/dali-sharp/sharp/internal/Actor.cs [deleted file]
plugins/dali-sharp/sharp/internal/Animation.cs
plugins/dali-sharp/sharp/internal/Builder.cs
plugins/dali-sharp/sharp/internal/Button.cs
plugins/dali-sharp/sharp/internal/Camera.cs [moved from plugins/dali-sharp/sharp/internal/CameraActor.cs with 79% similarity]
plugins/dali-sharp/sharp/internal/CustomActor.cs
plugins/dali-sharp/sharp/internal/CustomActorImpl.cs
plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs
plugins/dali-sharp/sharp/internal/CustomView.cs
plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs
plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs
plugins/dali-sharp/sharp/internal/FocusManager.cs
plugins/dali-sharp/sharp/internal/GaussianBlurView.cs
plugins/dali-sharp/sharp/internal/GestureDetector.cs
plugins/dali-sharp/sharp/internal/Hover.cs
plugins/dali-sharp/sharp/internal/HoverSignal.cs [moved from plugins/dali-sharp/sharp/internal/ActorHoverSignal.cs with 86% similarity]
plugins/dali-sharp/sharp/internal/Item.cs
plugins/dali-sharp/sharp/internal/ItemFactory.cs
plugins/dali-sharp/sharp/internal/ItemLayout.cs
plugins/dali-sharp/sharp/internal/ItemView.cs
plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs
plugins/dali-sharp/sharp/internal/Layer.cs
plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs
plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs
plugins/dali-sharp/sharp/internal/NDalic.cs
plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs
plugins/dali-sharp/sharp/internal/PanGestureDetector.cs
plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs
plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs
plugins/dali-sharp/sharp/internal/Popup.cs
plugins/dali-sharp/sharp/internal/PushButton.cs
plugins/dali-sharp/sharp/internal/RelayoutContainer.cs
plugins/dali-sharp/sharp/internal/RenderTask.cs
plugins/dali-sharp/sharp/internal/ScrollBar.cs
plugins/dali-sharp/sharp/internal/ScrollView.cs
plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs
plugins/dali-sharp/sharp/internal/Stage.cs
plugins/dali-sharp/sharp/internal/TableView.cs
plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs
plugins/dali-sharp/sharp/internal/TapGestureDetector.cs
plugins/dali-sharp/sharp/internal/Touch.cs
plugins/dali-sharp/sharp/internal/TouchDataSignal.cs [moved from plugins/dali-sharp/sharp/internal/ActorTouchDataSignal.cs with 88% similarity]
plugins/dali-sharp/sharp/internal/TouchPoint.cs
plugins/dali-sharp/sharp/internal/View.cs
plugins/dali-sharp/sharp/internal/ViewContainer.cs [moved from plugins/dali-sharp/sharp/internal/ActorContainer.cs with 73% similarity]
plugins/dali-sharp/sharp/internal/ViewImpl.cs
plugins/dali-sharp/sharp/internal/ViewRegistry.cs
plugins/dali-sharp/sharp/internal/ViewSignal.cs [moved from plugins/dali-sharp/sharp/internal/ActorSignal.cs with 89% similarity]
plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs
plugins/dali-sharp/sharp/internal/WheelSignal.cs [moved from plugins/dali-sharp/sharp/internal/ActorWheelSignal.cs with 86% similarity]
plugins/dali-sharp/sharp/internal/Window.cs

diff --git a/plugins/dali-sharp/.gitignore b/plugins/dali-sharp/.gitignore
new file mode 100644 (file)
index 0000000..704f959
--- /dev/null
@@ -0,0 +1,9 @@
+build/aclocal.m4
+build/config.log
+build/config.status
+build/config/
+build/configure
+build/autom4te.cache/
+examples/*.exe
+NDali.dll
+../examples/NDali.dll
index 78c5c0b..9583758 100644 (file)
@@ -623,16 +623,32 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_KeyboardPreFocusChangeSignal_GetConn
   return jresult;
 }
 
-typedef void* (SWIGSTDCALL* SWIG_CallbackKbPreFocusChange)(void *, void *, int);
+typedef Dali::Actor * (SWIGSTDCALL* SWIG_CallbackKbPreFocusChange)(Dali::Actor *, Dali::Actor *, int);
 SWIG_CallbackKbPreFocusChange swig_callbackOnKbPreFocusChange;
 
 Dali::Actor OnKbPreFocusChangeCallback(Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
 {
     Dali::Actor *actorp;
     Dali::Actor actor;
+    Dali::Actor *CurrentP = NULL;
+    Dali::Actor *ProposedP = NULL;
 
-    actorp = (Dali::Actor *)swig_callbackOnKbPreFocusChange((void *)&current, (void *)&proposed, direction);
-    actor = *actorp;
+    if (current)
+    {
+      CurrentP = (Dali::Actor *)&current;
+    }
+
+    if (proposed)
+    {
+      ProposedP = (Dali::Actor *)&proposed;
+    }
+
+    actorp = (Dali::Actor *)swig_callbackOnKbPreFocusChange(CurrentP, ProposedP, direction);
+
+    if (actorp)
+    {
+      actor = *actorp;
+    }
 
     return actor;
 }
index 2b5de66..cff8dad 100755 (executable)
@@ -102,7 +102,7 @@ namespace MyCSharpExample
         }
 
         // Callback for KeyboardFocusManager
-        private Actor OnPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e)
+        private View OnPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e)
         {
             if (!e.Proposed && !e.Current)
             {
@@ -321,7 +321,7 @@ namespace MyCSharpExample
                     {
                         _stage.Add(_popup);
                         _popup.SetDisplayState(Popup.DisplayStateType.SHOWN);
-                        FocusManager.Instance.SetCurrentFocusActor((_popup.FindChildByName("Footer")).FindChildByName("OKButton"));
+                        FocusManager.Instance.SetCurrentFocusView((_popup.FindChildByName("Footer")).FindChildByName("OKButton"));
                         return true;
                     };
                     _contentContainer.AddChild(button, new TableView.CellPosition(((uint)idx / 5) * 2 + 1, (uint)idx % 5));
@@ -372,7 +372,7 @@ namespace MyCSharpExample
         {
             Popup confirmationPopup = new Popup();
 
-            Actor footer = new Actor();
+            View footer = new View();
             footer.SetName("Footer");
             footer.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH);
             footer.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.HEIGHT);
@@ -412,7 +412,7 @@ namespace MyCSharpExample
             confirmationPopup.SetFooter(footer);
             return confirmationPopup;
         }
-        Actor CreateTitle(string title)
+        View CreateTitle(string title)
         {
             TextLabel titleActor = new TextLabel(title);
             titleActor.TextColor = Color.White;
index a7d99b3..a1964c7 100755 (executable)
@@ -21,182 +21,176 @@ using Dali;
 
 namespace MyCSharpExample
 {
-  class Example
-  {
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate void CallbackDelegate(IntPtr data);
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate void ActorCallbackDelegate(IntPtr data);
-
-    private Dali.Application _application;
-    private ScrollView _scrollView;
-    private ScrollBar _scrollBar;
-    private Animation _animation;
-    private TextLabel _text;
-
-    public Example(Dali.Application application)
+    class Example
     {
-      _application = application;
-      _application.Initialized += Initialize;
-    }
+        private Dali.Application _application;
+        private ScrollView _scrollView;
+        private ScrollBar _scrollBar;
+        private Animation _animation;
+        private TextLabel _text;
 
+        public Example(Dali.Application application)
+        {
+            _application = application;
+            _application.Initialized += Initialize;
+        }
 
-    public void Initialize(object source, NUIApplicationInitEventArgs e)
-    {
-      CreateScrollView();
-    }
+        public void Initialize(object source, NUIApplicationInitEventArgs e)
+        {
+            CreateScrollView();
+        }
 
-    private void CreateScrollView()
-    {
-      Stage stage = Stage.GetCurrent();
-      stage.BackgroundColor = Color.White;
-
-      // Create a scroll view
-      _scrollView = new ScrollView();
-      Size2D stageSize = stage.Size;
-      _scrollView.Size = new Position(stageSize.Width, stageSize.Height, 0.0f);
-      _scrollView.ParentOrigin = NDalic.ParentOriginCenter;
-      _scrollView.AnchorPoint = NDalic.AnchorPointCenter;
-      stage.Add(_scrollView);
-
-      // Add actors to a scroll view with 3 pages
-      int pageRows = 1;
-      int pageColumns = 3;
-      for(int pageRow = 0; pageRow < pageRows; pageRow++)
-      {
-        for(int pageColumn = 0; pageColumn < pageColumns; pageColumn++)
+        private void CreateScrollView()
         {
-          View pageActor = new View();
-          pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS);
-          pageActor.ParentOrigin = NDalic.ParentOriginCenter;
-          pageActor.AnchorPoint = NDalic.AnchorPointCenter;
-          pageActor.Position = new Position(pageColumn * stageSize.Width, pageRow * stageSize.Height, 0.0f);
-
-          // Add images in a 3x4 grid layout for each page
-          int imageRows = 4;
-          int imageColumns = 3;
-          float margin = 10.0f;
-          Position imageSize = new Position((stageSize.Width / imageColumns) - margin, (stageSize.Height/ imageRows) - margin, 0.0f);
-
-          for(int row = 0; row < imageRows; row++)
-          {
-            for(int column = 0; column < imageColumns;column++)
+            Stage stage = Stage.GetCurrent();
+            stage.BackgroundColor = Color.White;
+
+            // Create a scroll view
+            _scrollView = new ScrollView();
+            Size2D stageSize = stage.Size;
+            _scrollView.Size = new Position(stageSize.Width, stageSize.Height, 0.0f);
+            _scrollView.ParentOrigin = NDalic.ParentOriginCenter;
+            _scrollView.AnchorPoint = NDalic.AnchorPointCenter;
+            stage.Add(_scrollView);
+
+            // Add actors to a scroll view with 3 pages
+            int pageRows = 1;
+            int pageColumns = 3;
+            for (int pageRow = 0; pageRow < pageRows; pageRow++)
             {
-              int imageId = (row * imageColumns + column) % 2 + 1;
-              ImageView imageView = new ImageView("images/image-" + imageId + ".jpg");
-              imageView.ParentOrigin = NDalic.ParentOriginCenter;
-              imageView.AnchorPoint = NDalic.AnchorPointCenter;
-              imageView.Size = imageSize;
-              imageView.Position = new Position( margin * 0.5f + (imageSize.X + margin) * column - stageSize.Width * 0.5f + imageSize.X * 0.5f,
-                  margin * 0.5f + (imageSize.Y + margin) * row - stageSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f );
-              pageActor.Add(imageView);
+                for (int pageColumn = 0; pageColumn < pageColumns; pageColumn++)
+                {
+                    View pageActor = new View();
+                    pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS);
+                    pageActor.ParentOrigin = NDalic.ParentOriginCenter;
+                    pageActor.AnchorPoint = NDalic.AnchorPointCenter;
+                    pageActor.Position = new Position(pageColumn * stageSize.Width, pageRow * stageSize.Height, 0.0f);
+
+                    // Add images in a 3x4 grid layout for each page
+                    int imageRows = 4;
+                    int imageColumns = 3;
+                    float margin = 10.0f;
+                    Position imageSize = new Position((stageSize.Width / imageColumns) - margin, (stageSize.Height / imageRows) - margin, 0.0f);
+
+                    for (int row = 0; row < imageRows; row++)
+                    {
+                        for (int column = 0; column < imageColumns; column++)
+                        {
+                            int imageId = (row * imageColumns + column) % 2 + 1;
+                            ImageView imageView = new ImageView("images/image-" + imageId + ".jpg");
+                            imageView.ParentOrigin = NDalic.ParentOriginCenter;
+                            imageView.AnchorPoint = NDalic.AnchorPointCenter;
+                            imageView.Size = imageSize;
+                            imageView.Position = new Position(margin * 0.5f + (imageSize.X + margin) * column - stageSize.Width * 0.5f + imageSize.X * 0.5f,
+                                                 margin * 0.5f + (imageSize.Y + margin) * row - stageSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f);
+                            pageActor.Add(imageView);
+                        }
+                    }
+
+                    _scrollView.Add(pageActor);
+                }
             }
-          }
 
-          _scrollView.Add(pageActor);
+            _scrollView.SetAxisAutoLock(true);
+
+            // Set scroll view to have 3 pages in X axis and allow page snapping,
+            // and also disable scrolling in Y axis.
+            RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.Width));
+            RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler());
+            scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.Width * pageColumns, true));
+            scrollRulerY.Disable();
+            _scrollView.SetRulerX(scrollRulerX);
+            _scrollView.SetRulerY(scrollRulerY);
+
+            // Create a horizontal scroll bar in the bottom of scroll view (which is optional)
+            _scrollBar = new ScrollBar();
+            _scrollBar.ParentOrigin = NDalic.ParentOriginBottomLeft;
+            _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft;
+            _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH);
+            _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT);
+            _scrollBar.Orientation = new Rotation(new Radian(new Degree(270.0f)), Vector3.ZAXIS);
+            _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal);
+            _scrollView.Add(_scrollBar);
+
+            // Connect to the OnRelayout signal
+            _scrollView.OnRelayoutEvent += OnScrollViewRelayout;
+            _scrollView.Touched += OnTouch;
+            _scrollView.WheelMoved += Onwheel;
+            _scrollView.KeyInputFocusGained += OnKey;
+            _text = new TextLabel("View Touch Event Handler Test");
+            _text.AnchorPoint = NDalic.AnchorPointTopLeft;
+            _text.HorizontalAlignment = "CENTER";
+            _text.PointSize = 48.0f;
+
+            _scrollView.Add(_text);
         }
-      }
-
-      _scrollView.SetAxisAutoLock(true);
-
-      // Set scroll view to have 3 pages in X axis and allow page snapping,
-      // and also disable scrolling in Y axis.
-      RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.Width));
-      RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler());
-      scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.Width * pageColumns, true));
-      scrollRulerY.Disable();
-      _scrollView.SetRulerX(scrollRulerX);
-      _scrollView.SetRulerY(scrollRulerY);
-
-      // Create a horizontal scroll bar in the bottom of scroll view (which is optional)
-      _scrollBar = new ScrollBar();
-      _scrollBar.ParentOrigin = NDalic.ParentOriginBottomLeft;
-      _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft;
-      _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH);
-      _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT);
-      _scrollBar.Orientation = new Rotation( new Radian( new Degree( 270.0f ) ), Vector3.ZAXIS );
-      _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal);
-      _scrollView.Add(_scrollBar);
-
-      // Connect to the OnRelayout signal
-      _scrollView.OnRelayoutEvent += OnScrollViewRelayout;
-      _scrollView.Touched += OnTouch;
-      _scrollView.WheelMoved += Onwheel;
-      _scrollView.KeyInputFocusGained += OnKey;
-      _text = new TextLabel("View Touch Event Handler Test");
-      _text.AnchorPoint = NDalic.AnchorPointTopLeft;
-      _text.HorizontalAlignment = "CENTER";
-      _text.PointSize = 48.0f;
-
-      _scrollView.Add(_text);
-    }
 
-    // Callback for _animation finished signal handling
-    public void AnimationFinished(object sender, EventArgs e)
-    {
-      Console.WriteLine("Customized Animation Finished Event handler");
-    }
-    private void OnKey(object source, View.KeyInputFocusGainedEventArgs e)
-    {
-      Console.WriteLine("View Keyevent EVENT callback....");
-    }
+        // Callback for _animation finished signal handling
+        public void AnimationFinished(object sender, EventArgs e)
+        {
+            Console.WriteLine("Customized Animation Finished Event handler");
+        }
 
-    private bool Onwheel(object source, View.WheelEventArgs e)
-    {
-      Console.WriteLine("View Wheel EVENT callback....");
-      return true;
-    }
+        private void OnKey(object source, View.KeyInputFocusGainedEventArgs e)
+        {
+            Console.WriteLine("View Keyevent EVENT callback....");
+        }
 
-    private bool OnTouch(object source, View.TouchEventArgs e)
-    {
-      Console.WriteLine("View TOUCH EVENT callback....");
-
-      // Only animate the _text label when touch down happens
-      if( e.Touch.GetState(0) == PointStateType.DOWN )
-      {
-        Console.WriteLine("Customized Stage Touch event handler");
-        // Create a new _animation
-        if( _animation )
+        private bool Onwheel(object source, View.WheelEventArgs e)
         {
-          _animation.Reset();
+            Console.WriteLine("View Wheel EVENT callback....");
+            return true;
         }
 
-        _animation = new Animation(1.0f); // 1 second of duration
+        private bool OnTouch(object source, View.TouchEventArgs e)
+        {
+            Console.WriteLine("View TOUCH EVENT callback....");
 
-        _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));
+            // Only animate the _text label when touch down happens
+            if (e.Touch.GetState(0) == PointStateType.DOWN)
+            {
+                Console.WriteLine("Customized Stage Touch event handler");
+                // Create a new _animation
+                if (_animation)
+                {
+                    _animation.Reset();
+                }
 
-        // Connect the signal callback for animaiton finished signal
-        _animation.Finished += AnimationFinished;
+                _animation = new Animation(1.0f); // 1 second of duration
 
-        // Play the _animation
-        _animation.Play();
-      }
-      return true;
-    }
+                _animation.AnimateTo(new Property(_text, View.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, View.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));
 
-    private void OnScrollViewRelayout(object source, View.OnRelayoutEventArgs e)
-    {
-      Console.WriteLine("View OnRelayoutEventArgs EVENT callback....");
+                // Connect the signal callback for animaiton finished signal
+                _animation.Finished += AnimationFinished;
 
-      // Set the correct scroll bar size after size negotiation of scroll view is done
-      _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.WIDTH), 0.0f);
-    }
+                // Play the _animation
+                _animation.Play();
+            }
+            return true;
+        }
 
-    public void MainLoop()
-    {
-      _application.MainLoop ();
-    }
+        private void OnScrollViewRelayout(object source, View.OnRelayoutEventArgs e)
+        {
+            Console.WriteLine("View OnRelayoutEventArgs EVENT callback....");
+
+            // Set the correct scroll bar size after size negotiation of scroll view is done
+            _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.WIDTH), 0.0f);
+        }
+
+        public void MainLoop()
+        {
+            _application.MainLoop();
+        }
 
-    /// <summary>
-    /// The main entry point for the application.
-    /// </summary>
-    [STAThread]
-      static void Main(string[] args)
-      {
-        Example example = new Example(Application.NewApplication());
-        example.MainLoop ();
-      }
-  }
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main(string[] args)
+        {
+            Example example = new Example(Application.NewApplication());
+            example.MainLoop();
+        }
+    }
 }
index 7112231..e3ceeaf 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, AccessibilityManager.FocusOvershotDirection arg2) {
-    NDalicPINVOKE.AccessibilityFocusOvershotSignal_Emit(swigCPtr, Actor.getCPtr(arg1), (int)arg2);
+  public void Emit(View arg1, AccessibilityManager.FocusOvershotDirection arg2) {
+    NDalicPINVOKE.AccessibilityFocusOvershotSignal_Emit(swigCPtr, View.getCPtr(arg1), (int)arg2);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index d11d123..45f1f5e 100644 (file)
@@ -639,52 +639,52 @@ public class AccessibilityManager : BaseHandle {
       */
     public class FocusChangedEventArgs : EventArgs
     {
-      private Actor _actorCurrent;
-      private Actor _actorNext;
+      private View _viewCurrent;
+      private View _viewNext;
 
-      public Actor ActorCurrent
+      public View ViewCurrent
       {
         get
         {
-          return _actorCurrent;
+          return _viewCurrent;
         }
         set
         {
-          _actorCurrent = value;
+          _viewCurrent = value;
         }
       }
 
-      public Actor ActorNext
+      public View ViewNext
       {
         get
         {
-          return _actorNext;
+          return _viewNext;
         }
         set
         {
-          _actorNext = value;
+          _viewNext = value;
         }
       }
     }
 
     /**
-      * @brief Event arguments that passed via FocusedActorActivated signal
+      * @brief Event arguments that passed via FocusedViewActivated signal
       *
       */
-    public class FocusedActorActivatedEventArgs : EventArgs
+    public class FocusedViewActivatedEventArgs : EventArgs
     {
-      private Actor _actor;
+      private View _view;
 
 
-      public Actor Actor
+      public View View
       {
         get
         {
-          return _actor;
+          return _view;
         }
         set
         {
-          _actor = value;
+          _view = value;
         }
       }
     }
@@ -695,18 +695,18 @@ public class AccessibilityManager : BaseHandle {
       */
     public class FocusOvershotEventArgs : EventArgs
     {
-      private Actor _currentFocusedActor;
+      private View _currentFocusedView;
       private AccessibilityManager.FocusOvershotDirection _focusOvershotDirection;
 
-      public Actor CurrentFocusedActor
+      public View CurrentFocusedView
       {
         get
         {
-          return _currentFocusedActor;
+          return _currentFocusedView;
         }
         set
         {
-          _currentFocusedActor = value;
+          _currentFocusedView = value;
         }
       }
 
@@ -868,12 +868,12 @@ public class AccessibilityManager : BaseHandle {
     private FocusChangedEventCallbackDelegate _accessibilityManagerFocusChangedEventCallbackDelegate;
 
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void FocusedActorActivatedEventCallbackDelegate(IntPtr actor);
-    private DaliEventHandler<object,FocusedActorActivatedEventArgs> _accessibilityManagerFocusedActorActivatedEventHandler;
-    private FocusedActorActivatedEventCallbackDelegate _accessibilityManagerFocusedActorActivatedEventCallbackDelegate;
+    private delegate void FocusedViewActivatedEventCallbackDelegate(IntPtr actor);
+    private DaliEventHandler<object,FocusedViewActivatedEventArgs> _accessibilityManagerFocusedViewActivatedEventHandler;
+    private FocusedViewActivatedEventCallbackDelegate _accessibilityManagerFocusedViewActivatedEventCallbackDelegate;
 
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void FocusOvershotEventCallbackDelegate(IntPtr currentFocusedActor, AccessibilityManager.FocusOvershotDirection direction);
+    private delegate void FocusOvershotEventCallbackDelegate(IntPtr currentFocusedView, AccessibilityManager.FocusOvershotDirection direction);
     private DaliEventHandler<object,FocusOvershotEventArgs> _accessibilityManagerFocusOvershotEventHandler;
     private FocusOvershotEventCallbackDelegate _accessibilityManagerFocusOvershotEventCallbackDelegate;
 
@@ -2191,8 +2191,8 @@ public class AccessibilityManager : BaseHandle {
       FocusChangedEventArgs e = new FocusChangedEventArgs();
 
       // Populate all members of "e" (FocusChangedEventArgs) with real data
-      e.ActorCurrent = Actor.GetActorFromPtr(actor1);
-      e.ActorNext = Actor.GetActorFromPtr(actor2);
+      e.ViewCurrent = View.GetViewFromPtr(actor1);
+      e.ViewNext = View.GetViewFromPtr(actor2);
 
       if (_accessibilityManagerFocusChangedEventHandler != null)
       {
@@ -2201,19 +2201,19 @@ public class AccessibilityManager : BaseHandle {
       }
     }
 
-    public event DaliEventHandler<object,FocusedActorActivatedEventArgs> FocusedActorActivated
+    public event DaliEventHandler<object,FocusedViewActivatedEventArgs> FocusedViewActivated
     {
       add
       {
         lock(this)
         {
           // Restricted to only one listener
-          if (_accessibilityManagerFocusedActorActivatedEventHandler == null)
+          if (_accessibilityManagerFocusedViewActivatedEventHandler == null)
           {
-            _accessibilityManagerFocusedActorActivatedEventHandler += value;
+            _accessibilityManagerFocusedViewActivatedEventHandler += value;
 
-            _accessibilityManagerFocusedActorActivatedEventCallbackDelegate = new FocusedActorActivatedEventCallbackDelegate(OnFocusedActorActivated);
-            this.FocusedActorActivatedSignal().Connect(_accessibilityManagerFocusedActorActivatedEventCallbackDelegate);
+            _accessibilityManagerFocusedViewActivatedEventCallbackDelegate = new FocusedViewActivatedEventCallbackDelegate(OnFocusedViewActivated);
+            this.FocusedViewActivatedSignal().Connect(_accessibilityManagerFocusedViewActivatedEventCallbackDelegate);
           }
         }
       }
@@ -2222,28 +2222,28 @@ public class AccessibilityManager : BaseHandle {
       {
         lock(this)
         {
-          if (_accessibilityManagerFocusedActorActivatedEventHandler != null)
+          if (_accessibilityManagerFocusedViewActivatedEventHandler != null)
           {
-            this.FocusedActorActivatedSignal().Disconnect(_accessibilityManagerFocusedActorActivatedEventCallbackDelegate);
+            this.FocusedViewActivatedSignal().Disconnect(_accessibilityManagerFocusedViewActivatedEventCallbackDelegate);
           }
 
-          _accessibilityManagerFocusedActorActivatedEventHandler -= value;
+          _accessibilityManagerFocusedViewActivatedEventHandler -= value;
         }
       }
     }
 
-    // Callback for AccessibilityManager FocusedActorActivatedSignal
-    private void OnFocusedActorActivated(IntPtr actor)
+    // Callback for AccessibilityManager FocusedViewActivatedSignal
+    private void OnFocusedViewActivated(IntPtr actor)
     {
-      FocusedActorActivatedEventArgs e = new FocusedActorActivatedEventArgs();
+      FocusedViewActivatedEventArgs e = new FocusedViewActivatedEventArgs();
 
-      // Populate all members of "e" (FocusedActorActivatedEventArgs) with real data
-      e.Actor = Actor.GetActorFromPtr(actor);
+      // Populate all members of "e" (FocusedViewActivatedEventArgs) with real data
+      e.View = View.GetViewFromPtr(actor);
 
-      if (_accessibilityManagerFocusedActorActivatedEventHandler != null)
+      if (_accessibilityManagerFocusedViewActivatedEventHandler != null)
       {
         //here we send all data to user event handlers
-        _accessibilityManagerFocusedActorActivatedEventHandler(this, e);
+        _accessibilityManagerFocusedViewActivatedEventHandler(this, e);
       }
     }
 
@@ -2280,12 +2280,12 @@ public class AccessibilityManager : BaseHandle {
     }
 
     // Callback for AccessibilityManager FocusOvershotSignal
-    private void OnFocusOvershot(IntPtr currentFocusedActor, AccessibilityManager.FocusOvershotDirection direction)
+    private void OnFocusOvershot(IntPtr currentFocusedView, AccessibilityManager.FocusOvershotDirection direction)
     {
       FocusOvershotEventArgs e = new FocusOvershotEventArgs();
 
       // Populate all members of "e" (FocusOvershotEventArgs) with real data
-      e.CurrentFocusedActor = Actor.GetActorFromPtr(currentFocusedActor);
+      e.CurrentFocusedView = View.GetViewFromPtr(currentFocusedView);
       e.FocusOvershotDirection = direction;
 
       if (_accessibilityManagerFocusOvershotEventHandler != null)
@@ -2313,24 +2313,24 @@ public class AccessibilityManager : BaseHandle {
     return ret;
   }
 
-  public void SetAccessibilityAttribute(Actor actor, AccessibilityManager.AccessibilityAttribute type, string text) {
-    NDalicPINVOKE.AccessibilityManager_SetAccessibilityAttribute(swigCPtr, Actor.getCPtr(actor), (int)type, text);
+  public void SetAccessibilityAttribute(View view, AccessibilityManager.AccessibilityAttribute type, string text) {
+    NDalicPINVOKE.AccessibilityManager_SetAccessibilityAttribute(swigCPtr, View.getCPtr(view), (int)type, text);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public string GetAccessibilityAttribute(Actor actor, AccessibilityManager.AccessibilityAttribute type) {
-    string ret = NDalicPINVOKE.AccessibilityManager_GetAccessibilityAttribute(swigCPtr, Actor.getCPtr(actor), (int)type);
+  public string GetAccessibilityAttribute(View view, AccessibilityManager.AccessibilityAttribute type) {
+    string ret = NDalicPINVOKE.AccessibilityManager_GetAccessibilityAttribute(swigCPtr, View.getCPtr(view), (int)type);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void SetFocusOrder(Actor actor, uint order) {
-    NDalicPINVOKE.AccessibilityManager_SetFocusOrder(swigCPtr, Actor.getCPtr(actor), order);
+  public void SetFocusOrder(View view, uint order) {
+    NDalicPINVOKE.AccessibilityManager_SetFocusOrder(swigCPtr, View.getCPtr(view), order);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public uint GetFocusOrder(Actor actor) {
-    uint ret = NDalicPINVOKE.AccessibilityManager_GetFocusOrder(swigCPtr, Actor.getCPtr(actor));
+  public uint GetFocusOrder(View view) {
+    uint ret = NDalicPINVOKE.AccessibilityManager_GetFocusOrder(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -2341,26 +2341,26 @@ public class AccessibilityManager : BaseHandle {
     return ret;
   }
 
-  public Actor GetActorByFocusOrder(uint order) {
-    Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetActorByFocusOrder(swigCPtr, order), true);
+  public View GetViewByFocusOrder(uint order) {
+    View ret = new View(NDalicPINVOKE.AccessibilityManager_GetActorByFocusOrder(swigCPtr, order), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public bool SetCurrentFocusActor(Actor actor) {
-    bool ret = NDalicPINVOKE.AccessibilityManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(actor));
+  public bool SetCurrentFocusView(View view) {
+    bool ret = NDalicPINVOKE.AccessibilityManager_SetCurrentFocusActor(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetCurrentFocusActor() {
-    Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusActor(swigCPtr), true);
+  public View GetCurrentFocusView() {
+    View ret = new View(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetCurrentFocusGroup() {
-    Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusGroup(swigCPtr), true);
+  public View GetCurrentFocusGroup() {
+    View ret = new View(NDalicPINVOKE.AccessibilityManager_GetCurrentFocusGroup(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -2393,13 +2393,13 @@ public class AccessibilityManager : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetFocusGroup(Actor actor, bool isFocusGroup) {
-    NDalicPINVOKE.AccessibilityManager_SetFocusGroup(swigCPtr, Actor.getCPtr(actor), isFocusGroup);
+  public void SetFocusGroup(View view, bool isFocusGroup) {
+    NDalicPINVOKE.AccessibilityManager_SetFocusGroup(swigCPtr, View.getCPtr(view), isFocusGroup);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public bool IsFocusGroup(Actor actor) {
-    bool ret = NDalicPINVOKE.AccessibilityManager_IsFocusGroup(swigCPtr, Actor.getCPtr(actor));
+  public bool IsFocusGroup(View view) {
+    bool ret = NDalicPINVOKE.AccessibilityManager_IsFocusGroup(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -2426,19 +2426,19 @@ public class AccessibilityManager : BaseHandle {
     return ret;
   }
 
-  public void SetFocusIndicatorActor(Actor indicator) {
-    NDalicPINVOKE.AccessibilityManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator));
+  public void SetFocusIndicatorView(View indicator) {
+    NDalicPINVOKE.AccessibilityManager_SetFocusIndicatorActor(swigCPtr, View.getCPtr(indicator));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetFocusIndicatorActor() {
-    Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetFocusIndicatorActor(swigCPtr), true);
+  public View GetFocusIndicatorView() {
+    View ret = new View(NDalicPINVOKE.AccessibilityManager_GetFocusIndicatorActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetFocusGroup(Actor actor) {
-    Actor ret = new Actor(NDalicPINVOKE.AccessibilityManager_GetFocusGroup(swigCPtr, Actor.getCPtr(actor)), true);
+  public View GetFocusGroup(View view) {
+    View ret = new View(NDalicPINVOKE.AccessibilityManager_GetFocusGroup(swigCPtr, View.getCPtr(view)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -2461,8 +2461,8 @@ public class AccessibilityManager : BaseHandle {
     return ret;
   }
 
-  public ActorSignal FocusedActorActivatedSignal() {
-    ActorSignal ret = new ActorSignal(NDalicPINVOKE.AccessibilityManager_FocusedActorActivatedSignal(swigCPtr), false);
+  public ViewSignal FocusedViewActivatedSignal() {
+    ViewSignal ret = new ViewSignal(NDalicPINVOKE.AccessibilityManager_FocusedActorActivatedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
diff --git a/plugins/dali-sharp/sharp/internal/Actor.cs b/plugins/dali-sharp/sharp/internal/Actor.cs
deleted file mode 100644 (file)
index 9b6a89b..0000000
+++ /dev/null
@@ -1,1597 +0,0 @@
-/** 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
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.10
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Dali {
-
-    using System;
-    using System.Runtime.InteropServices;
-
-public class Actor : Animatable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Actor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Actor_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Actor obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Actor() {
-    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_Actor(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-
-    public static Actor GetActorFromPtr(global::System.IntPtr cPtr) {
-      Actor ret = new Actor(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-
-    public IntPtr GetPtrfromActor ()
-    {
-      return (IntPtr)swigCPtr;
-    }
-
-    public Position CurrentPosition
-    {
-      get
-      {
-        return GetCurrentPosition();
-      }
-    }
-
-    public Size2D Size2D
-    {
-      get
-      {
-        Size temp = new Size(0.0f,0.0f,0.0f);
-        GetProperty( Actor.Property.SIZE).Get(  temp );
-        return new Size2D(temp);
-      }
-      set
-      {
-        SetProperty( Actor.Property.SIZE, new Dali.Property.Value( new Size(value) ) );
-      }
-    }
-
-    public Size CurrentSize
-    {
-      get
-      {
-        return GetCurrentSize();
-      }
-    }
-
-    public Actor Parent
-    {
-      get
-      {
-        return GetParent();
-      }
-    }
-
-    public bool Visibility
-    {
-      get
-      {
-        return IsVisible();
-      }
-    }
-
-    public float Opacity
-    {
-      get
-      {
-        float temp = 0;
-        GetProperty( Actor.Property.OPACITY ).Get( ref temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( Actor.Property.OPACITY, new Dali.Property.Value( value ) );
-      }
-    }
-
-    public Position2D Position2D
-    {
-      get
-      {
-        Position temp = new Position(0.0f,0.0f,0.0f);
-        GetProperty( Actor.Property.POSITION).Get(  temp );
-        return new Position2D(temp);
-      }
-      set
-      {
-        SetProperty( Actor.Property.POSITION, new Dali.Property.Value( new Position(value) ) );
-      }
-    }
-
-    public Vector2 ScreenPosition
-    {
-      get
-      {
-        Vector2 temp = new Vector2( 0.0f, 0.0f );
-        GetProperty( Actor.Property.SCREEN_POSITION ).Get( temp );
-        return temp;
-      }
-    }
-
-    protected bool PositionUsesAnchorPoint
-    {
-      get
-      {
-        bool temp = false;
-        GetProperty( Actor.Property.POSITION_USES_ANCHOR_POINT ).Get( ref temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( Actor.Property.POSITION_USES_ANCHOR_POINT, new Dali.Property.Value( value ) );
-      }
-    }
-
-    public bool StateFocusEnable
-    {
-      get
-      {
-        return IsKeyboardFocusable();
-      }
-      set
-      {
-        SetKeyboardFocusable(value);
-      }
-    }
-
-    public bool IsOnStage
-    {
-      get
-      {
-        return OnStage();
-      }
-    }
-
-    public int SiblingOrder
-    {
-      get
-      {
-        int temp = 0;
-        GetProperty( Actor.Property.SIBLING_ORDER ).Get( ref temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( Actor.Property.SIBLING_ORDER, new Dali.Property.Value( value ) );
-      }
-    }
-
-    public void Show()
-    {
-      SetVisible(true);
-    }
-
-    public void Hide()
-    {
-      SetVisible(false);
-    }
-
-    public void Raise()
-    {
-      NDalicPINVOKE.Raise(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public void Lower()
-    {
-      NDalicPINVOKE.Lower(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public void RaiseToTop()
-    {
-      NDalicPINVOKE.RaiseToTop(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public void LowerToBottom()
-    {
-      NDalicPINVOKE.LowerToBottom(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public void RaiseAbove(Actor target)
-    {
-      NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-    public void LowerBelow(Actor target)
-    {
-      NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-
-
-  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;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Actor_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();
-    public static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get();
-    public static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get();
-    public static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get();
-  
-    public Property() : this(NDalicPINVOKE.new_Actor_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get();
-    public static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get();
-    public static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get();
-    public static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get();
-    public static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get();
-    public static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get();
-    public static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get();
-    public static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get();
-    public static readonly int SIZE = NDalicPINVOKE.Actor_Property_SIZE_get();
-    public static readonly int SIZE_WIDTH = NDalicPINVOKE.Actor_Property_SIZE_WIDTH_get();
-    public static readonly int SIZE_HEIGHT = NDalicPINVOKE.Actor_Property_SIZE_HEIGHT_get();
-    public static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get();
-    public static readonly int POSITION = NDalicPINVOKE.Actor_Property_POSITION_get();
-    public static readonly int POSITION_X = NDalicPINVOKE.Actor_Property_POSITION_X_get();
-    public static readonly int POSITION_Y = NDalicPINVOKE.Actor_Property_POSITION_Y_get();
-    public static readonly int POSITION_Z = NDalicPINVOKE.Actor_Property_POSITION_Z_get();
-    public static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get();
-    public static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get();
-    public static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get();
-    public static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get();
-    public static readonly int ORIENTATION = NDalicPINVOKE.Actor_Property_ORIENTATION_get();
-    public static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get();
-    public static readonly int SCALE = NDalicPINVOKE.Actor_Property_SCALE_get();
-    public static readonly int SCALE_X = NDalicPINVOKE.Actor_Property_SCALE_X_get();
-    public static readonly int SCALE_Y = NDalicPINVOKE.Actor_Property_SCALE_Y_get();
-    public static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get();
-    public static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get();
-    public static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get();
-    public static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get();
-    public static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get();
-    public static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get();
-    public static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get();
-    public static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get();
-    public static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get();
-    public static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get();
-    public static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get();
-    public static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get();
-    public static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get();
-    public static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get();
-    public static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get();
-    public static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get();
-    public static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get();
-    public static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get();
-    public static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get();
-    public static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get();
-    public static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get();
-    public static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get();
-    public static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get();
-    public static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get();
-    public static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get();
-    public static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get();
-    public static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get();
-    public static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get();
-    public static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get();
-  
-  }
-
-  public Actor () : this (NDalicPINVOKE.Actor_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public new static Actor DownCast(BaseHandle handle) {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor(Actor copy) : this(NDalicPINVOKE.new_Actor__SWIG_1(Actor.getCPtr(copy)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor Assign(Actor rhs) {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_Assign(swigCPtr, Actor.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public string GetName() {
-    string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetName(string name) {
-    NDalicPINVOKE.Actor_SetName(swigCPtr, name);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public uint GetId() {
-    uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsRoot() {
-    bool ret = NDalicPINVOKE.Actor_IsRoot(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool OnStage() {
-    bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsLayer() {
-    bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Layer GetLayer() {
-    Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Add(Actor child) {
-    NDalicPINVOKE.Actor_Add(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Remove(Actor child) {
-    NDalicPINVOKE.Actor_Remove(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Unparent() {
-    NDalicPINVOKE.Actor_Unparent(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public uint GetChildCount() {
-    uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor GetChildAt(uint index) {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor FindChildByName(string actorName) {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildByName(swigCPtr, actorName), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor FindChildById(uint id) {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor GetParent() {
-    Actor ret = new Actor(NDalicPINVOKE.Actor_GetParent(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetParentOrigin(Vector3 origin) {
-    NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetCurrentParentOrigin() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetAnchorPoint(Vector3 anchorPoint) {
-    NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetCurrentAnchorPoint() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSize(float width, float height) {
-    NDalicPINVOKE.Actor_SetSize__SWIG_0(swigCPtr, width, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSize(float width, float height, float depth) {
-    NDalicPINVOKE.Actor_SetSize__SWIG_1(swigCPtr, width, height, depth);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSize(Vector2 size) {
-    NDalicPINVOKE.Actor_SetSize__SWIG_2(swigCPtr, Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSize(Vector3 size) {
-    NDalicPINVOKE.Actor_SetSize__SWIG_3(swigCPtr, Vector3.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetTargetSize() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetTargetSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 GetCurrentSize() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 GetNaturalSize() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetPosition(float x, float y) {
-    NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetPosition(float x, float y, float z) {
-    NDalicPINVOKE.Actor_SetPosition__SWIG_1(swigCPtr, x, y, z);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetPosition(Vector3 position) {
-    NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetX(float x) {
-    NDalicPINVOKE.Actor_SetX(swigCPtr, x);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetY(float y) {
-    NDalicPINVOKE.Actor_SetY(swigCPtr, y);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetZ(float z) {
-    NDalicPINVOKE.Actor_SetZ(swigCPtr, z);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void TranslateBy(Vector3 distance) {
-    NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetCurrentPosition() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 GetCurrentWorldPosition() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetInheritPosition(bool inherit) {
-    NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PositionInheritanceMode GetPositionInheritanceMode() {
-    PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsPositionInherited() {
-    bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetOrientation(Degree angle, Vector3 axis) {
-    NDalicPINVOKE.Actor_SetOrientation__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetOrientation(Radian angle, Vector3 axis) {
-    NDalicPINVOKE.Actor_SetOrientation__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetOrientation(Rotation orientation) {
-    NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RotateBy(Degree angle, Vector3 axis) {
-    NDalicPINVOKE.Actor_RotateBy__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RotateBy(Radian angle, Vector3 axis) {
-    NDalicPINVOKE.Actor_RotateBy__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RotateBy(Rotation relativeRotation) {
-    NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Rotation.getCPtr(relativeRotation));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Rotation GetCurrentOrientation() {
-    Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetInheritOrientation(bool inherit) {
-    NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsOrientationInherited() {
-    bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Rotation GetCurrentWorldOrientation() {
-    Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetScale(float scale) {
-    NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetScale(float scaleX, float scaleY, float scaleZ) {
-    NDalicPINVOKE.Actor_SetScale__SWIG_1(swigCPtr, scaleX, scaleY, scaleZ);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetScale(Vector3 scale) {
-    NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void ScaleBy(Vector3 relativeScale) {
-    NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetCurrentScale() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 GetCurrentWorldScale() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetInheritScale(bool inherit) {
-    NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsScaleInherited() {
-    bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Matrix GetCurrentWorldMatrix() {
-    Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetVisible(bool visible) {
-    NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsVisible() {
-    bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetOpacity(float opacity) {
-    NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetCurrentOpacity() {
-    float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetColor(Vector4 color) {
-    NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetCurrentColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetColorMode(ColorMode colorMode) {
-    NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ColorMode GetColorMode() {
-    ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 GetCurrentWorldColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDrawMode(DrawModeType drawMode) {
-    NDalicPINVOKE.Actor_SetDrawMode(swigCPtr, (int)drawMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public DrawModeType GetDrawMode() {
-    DrawModeType ret = (DrawModeType)NDalicPINVOKE.Actor_GetDrawMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSensitive(bool sensitive) {
-    NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsSensitive() {
-    bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool ScreenToLocal(out float localX, out float localY, float screenX, float screenY) {
-    bool ret = NDalicPINVOKE.Actor_ScreenToLocal(swigCPtr, out localX, out localY, screenX, screenY);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetLeaveRequired(bool required) {
-    NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool GetLeaveRequired() {
-    bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyboardFocusable(bool focusable) {
-    NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsKeyboardFocusable() {
-    bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetResizePolicy(ResizePolicyType policy, DimensionType dimension) {
-    NDalicPINVOKE.Actor_SetResizePolicy(swigCPtr, (int)policy, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ResizePolicyType GetResizePolicy(DimensionType dimension) {
-    ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.Actor_GetResizePolicy(swigCPtr, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSizeScalePolicy(SizeScalePolicyType policy) {
-    NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public SizeScalePolicyType GetSizeScalePolicy() {
-    SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSizeModeFactor(Vector3 factor) {
-    NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetSizeModeFactor() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetSizeModeFactor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetHeightForWidth(float width) {
-    float ret = NDalicPINVOKE.Actor_GetHeightForWidth(swigCPtr, width);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetWidthForHeight(float height) {
-    float ret = NDalicPINVOKE.Actor_GetWidthForHeight(swigCPtr, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetRelayoutSize(DimensionType dimension) {
-    float ret = NDalicPINVOKE.Actor_GetRelayoutSize(swigCPtr, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetPadding(PaddingType padding) {
-    NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void GetPadding(PaddingType paddingOut) {
-    NDalicPINVOKE.Actor_GetPadding(swigCPtr, PaddingType.getCPtr(paddingOut));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetMinimumSize(Vector2 size) {
-    NDalicPINVOKE.Actor_SetMinimumSize(swigCPtr, Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 GetMinimumSize() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMinimumSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetMaximumSize(Vector2 size) {
-    NDalicPINVOKE.Actor_SetMaximumSize(swigCPtr, Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 GetMaximumSize() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMaximumSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int GetHierarchyDepth() {
-    int ret = NDalicPINVOKE.Actor_GetHierarchyDepth(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint AddRenderer(Renderer renderer) {
-    uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetRendererCount() {
-    uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Renderer GetRendererAt(uint index) {
-    Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void RemoveRenderer(Renderer renderer) {
-    NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveRenderer(uint index) {
-    NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t TouchedSignal() {
-    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);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorTouchDataSignal TouchSignal() {
-    ActorTouchDataSignal ret = new ActorTouchDataSignal(NDalicPINVOKE.Actor_TouchSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorHoverSignal HoveredSignal() {
-    ActorHoverSignal ret = new ActorHoverSignal(NDalicPINVOKE.Actor_HoveredSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorWheelSignal WheelEventSignal() {
-    ActorWheelSignal ret = new ActorWheelSignal(NDalicPINVOKE.Actor_WheelEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorSignal OnStageSignal() {
-    ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorSignal OffStageSignal() {
-    ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorSignal OnRelayoutSignal() {
-    ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 ParentOrigin
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.PARENT_ORIGIN).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ParentOriginZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.PARENT_ORIGIN_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PARENT_ORIGIN_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 AnchorPoint
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.ANCHOR_POINT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float AnchorPointZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.ANCHOR_POINT_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ANCHOR_POINT_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 Size
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SIZE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeWidth
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public float SizeDepth
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SIZE_DEPTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_DEPTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 Position
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.POSITION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float PositionZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.POSITION_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 WorldPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_POSITION).Get(  temp );
-      return temp;
-    }
-}  public float WorldPositionX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_X).Get( ref temp );
-      return temp;
-    }
-}  public float WorldPositionY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_Y).Get( ref temp );
-      return temp;
-    }
-}  public float WorldPositionZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.WORLD_POSITION_Z).Get( ref temp );
-      return temp;
-    }
-}  public Rotation Orientation
-  {
-    get
-    {
-      Rotation temp = new Rotation();
-      GetProperty( Actor.Property.ORIENTATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ORIENTATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public Rotation WorldOrientation
-  {
-    get
-    {
-      Rotation temp = new Rotation();
-      GetProperty( Actor.Property.WORLD_ORIENTATION).Get(  temp );
-      return temp;
-    }
-}  public Vector3 Scale
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SCALE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleX
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_X).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_X, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleY
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_Y).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_Y, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ScaleZ
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.SCALE_Z).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SCALE_Z, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 WorldScale
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_SCALE).Get(  temp );
-      return temp;
-    }
-}  public bool Visible
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.VISIBLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.VISIBLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorRed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_RED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_RED, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorGreen
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_GREEN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_GREEN, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorBlue
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_BLUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_BLUE, new Dali.Property.Value( value ) );
-    }
-  }
-  public float ColorAlpha
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Actor.Property.COLOR_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_ALPHA, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector4 WorldColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.WORLD_COLOR).Get(  temp );
-      return temp;
-    }
-}  public Matrix WorldMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( Actor.Property.WORLD_MATRIX).Get(  temp );
-      return temp;
-    }
-}  public string Name
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.NAME).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.NAME, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool Sensitive
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.SENSITIVE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SENSITIVE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool LeaveRequired
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.LEAVE_REQUIRED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.LEAVE_REQUIRED, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritOrientation
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_ORIENTATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_ORIENTATION, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritScale
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_SCALE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_SCALE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ColorMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.COLOR_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string PositionInheritance
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.POSITION_INHERITANCE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.POSITION_INHERITANCE, new Dali.Property.Value( value ) );
-    }
-  }
-  public string DrawMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.DRAW_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.DRAW_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector3 SizeModeFactor
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.SIZE_MODE_FACTOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_MODE_FACTOR, new Dali.Property.Value( value ) );
-    }
-  }
-  public string WidthResizePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.WIDTH_RESIZE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.WIDTH_RESIZE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public string HeightResizePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.HEIGHT_RESIZE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.HEIGHT_RESIZE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public string SizeScalePolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.SIZE_SCALE_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.SIZE_SCALE_POLICY, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool WidthForHeight
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.WIDTH_FOR_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.WIDTH_FOR_HEIGHT, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool HeightForWidth
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.HEIGHT_FOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.HEIGHT_FOR_WIDTH, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector4 Padding
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.PADDING).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.PADDING, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector2 MinimumSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Actor.Property.MINIMUM_SIZE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.MINIMUM_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Vector2 MaximumSize
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Actor.Property.MAXIMUM_SIZE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.MAXIMUM_SIZE, new Dali.Property.Value( value ) );
-    }
-  }
-  public bool InheritPosition
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_POSITION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.INHERIT_POSITION, new Dali.Property.Value( value ) );
-    }
-  }
-  public string ClippingMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Actor.Property.CLIPPING_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.CLIPPING_MODE, new Dali.Property.Value( value ) );
-    }
-  }
-
-}
-
-}
index 0c42191..8cb9407 100644 (file)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Dali {
+namespace Dali
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
-public class Animation : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Animation(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Animation_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+    public class Animation : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Animation obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal Animation(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Animation_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  ~Animation() {
-    DisposeQueue.Instance.Add(this);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Animation obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        ~Animation()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Animation(swigCPtr);
+        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_Animation(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
 
 
 
-    private EventCallbackDelegateType1<IntPtr> _animationFinishedEventCallbackDelegate;
-    private event EventHandler _animationFinishedEventHandler;
+        private EventCallbackDelegateType1<IntPtr> _animationFinishedEventCallbackDelegate;
+
+        private event EventHandler _animationFinishedEventHandler;
 
-    /**
+        /**
       * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler
       * Finished signal is emitted when an Animation's animations have finished.
       */
-    public event EventHandler Finished
-    {
-      add
-      {
-        lock(this)
-        {
-          _animationFinishedEventHandler += value;
-          _animationFinishedEventCallbackDelegate = OnFinished;
-          this.FinishedSignal().Connect(_animationFinishedEventCallbackDelegate);
-        }
-      }
-      remove
-      {
-        lock(this)
-        {
-          if (_animationFinishedEventHandler != null)
-          {
-            this.FinishedSignal().Disconnect(_animationFinishedEventCallbackDelegate);
-          }
-          _animationFinishedEventHandler -= value;
-        }
-      }
-    }
-
-    // Callback for Animation FinishedSignal
-    private void OnFinished(IntPtr data)
-    {
-      if (_animationFinishedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _animationFinishedEventHandler(this, null);
-      }
-    }
-
-  public static Animation GetAnimationFromPtr(global::System.IntPtr cPtr) {
-    Animation ret = new Animation(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private float MilliSecondsToSeconds( int millisec )
-  {
-    return (float)millisec / 1000.0f;
-  }
-
-  private int SecondsToMilliSeconds( float sec )
-  {
-    return (int)( sec * 1000 );
-  }
-
-  public int Duration
-  {
-    set
-    {
-      SetDuration( MilliSecondsToSeconds( value ) );
-    }
-    get
-    {
-      return SecondsToMilliSeconds( GetDuration() );
-    }
-  }
-
-  public AlphaFunction DefaultAlphaFunction
-  {
-    set
-    {
-       SetDefaultAlphaFunction(value);
-    }
-    get
-    {
-       AlphaFunction ret = GetDefaultAlphaFunction();
-       return ret;
-    }
-  }
-
-  public Animation.State Status
-  {
-    get
-    {
-       return GetState();
-    }
-  }
-
-  public int LoopCount
-  {
-    set
-    {
-      SetLoopCount(value);
-    }
-    get
-    {
-      int ret = GetLoopCount();
-      return ret;
-    }
-  }
-
-  public bool Looping
-  {
-    set
-    {
-      SetLooping(value);
-    }
-    get
-    {
-      bool ret = IsLooping();
-      return ret;
-    }
-  }
-
-  public Animation.EndActions EndAction
-  {
-    set
-    {
-      SetEndAction(value);
-    }
-    get
-    {
-      return GetEndAction();
-    }
-  }
-
-  public void Stop(Animation.EndActions action) 
-  {
-    SetEndAction(action);
-    NDalicPINVOKE.Animation_Stop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public int StartTime { set; get; }
-  public int EndTime { set; get; }
-  public string TargetProperty { set; get; }
-  public object Destination { set; get; }
-  public Dali.AlphaFunction AlphaFunction { set; get; }
+        public event EventHandler Finished
+        {
+            add
+            {
+                lock (this)
+                {
+                    _animationFinishedEventHandler += value;
+                    _animationFinishedEventCallbackDelegate = OnFinished;
+                    this.FinishedSignal().Connect(_animationFinishedEventCallbackDelegate);
+                }
+            }
+            remove
+            {
+                lock (this)
+                {
+                    if (_animationFinishedEventHandler != null)
+                    {
+                        this.FinishedSignal().Disconnect(_animationFinishedEventCallbackDelegate);
+                    }
+                    _animationFinishedEventHandler -= value;
+                }
+            }
+        }
 
+        // Callback for Animation FinishedSignal
+        private void OnFinished(IntPtr data)
+        {
+            if (_animationFinishedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _animationFinishedEventHandler(this, null);
+            }
+        }
 
-  public void AnimateBy(Actor target)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public static Animation GetAnimationFromPtr(global::System.IntPtr cPtr)
+        {
+            Animation ret = new Animation(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    dynamic obj = (object)Destination;
+        private float MilliSecondsToSeconds(int millisec)
+        {
+            return (float)millisec / 1000.0f;
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        private int SecondsToMilliSeconds(float sec)
+        {
+            return (int)(sec * 1000);
+        }
 
-  public void AnimateBy(Actor target, string propertyIndex)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public int Duration
+        {
+            set
+            {
+                SetDuration(MilliSecondsToSeconds(value));
+            }
+            get
+            {
+                return SecondsToMilliSeconds(GetDuration());
+            }
+        }
 
-    dynamic obj = (object)Destination;
+        public AlphaFunction DefaultAlphaFunction
+        {
+            set
+            {
+                SetDefaultAlphaFunction(value);
+            }
+            get
+            {
+                AlphaFunction ret = GetDefaultAlphaFunction();
+                return ret;
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        public Animation.State Status
+        {
+            get
+            {
+                return GetState();
+            }
+        }
 
-  public void AnimateBy(Actor target, string propertyIndex, object relativeValue)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public int LoopCount
+        {
+            set
+            {
+                SetLoopCount(value);
+            }
+            get
+            {
+                int ret = GetLoopCount();
+                return ret;
+            }
+        }
 
-    dynamic obj = (object)relativeValue;
+        public bool Looping
+        {
+            set
+            {
+                SetLooping(value);
+            }
+            get
+            {
+                bool ret = IsLooping();
+                return ret;
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        public Animation.EndActions EndAction
+        {
+            set
+            {
+                SetEndAction(value);
+            }
+            get
+            {
+                return GetEndAction();
+            }
+        }
 
-  public void AnimateTo(Actor target)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public void Stop(Animation.EndActions action)
+        {
+            SetEndAction(action);
+            NDalicPINVOKE.Animation_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    dynamic obj = (object)Destination;
+        public int StartTime { set; get; }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        public int EndTime { set; get; }
 
-  public void AnimateTo(Actor target, string propertyIndex)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public string TargetProperty { set; get; }
 
-    dynamic obj = (object)Destination;
+        public object Destination { set; get; }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        public Dali.AlphaFunction AlphaFunction { set; get; }
 
-  public void AnimateTo(Actor target, string propertyIndex, object destinationValue)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
 
-    dynamic obj = (object)destinationValue;
+        public void AnimateBy(View target)
+        {
+            string _str1 = TargetProperty.Substring(0, 1);
+            string _str2 = TargetProperty.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)Destination;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time );
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj) );
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        public void AnimateBy(View target, string propertyIndex)
+        {
+            string _str1 = propertyIndex.Substring(0, 1);
+            string _str2 = propertyIndex.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)Destination;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
-  public void AnimateBetween(Actor target, KeyFrames keyFrames)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public void AnimateBy(View target, string propertyIndex, object relativeValue)
+        {
+            string _str1 = propertyIndex.Substring(0, 1);
+            string _str2 = propertyIndex.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)relativeValue;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBy(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBy(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
+        public void AnimateTo(View target)
+        {
+            string _str1 = TargetProperty.Substring(0, 1);
+            string _str2 = TargetProperty.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)Destination;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction);
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time);
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames);
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBetween(new Property(target, _str), keyFrames, time);
-      }
-    }
-  }
+        public void AnimateTo(View target, string propertyIndex)
+        {
+            string _str1 = propertyIndex.Substring(0, 1);
+            string _str2 = propertyIndex.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)Destination;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
-  public void AnimateBetween(Actor target, KeyFrames keyFrames, Animation.Interpolation interpolation)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        public void AnimateTo(View target, string propertyIndex, object destinationValue)
+        {
+            string _str1 = propertyIndex.Substring(0, 1);
+            string _str2 = propertyIndex.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            dynamic obj = (object)destinationValue;
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateTo(new Property(target, _str), new Property.Value(obj));
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateTo(new Property(target, _str), new Property.Value(obj), time);
+                }
+            }
+        }
 
+        public void AnimateBetween(View target, KeyFrames keyFrames)
+        {
+            string _str1 = TargetProperty.Substring(0, 1);
+            string _str2 = TargetProperty.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBetween(new Property(target, _str), keyFrames);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBetween(new Property(target, _str), keyFrames, time);
+                }
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, interpolation);
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time, interpolation);
-      }
-    }
-    else
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames, interpolation);
-      }
-      else
-      {
-        Dali.TimePeriod time = new Dali.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBetween(new Property(target, _str), keyFrames, time, interpolation);
-      }
-    }
-  }
+        public void AnimateBetween(View target, KeyFrames keyFrames, Animation.Interpolation interpolation)
+        {
+            string _str1 = TargetProperty.Substring(0, 1);
+            string _str2 = TargetProperty.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+
+            if (this.AlphaFunction != null)
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, interpolation);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, time, interpolation);
+                }
+            }
+            else
+            {
+                if (this.StartTime == 0 && this.EndTime == 0)
+                {
+                    AnimateBetween(new Property(target, _str), keyFrames, interpolation);
+                }
+                else
+                {
+                    Dali.TimePeriod time = new Dali.TimePeriod(MilliSecondsToSeconds(this.StartTime), MilliSecondsToSeconds(this.EndTime - this.StartTime));
+                    AnimateBetween(new Property(target, _str), keyFrames, time, interpolation);
+                }
+            }
+        }
 
 
-  /**
+        /**
    * @brief Create an initialized Animation.
    *
    * The animation will not loop.
@@ -490,304 +508,416 @@ public class Animation : BaseHandle {
    * @return A handle to a newly allocated Dali resource.
    * @pre DurationmSeconds must be greater than zero.
    */
-  public Animation (int durationmSeconds) : this (NDalicPINVOKE.Animation_New((float)durationmSeconds/1000.0f), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Animation () : this (NDalicPINVOKE.Animation_New( 0.0f ), true ) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-  
-
-  public Animation (float durationSeconds) : this (NDalicPINVOKE.Animation_New(durationSeconds), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public static Animation DownCast(BaseHandle handle) {
-    Animation ret = new Animation(NDalicPINVOKE.Animation_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Animation(Animation handle) : this(NDalicPINVOKE.new_Animation__SWIG_1(Animation.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Animation Assign(Animation rhs) {
-    Animation ret = new Animation(NDalicPINVOKE.Animation_Assign(swigCPtr, Animation.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDuration(float seconds) {
-    NDalicPINVOKE.Animation_SetDuration(swigCPtr, seconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetDuration() {
-    float ret = NDalicPINVOKE.Animation_GetDuration(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetLooping(bool looping) {
-    NDalicPINVOKE.Animation_SetLooping(swigCPtr, looping);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetLoopCount(int count) {
-    NDalicPINVOKE.Animation_SetLoopCount(swigCPtr, count);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public int GetLoopCount() {
-    int ret = NDalicPINVOKE.Animation_GetLoopCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int GetCurrentLoop() {
-    int ret = NDalicPINVOKE.Animation_GetCurrentLoop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsLooping() {
-    bool ret = NDalicPINVOKE.Animation_IsLooping(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetEndAction(Animation.EndActions action) {
-    NDalicPINVOKE.Animation_SetEndAction(swigCPtr, (int)action);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Animation.EndActions GetEndAction() {
-    Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDisconnectAction(Animation.EndActions disconnectAction) {
-    NDalicPINVOKE.Animation_SetDisconnectAction(swigCPtr, (int)disconnectAction);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Animation.EndActions GetDisconnectAction() {
-    Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetDisconnectAction(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDefaultAlphaFunction(AlphaFunction alpha) {
-    NDalicPINVOKE.Animation_SetDefaultAlphaFunction(swigCPtr, AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AlphaFunction GetDefaultAlphaFunction() {
-    AlphaFunction ret = new AlphaFunction(NDalicPINVOKE.Animation_GetDefaultAlphaFunction(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetCurrentProgress(float progress) {
-    NDalicPINVOKE.Animation_SetCurrentProgress(swigCPtr, progress);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetCurrentProgress() {
-    float ret = NDalicPINVOKE.Animation_GetCurrentProgress(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSpeedFactor(float factor) {
-    NDalicPINVOKE.Animation_SetSpeedFactor(swigCPtr, factor);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetSpeedFactor() {
-    float ret = NDalicPINVOKE.Animation_GetSpeedFactor(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetPlayRange(Vector2 range) {
-    NDalicPINVOKE.Animation_SetPlayRange(swigCPtr, Vector2.getCPtr(range));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 GetPlayRange() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Animation_GetPlayRange(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Play() {
-    NDalicPINVOKE.Animation_Play(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void PlayFrom(float progress) {
-    NDalicPINVOKE.Animation_PlayFrom(swigCPtr, progress);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Pause() {
-    NDalicPINVOKE.Animation_Pause(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Animation.State GetState() {
-    Animation.State ret = (Animation.State)NDalicPINVOKE.Animation_GetState(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Stop() {
-    NDalicPINVOKE.Animation_Stop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Clear() {
-    NDalicPINVOKE.Animation_Clear(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AnimationSignal FinishedSignal() {
-    AnimationSignal ret = new AnimationSignal(NDalicPINVOKE.Animation_FinishedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void AnimateBy(Property target, Property.Value relativeValue) {
-    NDalicPINVOKE.Animation_AnimateBy__SWIG_0(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBy(Property target, Property.Value relativeValue, AlphaFunction alpha) {
-    NDalicPINVOKE.Animation_AnimateBy__SWIG_1(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBy(Property target, Property.Value relativeValue, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateBy__SWIG_2(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBy(Property target, Property.Value relativeValue, AlphaFunction alpha, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateBy__SWIG_3(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateTo(Property target, Property.Value destinationValue) {
-    NDalicPINVOKE.Animation_AnimateTo__SWIG_0(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateTo(Property target, Property.Value destinationValue, AlphaFunction alpha) {
-    NDalicPINVOKE.Animation_AnimateTo__SWIG_1(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateTo(Property target, Property.Value destinationValue, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateTo__SWIG_2(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateTo(Property target, Property.Value destinationValue, AlphaFunction alpha, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateTo__SWIG_3(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_0(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, Animation.Interpolation interpolation) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_1(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), (int)interpolation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_2(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, Animation.Interpolation interpolation) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_3(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), (int)interpolation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_4(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period, Animation.Interpolation interpolation) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_5(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period), (int)interpolation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_6(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period, Animation.Interpolation interpolation) {
-    NDalicPINVOKE.Animation_AnimateBetween__SWIG_7(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period), (int)interpolation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Animate(Actor actor, Path path, Vector3 forward) {
-    NDalicPINVOKE.Animation_Animate__SWIG_0(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha) {
-    NDalicPINVOKE.Animation_Animate__SWIG_1(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Animate(Actor actor, Path path, Vector3 forward, TimePeriod period) {
-    NDalicPINVOKE.Animation_Animate__SWIG_2(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Animate(Actor actor, Path path, Vector3 forward, AlphaFunction alpha, TimePeriod period) {
-    NDalicPINVOKE.Animation_Animate__SWIG_3(swigCPtr, Actor.getCPtr(actor), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Show(Actor actor, float delaySeconds) {
-    NDalicPINVOKE.Animation_Show(swigCPtr, Actor.getCPtr(actor), delaySeconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Hide(Actor actor, float delaySeconds) {
-    NDalicPINVOKE.Animation_Hide(swigCPtr, Actor.getCPtr(actor), delaySeconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public enum EndActions {
-    Cancel,
-    Discard,
-    StopFinal
-  }
-
-  public enum Interpolation {
-    Linear,
-    Cubic
-  }
-
-  public enum State {
-    Stopped,
-    Playing,
-    Paused
-  }
+        public Animation(int durationmSeconds) : this(NDalicPINVOKE.Animation_New((float)durationmSeconds / 1000.0f), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        public Animation() : this(NDalicPINVOKE.Animation_New(0.0f), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+
+        public Animation(float durationSeconds) : this(NDalicPINVOKE.Animation_New(durationSeconds), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        public static Animation DownCast(BaseHandle handle)
+        {
+            Animation ret = new Animation(NDalicPINVOKE.Animation_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Animation(Animation handle) : this(NDalicPINVOKE.new_Animation__SWIG_1(Animation.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Animation Assign(Animation rhs)
+        {
+            Animation ret = new Animation(NDalicPINVOKE.Animation_Assign(swigCPtr, Animation.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetDuration(float seconds)
+        {
+            NDalicPINVOKE.Animation_SetDuration(swigCPtr, seconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float GetDuration()
+        {
+            float ret = NDalicPINVOKE.Animation_GetDuration(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetLooping(bool looping)
+        {
+            NDalicPINVOKE.Animation_SetLooping(swigCPtr, looping);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetLoopCount(int count)
+        {
+            NDalicPINVOKE.Animation_SetLoopCount(swigCPtr, count);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public int GetLoopCount()
+        {
+            int ret = NDalicPINVOKE.Animation_GetLoopCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public int GetCurrentLoop()
+        {
+            int ret = NDalicPINVOKE.Animation_GetCurrentLoop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public bool IsLooping()
+        {
+            bool ret = NDalicPINVOKE.Animation_IsLooping(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetEndAction(Animation.EndActions action)
+        {
+            NDalicPINVOKE.Animation_SetEndAction(swigCPtr, (int)action);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Animation.EndActions GetEndAction()
+        {
+            Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetDisconnectAction(Animation.EndActions disconnectAction)
+        {
+            NDalicPINVOKE.Animation_SetDisconnectAction(swigCPtr, (int)disconnectAction);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Animation.EndActions GetDisconnectAction()
+        {
+            Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetDisconnectAction(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetDefaultAlphaFunction(AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_SetDefaultAlphaFunction(swigCPtr, AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public AlphaFunction GetDefaultAlphaFunction()
+        {
+            AlphaFunction ret = new AlphaFunction(NDalicPINVOKE.Animation_GetDefaultAlphaFunction(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetCurrentProgress(float progress)
+        {
+            NDalicPINVOKE.Animation_SetCurrentProgress(swigCPtr, progress);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float GetCurrentProgress()
+        {
+            float ret = NDalicPINVOKE.Animation_GetCurrentProgress(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetSpeedFactor(float factor)
+        {
+            NDalicPINVOKE.Animation_SetSpeedFactor(swigCPtr, factor);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float GetSpeedFactor()
+        {
+            float ret = NDalicPINVOKE.Animation_GetSpeedFactor(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetPlayRange(Vector2 range)
+        {
+            NDalicPINVOKE.Animation_SetPlayRange(swigCPtr, Vector2.getCPtr(range));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Vector2 GetPlayRange()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Animation_GetPlayRange(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void Play()
+        {
+            NDalicPINVOKE.Animation_Play(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void PlayFrom(float progress)
+        {
+            NDalicPINVOKE.Animation_PlayFrom(swigCPtr, progress);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Pause()
+        {
+            NDalicPINVOKE.Animation_Pause(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Animation.State GetState()
+        {
+            Animation.State ret = (Animation.State)NDalicPINVOKE.Animation_GetState(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void Stop()
+        {
+            NDalicPINVOKE.Animation_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Clear()
+        {
+            NDalicPINVOKE.Animation_Clear(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public AnimationSignal FinishedSignal()
+        {
+            AnimationSignal ret = new AnimationSignal(NDalicPINVOKE.Animation_FinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void AnimateBy(Property target, Property.Value relativeValue)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_0(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBy(Property target, Property.Value relativeValue, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_1(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBy(Property target, Property.Value relativeValue, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_2(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBy(Property target, Property.Value relativeValue, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_3(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateTo(Property target, Property.Value destinationValue)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_0(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateTo(Property target, Property.Value destinationValue, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_1(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateTo(Property target, Property.Value destinationValue, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_2(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateTo(Property target, Property.Value destinationValue, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_3(swigCPtr, Property.getCPtr(target), Property.Value.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_0(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, Animation.Interpolation interpolation)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_1(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), (int)interpolation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_2(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, Animation.Interpolation interpolation)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_3(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), (int)interpolation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_4(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, TimePeriod period, Animation.Interpolation interpolation)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_5(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), TimePeriod.getCPtr(period), (int)interpolation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_6(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void AnimateBetween(Property target, KeyFrames keyFrames, AlphaFunction alpha, TimePeriod period, Animation.Interpolation interpolation)
+        {
+            NDalicPINVOKE.Animation_AnimateBetween__SWIG_7(swigCPtr, Property.getCPtr(target), KeyFrames.getCPtr(keyFrames), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period), (int)interpolation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Animate(View view, Path path, Vector3 forward)
+        {
+            NDalicPINVOKE.Animation_Animate__SWIG_0(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Animate(View view, Path path, Vector3 forward, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_Animate__SWIG_1(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Animate(View view, Path path, Vector3 forward, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_Animate__SWIG_2(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Animate(View view, Path path, Vector3 forward, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_Animate__SWIG_3(swigCPtr, View.getCPtr(view), Path.getCPtr(path), Vector3.getCPtr(forward), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Show(View view, float delaySeconds)
+        {
+            NDalicPINVOKE.Animation_Show(swigCPtr, View.getCPtr(view), delaySeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Hide(View view, float delaySeconds)
+        {
+            NDalicPINVOKE.Animation_Hide(swigCPtr, View.getCPtr(view), delaySeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public enum EndActions
+        {
+            Cancel,
+            Discard,
+            StopFinal
+        }
+
+        public enum Interpolation
+        {
+            Linear,
+            Cubic
+        }
+
+        public enum State
+        {
+            Stopped,
+            Playing,
+            Paused
+        }
+
+    }
 
 }
index 867bdc1..9730348 100644 (file)
@@ -190,14 +190,14 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public Animation CreateAnimation(string animationName, Actor sourceActor) {
-    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_2(swigCPtr, animationName, Actor.getCPtr(sourceActor)), true);
+  public Animation CreateAnimation(string animationName, View sourceActor) {
+    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_2(swigCPtr, animationName, View.getCPtr(sourceActor)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Animation CreateAnimation(string animationName, Property.Map map, Actor sourceActor) {
-    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_3(swigCPtr, animationName, Property.Map.getCPtr(map), Actor.getCPtr(sourceActor)), true);
+  public Animation CreateAnimation(string animationName, Property.Map map, View sourceActor) {
+    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_3(swigCPtr, animationName, Property.Map.getCPtr(map), View.getCPtr(sourceActor)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -232,13 +232,13 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public void AddActors(Actor toActor) {
-    NDalicPINVOKE.Builder_AddActors__SWIG_0(swigCPtr, Actor.getCPtr(toActor));
+  public void AddViews(View toView) {
+    NDalicPINVOKE.Builder_AddActors__SWIG_0(swigCPtr, View.getCPtr(toView));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void AddActors(string sectionName, Actor toActor) {
-    NDalicPINVOKE.Builder_AddActors__SWIG_1(swigCPtr, sectionName, Actor.getCPtr(toActor));
+  public void AddViews(string sectionName, View toView) {
+    NDalicPINVOKE.Builder_AddActors__SWIG_1(swigCPtr, sectionName, View.getCPtr(toView));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 81aa7db..d9767f6 100644 (file)
@@ -617,8 +617,8 @@ public class StateChangedEventArgs : EventArgs
     return ret;
   }
 
-  public void SetLabel(Actor label) {
-    NDalicPINVOKE.Button_SetLabel(swigCPtr, Actor.getCPtr(label));
+  public void SetLabel(View label) {
+    NDalicPINVOKE.Button_SetLabel(swigCPtr, View.getCPtr(label));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -632,14 +632,14 @@ public class StateChangedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetButtonImage() {
-    Actor ret = new Actor(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);
+  public View GetButtonImage() {
+    View ret = new View(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetSelectedImage() {
-    Actor ret = new Actor(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);
+  public View GetSelectedImage() {
+    View ret = new View(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
 namespace Dali {
 
-public class CameraActor : Actor {
+    public class Camera : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn) {
+  internal Camera(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) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Camera obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~CameraActor() {
+  ~Camera() {
     DisposeQueue.Instance.Add(this);
   }
 
-  public override void Dispose() {
+  public virtual void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);
       return;
@@ -56,7 +56,6 @@ public class CameraActor : Actor {
         swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
       global::System.GC.SuppressFinalize(this);
-      base.Dispose();
     }
   }
 
@@ -112,26 +111,26 @@ public class CameraActor : Actor {
   
   }
 
-  public CameraActor () : this (NDalicPINVOKE.CameraActor_New__SWIG_0(), true) {
+  public Camera () : this (NDalicPINVOKE.CameraActor_New__SWIG_0(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
   }
-  public CameraActor (Vector2 size) : this (NDalicPINVOKE.CameraActor_New__SWIG_1(Vector2.getCPtr(size)), true) {
+  public Camera (Vector2 size) : this (NDalicPINVOKE.CameraActor_New__SWIG_1(Vector2.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);
+  public new static Camera DownCast(BaseHandle handle) {
+    Camera ret = new Camera(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.getCPtr(copy)), true) {
+  public Camera(Camera copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(Camera.getCPtr(copy)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public CameraActor Assign(CameraActor rhs) {
-    CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_Assign(swigCPtr, CameraActor.getCPtr(rhs)), false);
+  public Camera Assign(Camera rhs) {
+    Camera ret = new Camera(NDalicPINVOKE.CameraActor_Assign(swigCPtr, Camera.getCPtr(rhs)), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -244,12 +243,12 @@ public class CameraActor : Actor {
     get
     {
       string temp;
-      GetProperty( CameraActor.Property.TYPE).Get( out temp );
+      GetProperty( Camera.Property.TYPE).Get( out temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.TYPE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.TYPE, new Dali.Property.Value( value ) );
     }
   }
   public string ProjectionMode
@@ -257,12 +256,12 @@ public class CameraActor : Actor {
     get
     {
       string temp;
-      GetProperty( CameraActor.Property.PROJECTION_MODE).Get( out temp );
+      GetProperty( Camera.Property.PROJECTION_MODE).Get( out temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.PROJECTION_MODE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.PROJECTION_MODE, new Dali.Property.Value( value ) );
     }
   }
   public float FieldOfView
@@ -270,12 +269,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.FIELD_OF_VIEW).Get( ref temp );
+      GetProperty( Camera.Property.FIELD_OF_VIEW).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.FIELD_OF_VIEW, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.FIELD_OF_VIEW, new Dali.Property.Value( value ) );
     }
   }
   public float AspectRatio
@@ -283,12 +282,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.ASPECT_RATIO).Get( ref temp );
+      GetProperty( Camera.Property.ASPECT_RATIO).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.ASPECT_RATIO, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.ASPECT_RATIO, new Dali.Property.Value( value ) );
     }
   }
   public float NearPlaneDistance
@@ -296,12 +295,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.NEAR_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.NEAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public float FarPlaneDistance
@@ -309,12 +308,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.FAR_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.FAR_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.FAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.FAR_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public float LeftPlaneDistance
@@ -322,12 +321,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.LEFT_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.LEFT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public float RightPlaneDistance
@@ -335,12 +334,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.RIGHT_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.RIGHT_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public float TopPlaneDistance
@@ -348,12 +347,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.TOP_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.TOP_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.TOP_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.TOP_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public float BottomPlaneDistance
@@ -361,12 +360,12 @@ public class CameraActor : Actor {
     get
     {
       float temp = 0.0f;
-      GetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp );
+      GetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE, new Dali.Property.Value( value ) );
     }
   }
   public Vector3 TargetPosition
@@ -374,12 +373,12 @@ public class CameraActor : Actor {
     get
     {
       Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( CameraActor.Property.TARGET_POSITION).Get(  temp );
+      GetProperty( Camera.Property.TARGET_POSITION).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.TARGET_POSITION, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.TARGET_POSITION, new Dali.Property.Value( value ) );
     }
   }
   public Matrix ProjectionMatrix
@@ -387,7 +386,7 @@ public class CameraActor : Actor {
     get
     {
       Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.PROJECTION_MATRIX).Get(  temp );
+      GetProperty( Camera.Property.PROJECTION_MATRIX).Get(  temp );
       return temp;
     }
 }  public Matrix ViewMatrix
@@ -395,7 +394,7 @@ public class CameraActor : Actor {
     get
     {
       Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.VIEW_MATRIX).Get(  temp );
+      GetProperty( Camera.Property.VIEW_MATRIX).Get(  temp );
       return temp;
     }
 }  public bool InvertYAxis
@@ -403,12 +402,12 @@ public class CameraActor : Actor {
     get
     {
       bool temp = false;
-      GetProperty( CameraActor.Property.INVERT_Y_AXIS).Get( ref temp );
+      GetProperty( Camera.Property.INVERT_Y_AXIS).Get( ref temp );
       return temp;
     }
     set
     {
-      SetProperty( CameraActor.Property.INVERT_Y_AXIS, new Dali.Property.Value( value ) );
+      SetProperty( Camera.Property.INVERT_Y_AXIS, new Dali.Property.Value( value ) );
     }
   }
 
index 53eacc2..e1da6fa 100644 (file)
@@ -10,7 +10,7 @@
 
 namespace Dali {
 
-public class CustomActor : Actor {
+    public class CustomActor : Animatable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal CustomActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActor_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -25,7 +25,7 @@ public class CustomActor : Actor {
     DisposeQueue.Instance.Add(this);
   }
 
-  public override void Dispose() {
+  public virtual void Dispose() {
     if (!Stage.IsInstalled()) {
       DisposeQueue.Instance.Add(this);
       return;
@@ -40,7 +40,6 @@ public class CustomActor : Actor {
         swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
       global::System.GC.SuppressFinalize(this);
-      base.Dispose();
     }
   }
 
index e8502a4..209eaaa 100644 (file)
@@ -51,13 +51,13 @@ public class CustomActorImpl : RefObject {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public virtual void OnChildAdd(Actor child) {
-    NDalicPINVOKE.CustomActorImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child));
+  public virtual void OnChildAdd(View child) {
+    NDalicPINVOKE.CustomActorImpl_OnChildAdd(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public virtual void OnChildRemove(Actor child) {
-    NDalicPINVOKE.CustomActorImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child));
+  public virtual void OnChildRemove(View child) {
+    NDalicPINVOKE.CustomActorImpl_OnChildRemove(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -116,8 +116,8 @@ public class CustomActorImpl : RefObject {
     return ret;
   }
 
-  public virtual float CalculateChildSize(Actor child, DimensionType dimension) {
-    float ret = NDalicPINVOKE.CustomActorImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension);
+  public virtual float CalculateChildSize(View child, DimensionType dimension) {
+    float ret = NDalicPINVOKE.CustomActorImpl_CalculateChildSize(swigCPtr, View.getCPtr(child), (int)dimension);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 4cf224d..34b8a2c 100644 (file)
@@ -46,8 +46,8 @@ public class CustomAlgorithmInterface : global::System.IDisposable {
   }
 
 
-  public virtual Actor GetNextFocusableActor(Actor current, Actor proposed, View.KeyboardFocus.Direction direction) {
-    Actor ret = new Actor(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, Actor.getCPtr(current), Actor.getCPtr(proposed), (int)direction), true);
+  public virtual View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction) {
+    View ret = new View(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, View.getCPtr(current), View.getCPtr(proposed), (int)direction), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -58,8 +58,8 @@ public class CustomAlgorithmInterface : global::System.IDisposable {
   }
 
   private void SwigDirectorConnect() {
-    if (SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateCustomAlgorithmInterface_0(SwigDirectorGetNextFocusableActor);
+    if (SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes0))
+      swigDelegate0 = new SwigDelegateCustomAlgorithmInterface_0(SwigDirectorGetNextFocusableView);
     NDalicPINVOKE.CustomAlgorithmInterface_director_connect(swigCPtr, swigDelegate0);
   }
 
@@ -69,15 +69,15 @@ public class CustomAlgorithmInterface : global::System.IDisposable {
     return hasDerivedMethod;
   }
 
-  private global::System.IntPtr SwigDirectorGetNextFocusableActor(global::System.IntPtr current, global::System.IntPtr proposed, int direction) {
-    return Actor.getCPtr(GetNextFocusableActor(new Actor(current, true), new Actor(proposed, true), (View.KeyboardFocus.Direction)direction)).Handle;
+  private global::System.IntPtr SwigDirectorGetNextFocusableView(global::System.IntPtr current, global::System.IntPtr proposed, int direction) {
+    return View.getCPtr(GetNextFocusableView(new View(current, true), new View(proposed, true), (View.KeyboardFocus.Direction)direction)).Handle;
   }
 
   public delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction);
 
   private SwigDelegateCustomAlgorithmInterface_0 swigDelegate0;
 
-  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(Actor), typeof(Actor), typeof(View.KeyboardFocus.Direction) };
+  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(View), typeof(View), typeof(View.KeyboardFocus.Direction) };
 }
 
 }
index 5d21371..9811515 100644 (file)
@@ -53,7 +53,7 @@ namespace Dali
             viewWrapperImpl.OnAccessibilityZoom = new ViewWrapperImpl.OnAccessibilityZoomDelegate(OnAccessibilityZoom);
             viewWrapperImpl.OnKeyInputFocusGained = new ViewWrapperImpl.OnKeyInputFocusGainedDelegate(OnKeyInputFocusGained);
             viewWrapperImpl.OnKeyInputFocusLost = new ViewWrapperImpl.OnKeyInputFocusLostDelegate(OnKeyInputFocusLost);
-            viewWrapperImpl.GetNextKeyboardFocusableActor = new ViewWrapperImpl.GetNextKeyboardFocusableActorDelegate(GetNextKeyboardFocusableActor);
+            viewWrapperImpl.GetNextKeyboardFocusableActor = new ViewWrapperImpl.GetNextKeyboardFocusableActorDelegate(GetNextKeyboardFocusableView);
             viewWrapperImpl.OnKeyboardFocusChangeCommitted = new ViewWrapperImpl.OnKeyboardFocusChangeCommittedDelegate(OnKeyboardFocusChangeCommitted);
             viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyboardEnter);
             viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch);
@@ -69,7 +69,7 @@ namespace Dali
 
             // Set the StyleName the name of the View
             // We have to do this because the StyleManager on Native side can't workout it out
-            // This will also ensure that the style of actors/visuals initialized above are applied by the style manager.
+            // This will also ensure that the style of views/visuals initialized above are applied by the style manager.
             SetStyleName( this.GetType().Name );
         }
 
@@ -112,7 +112,7 @@ namespace Dali
         /**
          * @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).
+         * keyboard focus movement between its child views).
          *
          * The control doesn't support it by default.
          * @param[in] isSupported Whether this control supports two dimensional keyboard navigation.
@@ -136,7 +136,7 @@ namespace Dali
          * @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.
+         * can be limitied to its child views). The control is not a focus group by default.
          * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation.
          */
         public void SetAsKeyboardFocusGroup(bool isFocusGroup)
@@ -183,7 +183,7 @@ namespace Dali
         }
 
         /**
-         * @brief Request a relayout, which means performing a size negotiation on this actor, its parent and children (and potentially whole scene).
+         * @brief Request a relayout, which means performing a size negotiation on this view, 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
@@ -198,7 +198,7 @@ namespace Dali
         }
 
         /**
-         * @brief Provides the Actor implementation of GetHeightForWidth.
+         * @brief Provides the View implementation of GetHeightForWidth.
          * @param width Width to use.
          * @return The height based on the width.
          */
@@ -208,7 +208,7 @@ namespace Dali
         }
 
         /**
-         * @brief Provides the Actor implementation of GetWidthForHeight.
+         * @brief Provides the View implementation of GetWidthForHeight.
          * @param height Height to use.
          * @return The width based on the height.
          */
@@ -218,22 +218,22 @@ namespace Dali
         }
 
         /**
-         * @brief Calculate the size for a child using the base actor object.
+         * @brief Calculate the size for a child using the base view object.
          *
-         * @param[in] child The child actor to calculate the size for
+         * @param[in] child The child view 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)
+        protected float CalculateChildSizeBase(View 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.
+         * @brief Determine if this view 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.
+         * @return Return if the view is dependent on it's children.
          */
         protected bool RelayoutDependentOnChildrenBase(DimensionType dimension)
         {
@@ -241,10 +241,10 @@ namespace Dali
         }
 
         /**
-         * @brief Determine if this actor is dependent on it's children for relayout from the base class.
+         * @brief Determine if this view 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.
+         * @return Return if the view is dependent on it's children.
          */
         protected bool RelayoutDependentOnChildrenBase()
         {
@@ -252,13 +252,13 @@ namespace Dali
         }
 
         /**
-         * @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.
+         * @brief Register a visual by Property Index, linking an View to visual when required.
+         * In the case of the visual being an view 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.
+         * @note Derived class should not call visual.SetOnStage(view). 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)
@@ -267,8 +267,8 @@ namespace Dali
         }
 
         /**
-         * @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.
+         * @brief Register a visual by Property Index, linking an View to visual when required.
+         * In the case of the visual being an view 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
          *
@@ -360,15 +360,15 @@ namespace Dali
         }
 
         /**
-         * @brief Called after the actor has been connected to the stage.
+         * @brief Called after the view 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
+         * When an view is connected, it will be directly or indirectly parented to the root View.
+         * @param[in] depth The depth in the hierarchy for the view
          *
-         * @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
+         * @note The root View is provided automatically by Dali::Stage, and is always considered to be connected.
+         * When the parent of a set of views 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.
+         * For the following view tree, the callback order will be A, B, D, E, C, and finally F.
          *
          * @code
          *
@@ -379,20 +379,20 @@ namespace Dali
          *   D   E   F
          *
          * @endcode
-         * @param[in] depth The depth in the hierarchy for the actor
+         * @param[in] depth The depth in the hierarchy for the view
          */
         public virtual void OnStageConnection(int depth)
         {
         }
 
         /**
-         * @brief Called after the actor has been disconnected from Stage.
+         * @brief Called after the view has been disconnected from Stage.
          *
-         * If an actor is disconnected it either has no parent, or is parented to a disconnected actor.
+         * If an view is disconnected it either has no parent, or is parented to a disconnected view.
          *
-         * @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.
+         * @note When the parent of a set of views is disconnected to the stage, then all of the children
+         * will received this callback, starting with the leaf views.
+         * For the following view tree, the callback order will be D, E, B, F, C, and finally A.
          *
          * @code
          *
@@ -409,25 +409,25 @@ namespace Dali
         }
 
         /**
-         * @brief Called after a child has been added to the owning actor.
+         * @brief Called after a child has been added to the owning view.
          *
          * @param[in] child The child which has been added
          */
-        public virtual void OnChildAdd(Actor actor)
+        public virtual void OnChildAdd(View view)
         {
         }
 
         /**
-         * @brief Called after the owning actor has attempted to remove a child( regardless of whether it succeeded or not ).
+         * @brief Called after the owning view 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)
+        public virtual void OnChildRemove(View View)
         {
         }
 
         /**
-         * @brief Called when the owning actor property is set.
+         * @brief Called when the owning view property is set.
          *
          * @param[in] index The Property index that was set
          * @param[in] propertyValue The value to set
@@ -437,19 +437,19 @@ namespace Dali
         }
 
         /**
-         * @brief Called when the owning actor's size is set e.g. using Actor::SetSize().
+         * @brief Called when the owning view's size is set e.g. using View::SetSize().
          *
-         * @param[in] targetSize The target size. Note that this target size may not match the size returned via Actor.GetTargetSize.
+         * @param[in] targetSize The target size. Note that this target size may not match the size returned via View.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 ), ... ).
+         * @brief Called when the owning view's size is animated e.g. using Animation::AnimateTo( Property( view, View::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.
+         * @param[in] animation The object which is animating the owning view.
+         * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref View.GetTargetSize.
          */
         public virtual void OnSizeAnimation(Animation animation, Vector3 targetSize)
         {
@@ -458,7 +458,7 @@ namespace Dali
         /**
          * @DEPRECATED_1_1.37 Connect to TouchSignal() instead.
          *
-         * @brief Called after a touch-event is received by the owning actor.
+         * @brief Called after a touch-event is received by the owning view.
          *
          * @param[in] touch The touch event
          * @return True if the event should be consumed.
@@ -470,7 +470,7 @@ namespace Dali
         }
 
         /**
-         * @brief Called after a hover-event is received by the owning actor.
+         * @brief Called after a hover-event is received by the owning view.
          *
          * @param[in] hover The hover event
          * @return True if the hover event should be consumed.
@@ -482,7 +482,7 @@ namespace Dali
         }
 
         /**
-         * @brief Called after a key-event is received by the actor that has had its focus set.
+         * @brief Called after a key-event is received by the view that has had its focus set.
          *
          * @param[in] key the Key Event
          * @return True if the event should be consumed.
@@ -493,7 +493,7 @@ namespace Dali
         }
 
         /**
-         * @brief Called after a wheel-event is received by the owning actor.
+         * @brief Called after a wheel-event is received by the owning view.
          *
          * @param[in] wheel The wheel event
          * @return True if the event should be consumed.
@@ -510,11 +510,11 @@ namespace Dali
          * 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.
+         * views differently after certain operations like add or remove
+         * views, 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
+         * @param[in,out]  container  The control should add views 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).
@@ -534,9 +534,9 @@ namespace Dali
         }
 
         /**
-         * @brief Return the natural size of the actor.
+         * @brief Return the natural size of the view.
          *
-         * @return The actor's natural size
+         * @return The view's natural size
          */
         public virtual Vector3 GetNaturalSize()
         {
@@ -546,11 +546,11 @@ namespace Dali
         /**
          * @brief Calculate the size for a child.
          *
-         * @param[in] child The child actor to calculate the size for
+         * @param[in] child The child view 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)
+        public virtual float CalculateChildSize(View child, DimensionType dimension)
         {
             return viewWrapperImpl.CalculateChildSizeBase( child, dimension );
         }
@@ -582,10 +582,10 @@ namespace Dali
         }
 
         /**
-         * @brief Determine if this actor is dependent on it's children for relayout.
+         * @brief Determine if this view 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.
+         * @return Return if the view is dependent on it's children.
          */
         public virtual bool RelayoutDependentOnChildren(DimensionType dimension)
         {
@@ -593,9 +593,9 @@ namespace Dali
         }
 
         /**
-         * @brief Determine if this actor is dependent on it's children for relayout from the base class.
+         * @brief Determine if this view is dependent on it's children for relayout from the base class.
          *
-         * @return Return if the actor is dependent on it's children.
+         * @return Return if the view is dependent on it's children.
          */
         public virtual bool RelayoutDependentOnChildren()
         {
@@ -711,28 +711,28 @@ namespace Dali
         }
 
         /**
-         * @brief Gets the next keyboard focusable actor in this control towards the given direction.
+         * @brief Gets the next keyboard focusable view 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] currentFocusedView The current focused view.
          * @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.
+         * @param[in] loopEnabled Whether the focus movement should be looped within the view.
+         * @return the next keyboard focusable view in this control or an empty handle if no view can be focused.
          */
-        public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled)
+        public virtual View GetNextKeyboardFocusableView(View currentFocusedView, View.KeyboardFocus.Direction direction, bool loopEnabled)
         {
-            return new Actor();
+            return new View();
         }
 
         /**
-         * @brief Informs this control that its chosen focusable actor will be focused.
+         * @brief Informs this control that its chosen focusable view will be focused.
          *
          * This allows the application to preform any actions if wishes
-         * before the focus is actually moved to the chosen actor.
+         * before the focus is actually moved to the chosen view.
          *
-         * @param[in] commitedFocusableActor The commited focusable actor.
+         * @param[in] commitedFocusableView The commited focusable view.
          */
-        public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
+        public virtual void OnKeyboardFocusChangeCommitted(View commitedFocusableView)
         {
         }
 
@@ -808,11 +808,11 @@ namespace Dali
         {
         }
 
-        private void OnControlChildAdd(Actor child)
+        private void OnControlChildAdd(View child)
         {
         }
 
-        private void OnControlChildRemove(Actor child)
+        private void OnControlChildRemove(View child)
         {
         }
     }
index fc96070..f234f4c 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, Actor arg2) {
-    NDalicPINVOKE.FocusChangedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Actor.getCPtr(arg2));
+  public void Emit(View arg1, View arg2) {
+    NDalicPINVOKE.FocusChangedSignal_Emit(swigCPtr, View.getCPtr(arg1), View.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 0f9adee..72764bd 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, bool arg2) {
-    NDalicPINVOKE.FocusGroupChangedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), arg2);
+  public void Emit(View arg1, bool arg2) {
+    NDalicPINVOKE.FocusGroupChangedSignal_Emit(swigCPtr, View.getCPtr(arg1), arg2);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index a979c5c..78972d8 100755 (executable)
@@ -62,38 +62,38 @@ public class FocusManager : BaseHandle {
   */
 public class FocusChangedEventArgs : EventArgs
 {
-   private Actor _actorCurrent;
-   private Actor _actorNext;
+   private View _viewCurrent;
+   private View _viewNext;
 
    /**
-     * @brief Actor - is the original focused Actor
+     * @brief ViewCurrent - is the original focused View
      *
      */
-   public Actor ActorCurrent
+   public View ViewCurrent
    {
       get
       {
-         return _actorCurrent;
+         return _viewCurrent;
       }
       set
       {
-         _actorCurrent = value;
+        _viewCurrent = value;
       }
    }
 
    /**
-     * @brief Actor - is the current focused Actor
+     * @brief ViewNext - is the current focused View
      *
      */
-   public Actor ActorNext
+   public View ViewNext
    {
       get
       {
-         return _actorNext;
+         return _viewNext;
       }
       set
       {
-         _actorNext = value;
+        _viewNext = value;
       }
    }
 }
@@ -104,22 +104,22 @@ public class FocusChangedEventArgs : EventArgs
   */
 public class FocusGroupChangedEventArgs : EventArgs
 {
-   private Actor _currentFocusedActor;
+   private View _currentFocusedView;
    private bool _forwardDirection;
 
    /**
-     * @brief Actor - is the current focused Actor
+     * @brief CurrentFocusedView - is the current focused View
      *
      */
-   public Actor CurrentFocusedActor
+   public View CurrentFocusedView
    {
       get
       {
-         return _currentFocusedActor;
+         return _currentFocusedView;
       }
       set
       {
-         _currentFocusedActor = value;
+         _currentFocusedView = value;
       }
    }
 
@@ -141,26 +141,26 @@ public class FocusGroupChangedEventArgs : EventArgs
 }
 
 /**
-  * @brief Event arguments that passed via FocusedActorEnterKey signal
+  * @brief Event arguments that passed via FocusedViewEnterKey signal
   *
   */
-public class FocusedActorEnterKeyEventArgs : EventArgs
+public class FocusedViewEnterKeyEventArgs : EventArgs
 {
-   private Actor _actor;
+   private View _view;
 
    /**
-     * @brief Actor - is the current focused Actor which has the enter key pressed on it.
+     * @brief View - is the current focused View which has the enter key pressed on it.
      *
      */
-   public Actor Actor
+   public View View
    {
       get
       {
-         return _actor;
+         return _view;
       }
       set
       {
-         _actor = value;
+        _view = value;
       }
    }
 }
@@ -171,15 +171,15 @@ public class FocusedActorEnterKeyEventArgs : EventArgs
   */
 public class PreFocusChangeEventArgs : EventArgs
 {
-   private Actor _current;
-   private Actor _proposed;
+   private View _current;
+   private View _proposed;
    private View.KeyboardFocus.Direction _direction;
 
    /**
-    * @brief Actor - is the current focused Actor.
+    * @brief Current - is the current focused View.
     *
     */
-   public Actor Current
+   public View Current
    {
       get
       {
@@ -192,10 +192,10 @@ public class PreFocusChangeEventArgs : EventArgs
    }
 
     /**
-    * @brief Actor - is the proposed focused Actor.
+    * @brief Proposed - is the proposed focused View.
     *
     */
-    public Actor Proposed
+    public View Proposed
     {
         get
         {
@@ -231,10 +231,10 @@ public class PreFocusChangeEventArgs : EventArgs
   public delegate void FocusGroupChangedEventHandler(object source, FocusGroupChangedEventArgs e);
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void FocusedActorEnterKeyEventHandler(object source, FocusedActorEnterKeyEventArgs e);
+  public delegate void FocusedViewEnterKeyEventHandler(object source, FocusedViewEnterKeyEventArgs e);
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate Actor PreFocusChangeEventHandler(object source, PreFocusChangeEventArgs e);
+  public delegate View PreFocusChangeEventHandler(object source, PreFocusChangeEventArgs e);
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
   public delegate IntPtr PreFocusChangeEventCallbackDelegate(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction);
@@ -252,9 +252,9 @@ public class PreFocusChangeEventArgs : EventArgs
   private FocusGroupChangedEventCallbackDelegate _FocusManagerFocusGroupChangedEventCallbackDelegate;
 
   [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void FocusedActorEnterKeyEventCallbackDelegate(IntPtr actor);
-  private FocusedActorEnterKeyEventHandler _FocusManagerFocusedActorEnterKeyEventHandler;
-  private FocusedActorEnterKeyEventCallbackDelegate _FocusManagerFocusedActorEnterKeyEventCallbackDelegate;
+  private delegate void FocusedViewEnterKeyEventCallbackDelegate(IntPtr actor);
+  private FocusedViewEnterKeyEventHandler _FocusManagerFocusedViewEnterKeyEventHandler;
+  private FocusedViewEnterKeyEventCallbackDelegate _FocusManagerFocusedViewEnterKeyEventCallbackDelegate;
 
   public event PreFocusChangeEventHandler PreFocusChange
   {
@@ -290,27 +290,42 @@ public class PreFocusChangeEventArgs : EventArgs
   // Callback for FocusManager PreFocusChangeSignal
   private IntPtr OnPreFocusChange(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction)
   {
-      Actor actor = null;
+      View view = null;
       PreFocusChangeEventArgs e = new PreFocusChangeEventArgs();
 
       // Populate all members of "e" (PreFocusChangeEventArgs) with real data
-      e.Current = Actor.GetActorFromPtr(current);
-      e.Proposed = Actor.GetActorFromPtr(proposed);
+      if (current != global::System.IntPtr.Zero)
+      {
+        e.Current = View.GetViewFromPtr(current);
+      }
+
+      if (proposed != global::System.IntPtr.Zero)
+      {
+        e.Proposed = View.GetViewFromPtr(proposed);
+      }
+
       e.Direction = direction;
 
       if (_FocusManagerPreFocusChangeEventHandler != null)
       {
         //here we send all data to user event handlers
-          actor = _FocusManagerPreFocusChangeEventHandler(this, e);
+        view = _FocusManagerPreFocusChangeEventHandler(this, e);
       }
 
-      return actor.GetPtrfromActor();
+      if (view)
+      {
+        return view.GetPtrfromView();
+      }
+      else
+      {
+        return current;
+      }
   }
 
   /**
     * @brief Event for FocusChanged signal which can be used to subscribe/unsubscribe the event handler
     * (in the type of FocusChangedEventHandler) provided by the user.
-    * FocusChanged signal is emitted after the current focused actor has been changed.
+    * FocusChanged signal is emitted after the current focused view has been changed.
     */
   public event FocusChangedEventHandler FocusChanged
   {
@@ -344,13 +359,13 @@ public class PreFocusChangeEventArgs : EventArgs
   }
 
   // Callback for FocusManager FocusChangedSignal
-  private void OnFocusChanged(IntPtr actorCurrent, IntPtr actorNext)
+  private void OnFocusChanged(IntPtr viewCurrent, IntPtr viewNext)
   {
      FocusChangedEventArgs e = new FocusChangedEventArgs();
 
      // Populate all members of "e" (FocusChangedEventArgs) with real data
-     e.ActorCurrent = Actor.GetActorFromPtr(actorCurrent);
-     e.ActorNext = Actor.GetActorFromPtr(actorNext);
+     e.ViewCurrent = View.GetViewFromPtr(viewCurrent);
+     e.ViewNext = View.GetViewFromPtr(viewNext);
 
      if (_FocusManagerFocusChangedEventHandler != null)
      {
@@ -396,12 +411,12 @@ public class PreFocusChangeEventArgs : EventArgs
   }
 
   // Callback for FocusManager FocusGroupChangedSignal
-  private void OnFocusGroupChanged(IntPtr currentFocusedActor, bool forwardDirection)
+  private void OnFocusGroupChanged(IntPtr currentFocusedView, bool forwardDirection)
   {
      FocusGroupChangedEventArgs e = new FocusGroupChangedEventArgs();
 
      // Populate all members of "e" (FocusGroupChangedEventArgs) with real data
-     e.CurrentFocusedActor = Actor.GetActorFromPtr(currentFocusedActor);
+     e.CurrentFocusedView = View.GetViewFromPtr(currentFocusedView);
      e.ForwardDirection = forwardDirection;
 
      if (_FocusManagerFocusGroupChangedEventHandler != null)
@@ -412,23 +427,23 @@ public class PreFocusChangeEventArgs : EventArgs
   }
 
   /**
-    * @brief Event for FocusedActorEnterKeyPressed signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of FocusedActorEnterKeyEventHandler) provided by the user.
-    * FocusedActorEnterKeyPressed signal is emitted when the current focused actor has the enter key pressed on it.
+    * @brief Event for FocusedViewEnterKeyPressed signal which can be used to subscribe/unsubscribe the event handler
+    * (in the type of FocusedViewEnterKeyEventHandler) provided by the user.
+    * FocusedViewEnterKeyPressed signal is emitted when the current focused view has the enter key pressed on it.
     */
-  public event FocusedActorEnterKeyEventHandler FocusedActorEnterKeyPressed
+  public event FocusedViewEnterKeyEventHandler FocusedViewEnterKeyPressed
   {
      add
      {
         lock(this)
         {
            // Restricted to only one listener
-           if (_FocusManagerFocusedActorEnterKeyEventHandler == null)
+           if (_FocusManagerFocusedViewEnterKeyEventHandler == null)
            {
-              _FocusManagerFocusedActorEnterKeyEventHandler += value;
+              _FocusManagerFocusedViewEnterKeyEventHandler += value;
 
-              _FocusManagerFocusedActorEnterKeyEventCallbackDelegate = new FocusedActorEnterKeyEventCallbackDelegate(OnFocusedActorEnterKey);
-              this.FocusedActorEnterKeySignal().Connect(_FocusManagerFocusedActorEnterKeyEventCallbackDelegate);
+              _FocusManagerFocusedViewEnterKeyEventCallbackDelegate = new FocusedViewEnterKeyEventCallbackDelegate(OnFocusedViewEnterKey);
+              this.FocusedViewEnterKeySignal().Connect(_FocusManagerFocusedViewEnterKeyEventCallbackDelegate);
            }
         }
      }
@@ -437,28 +452,28 @@ public class PreFocusChangeEventArgs : EventArgs
      {
         lock(this)
         {
-           if (_FocusManagerFocusedActorEnterKeyEventHandler != null)
+           if (_FocusManagerFocusedViewEnterKeyEventHandler != null)
            {
-              this.FocusedActorEnterKeySignal().Disconnect(_FocusManagerFocusedActorEnterKeyEventCallbackDelegate);
+              this.FocusedViewEnterKeySignal().Disconnect(_FocusManagerFocusedViewEnterKeyEventCallbackDelegate);
            }
 
-           _FocusManagerFocusedActorEnterKeyEventHandler -= value;
+           _FocusManagerFocusedViewEnterKeyEventHandler -= value;
         }
      }
   }
 
-  // Callback for FocusManager FocusedActorEnterKeySignal
-  private void OnFocusedActorEnterKey(IntPtr actor)
+  // Callback for FocusManager FocusedViewEnterKeySignal
+  private void OnFocusedViewEnterKey(IntPtr view)
   {
-     FocusedActorEnterKeyEventArgs e = new FocusedActorEnterKeyEventArgs();
+     FocusedViewEnterKeyEventArgs e = new FocusedViewEnterKeyEventArgs();
 
-     // Populate all members of "e" (FocusedActorEnterKeyEventArgs) with real data
-     e.Actor = Actor.GetActorFromPtr(actor);
+     // Populate all members of "e" (FocusedViewEnterKeyEventArgs) with real data
+     e.View = View.GetViewFromPtr(view);
 
-     if (_FocusManagerFocusedActorEnterKeyEventHandler != null)
+     if (_FocusManagerFocusedViewEnterKeyEventHandler != null)
      {
         //here we send all data to user event handlers
-        _FocusManagerFocusedActorEnterKeyEventHandler(this, e);
+        _FocusManagerFocusedViewEnterKeyEventHandler(this, e);
      }
   }
 
@@ -472,14 +487,14 @@ public class PreFocusChangeEventArgs : EventArgs
     return ret;
   }
 
-  public bool SetCurrentFocusActor(Actor actor) {
-    bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(actor));
+  public bool SetCurrentFocusView(View view) {
+    bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetCurrentFocusActor() {
-    Actor ret = new Actor(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true);
+  public View GetCurrentFocusView() {
+    View ret = new View(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -506,30 +521,30 @@ public class PreFocusChangeEventArgs : EventArgs
     return ret;
   }
 
-  public void SetAsFocusGroup(Actor actor, bool isFocusGroup) {
-    NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, Actor.getCPtr(actor), isFocusGroup);
+  public void SetAsFocusGroup(View view, bool isFocusGroup) {
+    NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, View.getCPtr(view), isFocusGroup);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public bool IsFocusGroup(Actor actor) {
-    bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, Actor.getCPtr(actor));
+  public bool IsFocusGroup(View view) {
+    bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetFocusGroup(Actor actor) {
-    Actor ret = new Actor(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, Actor.getCPtr(actor)), true);
+  public View GetFocusGroup(View view) {
+    View ret = new View(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, View.getCPtr(view)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void SetFocusIndicatorActor(Actor indicator) {
-    NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator));
+  public void SetFocusIndicatorView(View indicator) {
+    NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, View.getCPtr(indicator));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetFocusIndicatorActor() {
-    Actor ret = new Actor(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true);
+  public View GetFocusIndicatorView() {
+    View ret = new View(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -560,8 +575,8 @@ public class PreFocusChangeEventArgs : EventArgs
     return ret;
   }
 
-  public ActorSignal FocusedActorEnterKeySignal() {
-    ActorSignal ret = new ActorSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false);
+  public ViewSignal FocusedViewEnterKeySignal() {
+    ViewSignal ret = new ViewSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -578,7 +593,7 @@ public class PreFocusChangeEventArgs : EventArgs
 
   public interface ICustomFocusAlgorithm
   {
-      View GetNextFocusableActor(View current, View proposed, View.KeyboardFocus.Direction direction);
+      View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction);
   }
 
   private class CustomAlgorithmInterfaceWrapper : CustomAlgorithmInterface
@@ -594,11 +609,11 @@ public class PreFocusChangeEventArgs : EventArgs
           _customFocusAlgorithm = customFocusAlgorithm;
       }
 
-      public override Actor GetNextFocusableActor(Actor current, Actor proposed, View.KeyboardFocus.Direction direction)
+      public override View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction)
       {
           View currentView = View.DownCast<View>(current);
           View proposedView = View.DownCast<View>(proposed);
-          return _customFocusAlgorithm.GetNextFocusableActor(currentView, proposedView, direction);
+          return _customFocusAlgorithm.GetNextFocusableView(currentView, proposedView, direction);
       }
   }
 }
index ba492c2..77bb64d 100644 (file)
@@ -170,13 +170,13 @@ public class FinishedEventArgs : EventArgs
     return ret;
   }
 
-  public new void Add(Actor child) {
-    NDalicPINVOKE.GaussianBlurView_Add(swigCPtr, Actor.getCPtr(child));
+  public new void Add(View child) {
+    NDalicPINVOKE.GaussianBlurView_Add(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public new void Remove(Actor child) {
-    NDalicPINVOKE.GaussianBlurView_Remove(swigCPtr, Actor.getCPtr(child));
+  public new void Remove(View child) {
+    NDalicPINVOKE.GaussianBlurView_Remove(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 8574a69..27358d0 100644 (file)
@@ -65,13 +65,13 @@ public class GestureDetector : BaseHandle {
     return ret;
   }
 
-  public void Attach(Actor actor) {
-    NDalicPINVOKE.GestureDetector_Attach(swigCPtr, Actor.getCPtr(actor));
+  public void Attach(View view) {
+    NDalicPINVOKE.GestureDetector_Attach(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Detach(Actor actor) {
-    NDalicPINVOKE.GestureDetector_Detach(swigCPtr, Actor.getCPtr(actor));
+  public void Detach(View view) {
+    NDalicPINVOKE.GestureDetector_Detach(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -80,14 +80,14 @@ public class GestureDetector : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public uint GetAttachedActorCount() {
+  public uint GetAttachedViewCount() {
     uint ret = NDalicPINVOKE.GestureDetector_GetAttachedActorCount(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetAttachedActor(uint index) {
-    Actor ret = new Actor(NDalicPINVOKE.GestureDetector_GetAttachedActor(swigCPtr, index), true);
+  public View GetAttachedView(uint index) {
+    View ret = new View(NDalicPINVOKE.GestureDetector_GetAttachedActor(swigCPtr, index), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 1f31dd0..5c81e7c 100644 (file)
@@ -76,17 +76,17 @@ public class Hover : global::System.IDisposable {
     return PointStateType.FINISHED;
   }
 
-  public Actor GetHitActor(uint point) {
+  public View GetHitView(uint point) {
     if( point < points.Count )
     {
-      return points[(int)point].hitActor;
+      return points[(int)point].hitView;
     }
     else
     {
       // Return a native empty handle
-      Actor actor = new Actor();
-      actor.Reset();
-      return actor;
+      View view = new View();
+      view.Reset();
+      return view;
     }
   }
 
 
 namespace Dali {
 
-public class ActorHoverSignal : global::System.IDisposable {
+internal class HoverSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal ActorHoverSignal(global::System.IntPtr cPtr, bool cMemoryOwn) {
+  internal HoverSignal(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(ActorHoverSignal obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(HoverSignal obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ActorHoverSignal() {
+  ~HoverSignal() {
     DisposeQueue.Instance.Add(this);
   }
 
@@ -74,13 +74,13 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public bool Emit(Actor arg1, Hover arg2) {
-    bool ret = NDalicPINVOKE.ActorHoverSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Hover.getCPtr(arg2));
+  public bool Emit(View arg1, Hover arg2) {
+    bool ret = NDalicPINVOKE.ActorHoverSignal_Emit(swigCPtr, View.getCPtr(arg1), Hover.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public ActorHoverSignal() : this(NDalicPINVOKE.new_ActorHoverSignal(), true) {
+  public HoverSignal() : this(NDalicPINVOKE.new_ActorHoverSignal(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 08dbdc0..b789571 100644 (file)
@@ -44,7 +44,7 @@ public class Item : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Item(uint t, Actor u) : this(NDalicPINVOKE.new_Item__SWIG_1(t, Actor.getCPtr(u)), true) {
+  public Item(uint t, View u) : this(NDalicPINVOKE.new_Item__SWIG_1(t, View.getCPtr(u)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -64,14 +64,14 @@ public class Item : global::System.IDisposable {
     } 
   }
 
-  public Actor second {
+  public View second {
     set {
-      NDalicPINVOKE.Item_second_set(swigCPtr, Actor.getCPtr(value));
+      NDalicPINVOKE.Item_second_set(swigCPtr, View.getCPtr(value));
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
       global::System.IntPtr cPtr = NDalicPINVOKE.Item_second_get(swigCPtr);
-      Actor ret = (cPtr == global::System.IntPtr.Zero) ? null : new Actor(cPtr, false);
+      View ret = (cPtr == global::System.IntPtr.Zero) ? null : new View(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
index 88e22e9..774b7c9 100644 (file)
@@ -52,14 +52,14 @@ public class ItemFactory : global::System.IDisposable {
     return ret;
   }
 
-  public virtual Actor NewItem(uint itemId) {
-    Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true);
+  public virtual View NewItem(uint itemId) {
+    View ret = new View(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));
+  public virtual void ItemReleased(uint itemId, View view) {
+    if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, View.getCPtr(view)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -89,11 +89,11 @@ public class ItemFactory : global::System.IDisposable {
   }
 
   private global::System.IntPtr SwigDirectorNewItem(uint itemId) {
-    return Actor.getCPtr(NewItem(itemId)).Handle;
+    return View.getCPtr(NewItem(itemId)).Handle;
   }
 
   private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor) {
-    ItemReleased(itemId, new Actor(actor, true));
+    ItemReleased(itemId, new View(actor, true));
   }
 
   public delegate uint SwigDelegateItemFactory_0();
@@ -106,7 +106,7 @@ public class ItemFactory : global::System.IDisposable {
 
   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) };
+  private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(View) };
 }
 
 }
index a6f2690..eb2c508 100644 (file)
@@ -154,8 +154,8 @@ public class ItemLayout : RefObject {
     return ret;
   }
 
-  public virtual void ApplyConstraints(Actor actor, int itemId, Vector3 layoutSize, Actor itemViewActor) {
-    NDalicPINVOKE.ItemLayout_ApplyConstraints(swigCPtr, Actor.getCPtr(actor), itemId, Vector3.getCPtr(layoutSize), Actor.getCPtr(itemViewActor));
+  public virtual void ApplyConstraints(View view, int itemId, Vector3 layoutSize, View itemView) {
+    NDalicPINVOKE.ItemLayout_ApplyConstraints(swigCPtr, View.getCPtr(view), itemId, Vector3.getCPtr(layoutSize), View.getCPtr(itemView));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index a29fb74..fc6ec56 100644 (file)
@@ -269,14 +269,14 @@ public class ItemView : Scrollable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetItem(uint itemId) {
-    Actor ret = new Actor(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true);
+  public View GetItem(uint itemId) {
+    View ret = new View(NDalicPINVOKE.ItemView_GetItem(swigCPtr, itemId), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public uint GetItemId(Actor actor) {
-    uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr, Actor.getCPtr(actor));
+  public uint GetItemId(View view) {
+    uint ret = NDalicPINVOKE.ItemView_GetItemId(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 6c70384..278b4a6 100755 (executable)
@@ -81,8 +81,8 @@ public class PreFocusChangeSignal : global::System.IDisposable {
     }
   }
 
-  public Actor Emit(Actor arg1, Actor arg2, View.KeyboardFocus.Direction arg3) {
-    Actor ret = new Actor(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Actor.getCPtr(arg2), (int)arg3), true);
+  public View Emit(View arg1, View arg2, View.KeyboardFocus.Direction arg3) {
+    View ret = new View(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, View.getCPtr(arg1), View.getCPtr(arg2), (int)arg3), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 7bff16e..641f230 100644 (file)
 * limitations under the License.
 *
 */
-// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.10
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Dali {
-
-public class Layer : Actor {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Layer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Layer_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Layer obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Layer() {
-    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_Layer(swigCPtr);
+namespace Dali
+{
+
+    public class Layer : Animatable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Layer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Layer_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Layer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  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;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Layer_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_Layer_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int CLIPPING_ENABLE = NDalicPINVOKE.Layer_Property_CLIPPING_ENABLE_get();
-    public static readonly int CLIPPING_BOX = NDalicPINVOKE.Layer_Property_CLIPPING_BOX_get();
-    public static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get();
-  
-  }
-
-  public Layer () : this (NDalicPINVOKE.Layer_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public new static Layer DownCast(BaseHandle handle) {
-    Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Layer(Layer copy) : this(NDalicPINVOKE.new_Layer__SWIG_1(Layer.getCPtr(copy)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Layer Assign(Layer rhs) {
-    Layer ret = new Layer(NDalicPINVOKE.Layer_Assign(swigCPtr, Layer.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetDepth() {
-    uint ret = NDalicPINVOKE.Layer_GetDepth(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Raise() {
-    NDalicPINVOKE.Layer_Raise(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Lower() {
-    NDalicPINVOKE.Layer_Lower(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RaiseAbove(Layer target) {
-    NDalicPINVOKE.Layer_RaiseAbove(swigCPtr, Layer.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void LowerBelow(Layer target) {
-    NDalicPINVOKE.Layer_LowerBelow(swigCPtr, Layer.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RaiseToTop() {
-    NDalicPINVOKE.Layer_RaiseToTop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void LowerToBottom() {
-    NDalicPINVOKE.Layer_LowerToBottom(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void MoveAbove(Layer target) {
-    NDalicPINVOKE.Layer_MoveAbove(swigCPtr, Layer.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void MoveBelow(Layer target) {
-    NDalicPINVOKE.Layer_MoveBelow(swigCPtr, Layer.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetBehavior(Layer.LayerBehavior behavior) {
-    NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Layer.LayerBehavior GetBehavior() {
-    Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetClipping(bool enabled) {
-    NDalicPINVOKE.Layer_SetClipping(swigCPtr, enabled);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsClipping() {
-    bool ret = NDalicPINVOKE.Layer_IsClipping(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetClippingBox(int x, int y, int width, int height) {
-    NDalicPINVOKE.Layer_SetClippingBox__SWIG_0(swigCPtr, x, y, width, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetClippingBox(Rectangle box) {
-    NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Rectangle GetClippingBox() {
-    Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDepthTestDisabled(bool disable) {
-    NDalicPINVOKE.Layer_SetDepthTestDisabled(swigCPtr, disable);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsDepthTestDisabled() {
-    bool ret = NDalicPINVOKE.Layer_IsDepthTestDisabled(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function) {
-    NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetTouchConsumed(bool consume) {
-    NDalicPINVOKE.Layer_SetTouchConsumed(swigCPtr, consume);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsTouchConsumed() {
-    bool ret = NDalicPINVOKE.Layer_IsTouchConsumed(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetHoverConsumed(bool consume) {
-    NDalicPINVOKE.Layer_SetHoverConsumed(swigCPtr, consume);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsHoverConsumed() {
-    bool ret = NDalicPINVOKE.Layer_IsHoverConsumed(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum LayerBehavior {
-    LAYER_2D,
-    LAYER_UI = LAYER_2D,
-    LAYER_3D
-  }
-
-  public enum TreeDepthMultiplier {
-    TREE_DEPTH_MULTIPLIER = 10000
-  }
-
-  public bool ClippingEnable
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Layer.Property.CLIPPING_ENABLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Layer.Property.CLIPPING_ENABLE, new Dali.Property.Value( value ) );
-    }
-  }
-  public Rectangle ClippingBox
-  {
-    get
-    {
-      Rectangle temp = new Rectangle(0,0,0,0);
-      GetProperty( Layer.Property.CLIPPING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Layer.Property.CLIPPING_BOX, new Dali.Property.Value( value ) );
-    }
-  }
-  public Layer.LayerBehavior Behavior 
-  { 
-    get 
-    {
-      return GetBehavior();
-    }
-    set 
-    { 
-      SetBehavior( value );
-    }
-  }
+        ~Layer()
+        {
+            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_Layer(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+
+        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;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Layer_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            public Property() : this(NDalicPINVOKE.new_Layer_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending)
+                    throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            public static readonly int CLIPPING_ENABLE = NDalicPINVOKE.Layer_Property_CLIPPING_ENABLE_get();
+            public static readonly int CLIPPING_BOX = NDalicPINVOKE.Layer_Property_CLIPPING_BOX_get();
+            public static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get();
+
+        }
+
+        public Layer() : this(NDalicPINVOKE.Layer_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        public new static Layer DownCast(BaseHandle handle)
+        {
+            Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Layer(Layer copy) : this(NDalicPINVOKE.new_Layer__SWIG_1(Layer.getCPtr(copy)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Layer Assign(Layer rhs)
+        {
+            Layer ret = new Layer(NDalicPINVOKE.Layer_Assign(swigCPtr, Layer.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public View FindChildById(uint id)
+        {
+            View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void Add(View child)
+        {
+            NDalicPINVOKE.Actor_Add(swigCPtr, View.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Remove(View child)
+        {
+            NDalicPINVOKE.Actor_Remove(swigCPtr, View.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public uint GetDepth()
+        {
+            uint ret = NDalicPINVOKE.Layer_GetDepth(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void Raise()
+        {
+            NDalicPINVOKE.Layer_Raise(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void Lower()
+        {
+            NDalicPINVOKE.Layer_Lower(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void RaiseAbove(Layer target)
+        {
+            NDalicPINVOKE.Layer_RaiseAbove(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void LowerBelow(Layer target)
+        {
+            NDalicPINVOKE.Layer_LowerBelow(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void RaiseToTop()
+        {
+            NDalicPINVOKE.Layer_RaiseToTop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void LowerToBottom()
+        {
+            NDalicPINVOKE.Layer_LowerToBottom(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void MoveAbove(Layer target)
+        {
+            NDalicPINVOKE.Layer_MoveAbove(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void MoveBelow(Layer target)
+        {
+            NDalicPINVOKE.Layer_MoveBelow(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetBehavior(Layer.LayerBehavior behavior)
+        {
+            NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Layer.LayerBehavior GetBehavior()
+        {
+            Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetClipping(bool enabled)
+        {
+            NDalicPINVOKE.Layer_SetClipping(swigCPtr, enabled);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsClipping()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsClipping(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetClippingBox(int x, int y, int width, int height)
+        {
+            NDalicPINVOKE.Layer_SetClippingBox__SWIG_0(swigCPtr, x, y, width, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetClippingBox(Rectangle box)
+        {
+            NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Rectangle GetClippingBox()
+        {
+            Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetDepthTestDisabled(bool disable)
+        {
+            NDalicPINVOKE.Layer_SetDepthTestDisabled(swigCPtr, disable);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsDepthTestDisabled()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsDepthTestDisabled(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function)
+        {
+            NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function));
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetTouchConsumed(bool consume)
+        {
+            NDalicPINVOKE.Layer_SetTouchConsumed(swigCPtr, consume);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsTouchConsumed()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsTouchConsumed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetHoverConsumed(bool consume)
+        {
+            NDalicPINVOKE.Layer_SetHoverConsumed(swigCPtr, consume);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsHoverConsumed()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsHoverConsumed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending)
+                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public enum LayerBehavior
+        {
+            LAYER_2D,
+            LAYER_UI = LAYER_2D,
+            LAYER_3D
+        }
+
+        public enum TreeDepthMultiplier
+        {
+            TREE_DEPTH_MULTIPLIER = 10000
+        }
+
+        public bool ClippingEnable
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Layer.Property.CLIPPING_ENABLE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Layer.Property.CLIPPING_ENABLE, new Dali.Property.Value(value));
+            }
+        }
+
+        public Rectangle ClippingBox
+        {
+            get
+            {
+                Rectangle temp = new Rectangle(0, 0, 0, 0);
+                GetProperty(Layer.Property.CLIPPING_BOX).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Layer.Property.CLIPPING_BOX, new Dali.Property.Value(value));
+            }
+        }
+
+        public Layer.LayerBehavior Behavior
+        {
+            get
+            {
+                return GetBehavior();
+            }
+            set
+            {
+                SetBehavior(value);
+            }
+        }
+
+    }
 
 }
index 1f041a6..5f5dcc5 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, LongPressGesture arg2) {
-    NDalicPINVOKE.LongPressGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), LongPressGesture.getCPtr(arg2));
+  public void Emit(View arg1, LongPressGesture arg2) {
+    NDalicPINVOKE.LongPressGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), LongPressGesture.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index c4fa5ea..d4a5256 100644 (file)
@@ -68,18 +68,18 @@ public class LongPressGestureDetector : GestureDetector {
 
 public class DetectedEventArgs : EventArgs
 {
-   private Actor _actor;
+   private View _view;
    private LongPressGesture _longPressGesture;
 
-   public Actor Actor
+   public View View
    {
       get
       {
-         return _actor;
+         return _view;
       }
       set
       {
-         _actor = value;
+        _view = value;
       }
    }
 
@@ -138,7 +138,7 @@ public class DetectedEventArgs : EventArgs
    DetectedEventArgs e = new DetectedEventArgs();
 
    // Populate all members of "e" (LongPressGestureEventArgs) with real data
-   e.Actor = Actor.GetActorFromPtr(actor);
+   e.View = View.GetViewFromPtr(actor);
    e.LongPressGesture = Dali.LongPressGesture.GetLongPressGestureFromPtr(longPressGesture);
 
    if (_longPressGestureEventHandler != null)
index 601c874..d748edd 100644 (file)
@@ -957,38 +957,38 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     } 
   }
 
-  public static void UnparentAndReset(Actor actor) {
-    NDalicPINVOKE.UnparentAndReset(Actor.getCPtr(actor));
+  public static void UnparentAndReset(View view) {
+    NDalicPINVOKE.UnparentAndReset(View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void Raise(Actor actor) {
-    NDalicPINVOKE.Raise(Actor.getCPtr(actor));
+  public static void Raise(View view) {
+    NDalicPINVOKE.Raise(View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void Lower(Actor actor) {
-    NDalicPINVOKE.Lower(Actor.getCPtr(actor));
+  public static void Lower(View view) {
+    NDalicPINVOKE.Lower(View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void RaiseToTop(Actor actor) {
-    NDalicPINVOKE.RaiseToTop(Actor.getCPtr(actor));
+  public static void RaiseToTop(View view) {
+    NDalicPINVOKE.RaiseToTop(View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void LowerToBottom(Actor actor) {
-    NDalicPINVOKE.LowerToBottom(Actor.getCPtr(actor));
+  public static void LowerToBottom(View view) {
+    NDalicPINVOKE.LowerToBottom(View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void RaiseAbove(Actor actor, Actor target) {
-    NDalicPINVOKE.RaiseAbove(Actor.getCPtr(actor), Actor.getCPtr(target));
+  public static void RaiseAbove(View view, View target) {
+    NDalicPINVOKE.RaiseAbove(View.getCPtr(view), View.getCPtr(target));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void LowerBelow(Actor actor, Actor target) {
-    NDalicPINVOKE.LowerBelow(Actor.getCPtr(actor), Actor.getCPtr(target));
+  public static void LowerBelow(View view, View target) {
+    NDalicPINVOKE.LowerBelow(View.getCPtr(view), View.getCPtr(target));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -1008,39 +1008,6 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     } 
   }
 
-  public static WindowFocusSignalType FocusChangedSignal(Window window) {
-    WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(Window.getCPtr(window)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static void SetAcceptFocus(Window window, bool accept) {
-    NDalicPINVOKE.SetAcceptFocus(Window.getCPtr(window), accept);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static bool IsFocusAcceptable(Window window) {
-    bool ret = NDalicPINVOKE.IsFocusAcceptable(Window.getCPtr(window));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static void Show(Window window) {
-    NDalicPINVOKE.Show(Window.getCPtr(window));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static void Hide(Window window) {
-    NDalicPINVOKE.Hide(Window.getCPtr(window));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static bool IsVisible(Window window) {
-    bool ret = NDalicPINVOKE.IsVisible(Window.getCPtr(window));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
   public static ViewImpl GetImplementation(View handle) {
     ViewImpl ret = new ViewImpl(NDalicPINVOKE.GetImplementation__SWIG_0(View.getCPtr(handle)), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -1065,16 +1032,6 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     return ret;
   }
 
-  public static void MoveActorConstraint(Vector3 current, SWIGTYPE_p_PropertyInputContainer inputs) {
-    NDalicPINVOKE.MoveActorConstraint(Vector3.getCPtr(current), SWIGTYPE_p_PropertyInputContainer.getCPtr(inputs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static void WrapActorConstraint(Vector3 position, SWIGTYPE_p_PropertyInputContainer inputs) {
-    NDalicPINVOKE.WrapActorConstraint(Vector3.getCPtr(position), SWIGTYPE_p_PropertyInputContainer.getCPtr(inputs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
   public static uint DEFAULT_RENDERING_BACKEND {
     get {
       uint ret = NDalicPINVOKE.DEFAULT_RENDERING_BACKEND_get();
index 29fe029..7fe6e04 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, PanGesture arg2) {
-    NDalicPINVOKE.PanGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), PanGesture.getCPtr(arg2));
+  public void Emit(View arg1, PanGesture arg2) {
+    NDalicPINVOKE.PanGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), PanGesture.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 6545cb5..4b792c7 100644 (file)
@@ -69,18 +69,18 @@ public class PanGestureDetector : GestureDetector {
 
 public class DetectedEventArgs : EventArgs
 {
-   private Actor _actor;
+   private View _view;
    private PanGesture _panGesture;
 
-   public Actor Actor
+   public View View
    {
       get
       {
-         return _actor;
+         return _view;
       }
       set
       {
-         _actor = value;
+        _view = value;
       }
    }
 
@@ -139,7 +139,7 @@ public class DetectedEventArgs : EventArgs
    DetectedEventArgs e = new DetectedEventArgs();
 
    // Populate all members of "e" (PanGestureEventArgs) with real data
-   e.Actor = Actor.GetActorFromPtr(actor);
+   e.View = View.GetViewFromPtr(actor);
    e.PanGesture = Dali.PanGesture.GetPanGestureFromPtr(panGesture);
 
    if (_panGestureEventHandler != null)
index bc2e2a5..ddb2fc3 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, PinchGesture arg2) {
-    NDalicPINVOKE.PinchGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), PinchGesture.getCPtr(arg2));
+  public void Emit(View arg1, PinchGesture arg2) {
+    NDalicPINVOKE.PinchGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), PinchGesture.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index e36de83..d193dab 100644 (file)
@@ -68,18 +68,18 @@ public class PinchGestureDetector : GestureDetector {
 
 public class DetectedEventArgs : EventArgs
 {
-   private Actor _actor;
+   private View _view;
    private PinchGesture _pinchGesture;
 
-   public Actor Actor
+   public View View
    {
       get
       {
-         return _actor;
+         return _view;
       }
       set
       {
-         _actor = value;
+        _view = value;
       }
    }
 
@@ -138,7 +138,7 @@ public class DetectedEventArgs : EventArgs
    DetectedEventArgs e = new DetectedEventArgs();
 
    // Populate all members of "e" (DetectedEventArgs) with real data
-   e.Actor = Actor.GetActorFromPtr(actor);
+   e.View = View.GetViewFromPtr(actor);
    e.PinchGesture = Dali.PinchGesture.GetPinchGestureFromPtr(pinchGesture);
 
    if (_pinchGestureEventHandler != null)
index 4010f64..44aa5cb 100644 (file)
@@ -405,35 +405,35 @@ public class Popup : View {
     return ret;
   }
 
-  public void SetTitle(Actor titleActor) {
-    NDalicPINVOKE.Popup_SetTitle(swigCPtr, Actor.getCPtr(titleActor));
+  public void SetTitle(View titleView) {
+    NDalicPINVOKE.Popup_SetTitle(swigCPtr, View.getCPtr(titleView));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetTitle() {
-    Actor ret = new Actor(NDalicPINVOKE.Popup_GetTitle(swigCPtr), true);
+  public View GetTitle() {
+    View ret = new View(NDalicPINVOKE.Popup_GetTitle(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void SetContent(Actor content) {
-    NDalicPINVOKE.Popup_SetContent(swigCPtr, Actor.getCPtr(content));
+  public void SetContent(View content) {
+    NDalicPINVOKE.Popup_SetContent(swigCPtr, View.getCPtr(content));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetContent() {
-    Actor ret = new Actor(NDalicPINVOKE.Popup_GetContent(swigCPtr), true);
+  public View GetContent() {
+    View ret = new View(NDalicPINVOKE.Popup_GetContent(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void SetFooter(Actor footer) {
-    NDalicPINVOKE.Popup_SetFooter(swigCPtr, Actor.getCPtr(footer));
+  public void SetFooter(View footer) {
+    NDalicPINVOKE.Popup_SetFooter(swigCPtr, View.getCPtr(footer));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetFooter() {
-    Actor ret = new Actor(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true);
+  public View GetFooter() {
+    View ret = new View(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 17afb87..94d358b 100644 (file)
@@ -128,13 +128,13 @@ public class PushButton : Button {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetButtonImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
+  public void SetButtonImage(View image) {
+    NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, Actor.getCPtr(image));
+  public void SetBackgroundImage(View image) {
+    NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -143,28 +143,28 @@ public class PushButton : Button {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetSelectedImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
+  public void SetSelectedImage(View image) {
+    NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetSelectedBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, Actor.getCPtr(image));
+  public void SetSelectedBackgroundImage(View image) {
+    NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetDisabledBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, Actor.getCPtr(image));
+  public void SetDisabledBackgroundImage(View image) {
+    NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetDisabledImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, Actor.getCPtr(image));
+  public void SetDisabledImage(View image) {
+    NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetDisabledSelectedImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, Actor.getCPtr(image));
+  public void SetDisabledSelectedImage(View image) {
+    NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index feee9ea..9b7e9b6 100644 (file)
@@ -46,8 +46,8 @@ public class RelayoutContainer : global::System.IDisposable {
   }
 
 
-  public virtual void Add(Actor actor, Vector2 size) {
-    NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, Actor.getCPtr(actor), Vector2.getCPtr(size));
+  public virtual void Add(View view, Vector2 size) {
+    NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, View.getCPtr(view), Vector2.getCPtr(size));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 4363df5..0db9eae 100644 (file)
@@ -54,20 +54,20 @@ public class RenderTask : Animatable {
   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;
     }
-  
+
     ~Property() {
       Dispose();
     }
-  
+
     public virtual void Dispose() {
       lock(this) {
         if (swigCPtr.Handle != global::System.IntPtr.Zero) {
@@ -80,16 +80,16 @@ public class RenderTask : Animatable {
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
+
     public Property() : this(NDalicPINVOKE.new_RenderTask_Property(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
-  
+
     public static readonly int VIEWPORT_POSITION = NDalicPINVOKE.RenderTask_Property_VIEWPORT_POSITION_get();
     public static readonly int VIEWPORT_SIZE = NDalicPINVOKE.RenderTask_Property_VIEWPORT_SIZE_get();
     public static readonly int CLEAR_COLOR = NDalicPINVOKE.RenderTask_Property_CLEAR_COLOR_get();
     public static readonly int REQUIRES_SYNC = NDalicPINVOKE.RenderTask_Property_REQUIRES_SYNC_get();
-  
+
   }
 
   public static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION {
@@ -98,7 +98,7 @@ public class RenderTask : Animatable {
       SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static SWIGTYPE_p_f_r_Dali__Vector2__bool FULLSCREEN_FRAMEBUFFER_FUNCTION {
@@ -107,7 +107,7 @@ public class RenderTask : Animatable {
       SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static bool DEFAULT_EXCLUSIVE {
@@ -115,7 +115,7 @@ public class RenderTask : Animatable {
       bool ret = NDalicPINVOKE.RenderTask_DEFAULT_EXCLUSIVE_get();
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static bool DEFAULT_INPUT_ENABLED {
@@ -123,7 +123,7 @@ public class RenderTask : Animatable {
       bool ret = NDalicPINVOKE.RenderTask_DEFAULT_INPUT_ENABLED_get();
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static Vector4 DEFAULT_CLEAR_COLOR {
@@ -132,7 +132,7 @@ public class RenderTask : Animatable {
       Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static bool DEFAULT_CLEAR_ENABLED {
@@ -140,7 +140,7 @@ public class RenderTask : Animatable {
       bool ret = NDalicPINVOKE.RenderTask_DEFAULT_CLEAR_ENABLED_get();
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static bool DEFAULT_CULL_MODE {
@@ -148,7 +148,7 @@ public class RenderTask : Animatable {
       bool ret = NDalicPINVOKE.RenderTask_DEFAULT_CULL_MODE_get();
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public static uint DEFAULT_REFRESH_RATE {
@@ -156,7 +156,7 @@ public class RenderTask : Animatable {
       uint ret = NDalicPINVOKE.RenderTask_DEFAULT_REFRESH_RATE_get();
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
-    } 
+    }
   }
 
   public RenderTask() : this(NDalicPINVOKE.new_RenderTask__SWIG_0(), true) {
@@ -179,13 +179,13 @@ public class RenderTask : Animatable {
     return ret;
   }
 
-  public void SetSourceActor(Actor actor) {
-    NDalicPINVOKE.RenderTask_SetSourceActor(swigCPtr, Actor.getCPtr(actor));
+  public void SetSourceView(View view) {
+    NDalicPINVOKE.RenderTask_SetSourceActor(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetSourceActor() {
-    Actor ret = new Actor(NDalicPINVOKE.RenderTask_GetSourceActor(swigCPtr), true);
+  public View GetSourceView() {
+    View ret = new View(NDalicPINVOKE.RenderTask_GetSourceActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -212,13 +212,13 @@ public class RenderTask : Animatable {
     return ret;
   }
 
-  public void SetCameraActor(CameraActor cameraActor) {
-    NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, CameraActor.getCPtr(cameraActor));
+  public void SetCamera(Camera camera) {
+    NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, Camera.getCPtr(camera));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public CameraActor GetCameraActor() {
-    CameraActor ret = new CameraActor(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true);
+  public Camera GetCamera() {
+    Camera ret = new Camera(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -257,13 +257,13 @@ public class RenderTask : Animatable {
     return ret;
   }
 
-  public void SetScreenToFrameBufferMappingActor(Actor mappingActor) {
-    NDalicPINVOKE.RenderTask_SetScreenToFrameBufferMappingActor(swigCPtr, Actor.getCPtr(mappingActor));
+  public void SetScreenToFrameBufferMappingView(View mappingView) {
+    NDalicPINVOKE.RenderTask_SetScreenToFrameBufferMappingActor(swigCPtr, View.getCPtr(mappingView));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetScreenToFrameBufferMappingActor() {
-    Actor ret = new Actor(NDalicPINVOKE.RenderTask_GetScreenToFrameBufferMappingActor(swigCPtr), true);
+  public View GetScreenToFrameBufferMappingView() {
+    View ret = new View(NDalicPINVOKE.RenderTask_GetScreenToFrameBufferMappingActor(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -351,8 +351,8 @@ public class RenderTask : Animatable {
     return ret;
   }
 
-  public bool ViewportToLocal(Actor actor, float viewportX, float viewportY, out float localX, out float localY) {
-    bool ret = NDalicPINVOKE.RenderTask_ViewportToLocal(swigCPtr, Actor.getCPtr(actor), viewportX, viewportY, out localX, out localY);
+  public bool ViewportToLocal(View view, float viewportX, float viewportY, out float localX, out float localY) {
+    bool ret = NDalicPINVOKE.RenderTask_ViewportToLocal(swigCPtr, View.getCPtr(view), viewportX, viewportY, out localX, out localY);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index fce71d2..c12976d 100644 (file)
@@ -261,13 +261,13 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetScrollIndicator(Actor indicator) {
-    NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, Actor.getCPtr(indicator));
+  public void SetScrollIndicator(View indicator) {
+    NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, View.getCPtr(indicator));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetScrollIndicator() {
-    Actor ret = new Actor(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
+  public View GetScrollIndicator() {
+    View ret = new View(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
index 527f351..ae39932 100644 (file)
@@ -459,7 +459,7 @@ public class SnapStartedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetActorAutoSnap(bool enable) {
+  public void SetViewAutoSnap(bool enable) {
     NDalicPINVOKE.ScrollView_SetActorAutoSnap(swigCPtr, enable);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
@@ -620,13 +620,13 @@ public class SnapStartedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void ScrollTo(Actor actor) {
-    NDalicPINVOKE.ScrollView_ScrollTo__SWIG_8(swigCPtr, Actor.getCPtr(actor));
+  public void ScrollTo(View view) {
+    NDalicPINVOKE.ScrollView_ScrollTo__SWIG_8(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void ScrollTo(Actor actor, float duration) {
-    NDalicPINVOKE.ScrollView_ScrollTo__SWIG_9(swigCPtr, Actor.getCPtr(actor), duration);
+  public void ScrollTo(View view, float duration) {
+    NDalicPINVOKE.ScrollView_ScrollTo__SWIG_9(swigCPtr, View.getCPtr(view), duration);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -661,13 +661,13 @@ public class SnapStartedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void BindActor(Actor child) {
-    NDalicPINVOKE.ScrollView_BindActor(swigCPtr, Actor.getCPtr(child));
+  public void BindView(View child) {
+    NDalicPINVOKE.ScrollView_BindActor(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void UnbindActor(Actor child) {
-    NDalicPINVOKE.ScrollView_UnbindActor(swigCPtr, Actor.getCPtr(child));
+  public void UnbindView(View child) {
+    NDalicPINVOKE.ScrollView_UnbindActor(swigCPtr, View.getCPtr(child));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 1e98833..b2f5674 100644 (file)
@@ -71,8 +71,8 @@ public class ScrollViewPagePathEffect : ScrollViewEffect {
     return ret;
   }
 
-  public void ApplyToPage(Actor page, uint pageOrder) {
-    NDalicPINVOKE.ScrollViewPagePathEffect_ApplyToPage(swigCPtr, Actor.getCPtr(page), pageOrder);
+  public void ApplyToPage(View page, uint pageOrder) {
+    NDalicPINVOKE.ScrollViewPagePathEffect_ApplyToPage(swigCPtr, View.getCPtr(page), pageOrder);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 2f8a6d2..3eef0a5 100644 (file)
@@ -482,16 +482,16 @@ public class Stage : BaseHandle {
 
   public void AddLayer(Layer layer)
   {
-    this.Add( (Actor)layer );
+    NDalicPINVOKE.Stage_Add(swigCPtr, Layer.getCPtr(layer));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
   public void RemoveLayer(Layer layer)
   {
-    this.Remove( (Actor)layer );
+    NDalicPINVOKE.Stage_Remove(swigCPtr, Layer.getCPtr(layer));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-
-
   public static Vector4 DEFAULT_BACKGROUND_COLOR {
     get {
       global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get();
@@ -536,13 +536,13 @@ public class Stage : BaseHandle {
     return ret;
   }
 
-  public void Add(Actor actor) {
-    NDalicPINVOKE.Stage_Add(swigCPtr, Actor.getCPtr(actor));
+  public void Add(View view) {
+    NDalicPINVOKE.Stage_Add(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Remove(Actor actor) {
-    NDalicPINVOKE.Stage_Remove(swigCPtr, Actor.getCPtr(actor));
+  public void Remove(View view) {
+    NDalicPINVOKE.Stage_Remove(swigCPtr, View.getCPtr(view));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 6fd6bd4..6fd4508 100644 (file)
@@ -265,26 +265,26 @@ public class TableView : View {
     return ret;
   }
 
-  public bool AddChild(Actor child, TableView.CellPosition position) {
-    bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position));
+  public bool AddChild(View child, TableView.CellPosition position) {
+    bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor GetChildAt(TableView.CellPosition position) {
-    Actor ret = new Actor(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+  public View GetChildAt(TableView.CellPosition position) {
+    View ret = new View(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Actor RemoveChildAt(TableView.CellPosition position) {
-    Actor ret = new Actor(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+  public View RemoveChildAt(TableView.CellPosition position) {
+    View ret = new View(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public bool FindChildPosition(Actor child, TableView.CellPosition position) {
-    bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position));
+  public bool FindChildPosition(View child, TableView.CellPosition position) {
+    bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, View.getCPtr(child), TableView.CellPosition.getCPtr(position));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -299,8 +299,8 @@ public class TableView : View {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void DeleteRow(uint rowIndex, ActorContainer removed) {
-    NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ActorContainer.getCPtr(removed));
+  public void DeleteRow(uint rowIndex, ViewContainer removed) {
+    NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ViewContainer.getCPtr(removed));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -314,8 +314,8 @@ public class TableView : View {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void DeleteColumn(uint columnIndex, ActorContainer removed) {
-    NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ActorContainer.getCPtr(removed));
+  public void DeleteColumn(uint columnIndex, ViewContainer removed) {
+    NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ViewContainer.getCPtr(removed));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -324,8 +324,8 @@ public class TableView : View {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Resize(uint rows, uint columns, ActorContainer removed) {
-    NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ActorContainer.getCPtr(removed));
+  public void Resize(uint rows, uint columns, ViewContainer removed) {
+    NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ViewContainer.getCPtr(removed));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index baca9a2..e36189c 100644 (file)
@@ -74,8 +74,8 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public void Emit(Actor arg1, TapGesture arg2) {
-    NDalicPINVOKE.TapGestureDetectedSignal_Emit(swigCPtr, Actor.getCPtr(arg1), TapGesture.getCPtr(arg2));
+  public void Emit(View arg1, TapGesture arg2) {
+    NDalicPINVOKE.TapGestureDetectedSignal_Emit(swigCPtr, View.getCPtr(arg1), TapGesture.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 3015c21..d83abba 100644 (file)
@@ -68,18 +68,18 @@ public class TapGestureDetector : GestureDetector {
 
 public class DetectedEventArgs : EventArgs
 {
-   private Actor _actor;
+   private View _view;
    private TapGesture _tapGesture;
 
-   public Actor Actor
+   public View View
    {
       get
       {
-         return _actor;
+         return _view;
       }
       set
       {
-         _actor = value;
+         _view = value;
       }
    }
 
@@ -138,7 +138,7 @@ public class DetectedEventArgs : EventArgs
    DetectedEventArgs e = new DetectedEventArgs();
 
    // Populate all members of "e" (DetectedEventArgs) with real data
-   e.Actor = Actor.GetActorFromPtr(actor);
+   e.View = View.GetViewFromPtr(actor);
    e.TapGesture = Dali.TapGesture.GetTapGestureFromPtr(tapGesture);
 
    if (_tapGestureEventHandler != null)
index aa04a65..6644482 100644 (file)
@@ -89,8 +89,8 @@ public class Touch : BaseHandle {
     return ret;
   }
 
-  public Actor GetHitActor(uint point) {
-    Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);
+  public View GetHitView(uint point) {
+    View ret = new View(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
 namespace Dali {
 
-public class ActorTouchDataSignal : global::System.IDisposable {
+internal class TouchDataSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal ActorTouchDataSignal(global::System.IntPtr cPtr, bool cMemoryOwn) {
+  internal TouchDataSignal(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(ActorTouchDataSignal obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TouchDataSignal obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~ActorTouchDataSignal() {
+  ~TouchDataSignal() {
     DisposeQueue.Instance.Add(this);
   }
 
@@ -74,13 +74,13 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public bool Emit(Actor arg1, Touch arg2) {
-    bool ret = NDalicPINVOKE.ActorTouchDataSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Touch.getCPtr(arg2));
+  public bool Emit(View arg1, Touch arg2) {
+    bool ret = NDalicPINVOKE.ActorTouchDataSignal_Emit(swigCPtr, View.getCPtr(arg1), Touch.getCPtr(arg2));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public ActorTouchDataSignal() : this(NDalicPINVOKE.new_ActorTouchDataSignal(), true) {
+  public TouchDataSignal() : this(NDalicPINVOKE.new_ActorTouchDataSignal(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index cd98332..1a695da 100644 (file)
@@ -78,14 +78,14 @@ public class TouchPoint : global::System.IDisposable {
     } 
   }
 
-  public Actor hitActor {
+  public View hitView {
     set {
-      NDalicPINVOKE.TouchPoint_hitActor_set(swigCPtr, Actor.getCPtr(value));
+      NDalicPINVOKE.TouchPoint_hitActor_set(swigCPtr, View.getCPtr(value));
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
       global::System.IntPtr cPtr = NDalicPINVOKE.TouchPoint_hitActor_get(swigCPtr);
-      Actor ret = (cPtr == global::System.IntPtr.Zero) ? null : new Actor(cPtr, false);
+      View ret = (cPtr == global::System.IntPtr.Zero) ? null : new View(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
index fbc408f..aa1171f 100755 (executable)
 *
 */
 
-namespace Dali {
-
+namespace Dali
+{
     using System;
     using System.Runtime.InteropServices;
 
+    public class View : Animatable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class View : CustomActor {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal View(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.View_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-
-    // Register this instance of view in the view registry.
-    ViewRegistry.RegisterView(this);
-
-    // By default, we do not want the position to use the anchor point
-    this.PositionUsesAnchorPoint = false;
-  }
+        internal View(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.View_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(View obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+            // Register this instance of view in the view registry.
+            ViewRegistry.RegisterView(this);
 
-  ~View() {
-    DisposeQueue.Instance.Add(this);
+            // By default, we do not want the position to use the anchor point
+            this.PositionUsesAnchorPoint = false;
+        }
 
-    // Unregister this instance of view from the view registry.
-    ViewRegistry.UnregisterView(this);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(View obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        ~View()
+        {
+            DisposeQueue.Instance.Add(this);
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_View(swigCPtr);
+            // Unregister this instance of view from the view registry.
+            ViewRegistry.UnregisterView(this);
         }
-        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 KeyInputFocusGained signal
-   *
-   */
-  public class KeyInputFocusGainedEventArgs : EventArgs
-  {
-    private View _view;
-
-    /**
-     * @brief View - is the view that gets Key Input Focus
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via KeyInputFocusLost signal
-   *
-   */
-  public class KeyInputFocusLostEventArgs : EventArgs
-  {
-    private View _view;
-
-    /**
-     * @brief View - is the view that loses Key Input Focus
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via Key signal
-   *
-   */
-  public class KeyEventArgs : EventArgs
-  {
-    private View _view;
-    private Key _key;
-
-    /**
-     * @brief View - is the view that recieves the key.
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-
-    /**
-     * @brief Key - is the key sent to the View.
-     *
-     */
-    public Key Key
-    {
-      get
-      {
-        return _key;
-      }
-      set
-      {
-        _key = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via OnRelayout signal
-   *
-   */
-  public class OnRelayoutEventArgs : EventArgs
-  {
-    private View _view;
-
-    /**
-     * @brief View - is the view that is being resized upon relayout
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-  }
-
-
-  /**
-   * @brief Event arguments that passed via Touch signal
-   *
-   */
-  public class TouchEventArgs : EventArgs
-  {
-     private View _view;
-     private Touch _touch;
-
-    /**
-     * @brief View - is the view that is being touched
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
 
-    /**
-     * @brief Touch - contains the information of touch points
-     *
-     */
-    public Touch Touch
-    {
-      get
-      {
-        return _touch;
-      }
-      set
-      {
-        _touch = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via Hover signal
-   *
-   */
-  public class HoverEventArgs : EventArgs
-  {
-     private View _view;
-     private Hover _hover;
-
-    /**
-     * @brief View - is the view that is being hovered
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
+        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_View(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    /**
-     * @brief Hover - contains touch points that represent the points
-     * that are currently being hovered or the points where a hover has stopped
-     *
-     */
-    public Hover Hover
-    {
-      get
-      {
-        return _hover;
-      }
-      set
-      {
-        _hover = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via Wheel signal
-   *
-   */
-  public class WheelEventArgs : EventArgs
-  {
-    private View _view;
-    private Wheel _wheel;
-
-    /**
-     * @brief View - is the view that is being wheeled
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
+        /**
+         * @brief Event arguments that passed via KeyInputFocusGained signal
+         *
+         */
+        public class KeyInputFocusGainedEventArgs : EventArgs
+        {
+            private View _view;
+
+            /**
+             * @brief View - is the view that gets Key Input Focus
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+        }
 
-    /**
-     * @brief Wheel - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL
-     *
-     */
-    public Wheel Wheel
-    {
-      get
-      {
-        return _wheel;
-      }
-      set
-      {
-        _wheel = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via OnStage signal
-   *
-   */
-  public class OnStageEventArgs : EventArgs
-  {
-  private View _view;
-
-    /**
-     * @brief View - is the view that is being connected to the stage
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-  }
-
-  /**
-   * @brief Event arguments that passed via OffStage signal
-   *
-   */
-  public class OffStageEventArgs : EventArgs
-  {
-  private View _view;
-
-    /**
-     * @brief View - is the view that is being disconnected from the stage
-     *
-     */
-    public View View
-    {
-      get
-      {
-        return _view;
-      }
-      set
-      {
-        _view = value;
-      }
-    }
-  }
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void KeyInputFocusGainedCallbackDelegate(IntPtr control);
-  private DaliEventHandler<object,KeyInputFocusGainedEventArgs> _KeyInputFocusGainedEventHandler;
-  private KeyInputFocusGainedCallbackDelegate _KeyInputFocusGainedCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void KeyInputFocusLostCallbackDelegate(IntPtr control);
-  private DaliEventHandler<object,KeyInputFocusLostEventArgs> _KeyInputFocusLostEventHandler;
-  private KeyInputFocusLostCallbackDelegate _KeyInputFocusLostCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool KeyCallbackDelegate(IntPtr control, IntPtr key);
-  private DaliEventHandlerWithReturnType<object,KeyEventArgs,bool> _KeyHandler;
-  private KeyCallbackDelegate _KeyCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void OnRelayoutEventCallbackDelegate(IntPtr control);
-  private DaliEventHandler<object,OnRelayoutEventArgs> _viewOnRelayoutEventHandler;
-  private OnRelayoutEventCallbackDelegate _viewOnRelayoutEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool TouchCallbackDelegate(IntPtr view, IntPtr touch);
-  private DaliEventHandlerWithReturnType<object,TouchEventArgs,bool> _viewTouchHandler;
-  private TouchCallbackDelegate _viewTouchCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool HoverCallbackDelegate(IntPtr view, IntPtr hover);
-  private DaliEventHandlerWithReturnType<object,HoverEventArgs,bool> _viewHoverHandler;
-  private HoverCallbackDelegate _viewHoverCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool WheelCallbackDelegate(IntPtr view, IntPtr wheel);
-  private DaliEventHandlerWithReturnType<object,WheelEventArgs,bool> _viewWheelHandler;
-  private WheelCallbackDelegate _viewWheelCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void OnStageEventCallbackDelegate(IntPtr control);
-  private DaliEventHandler<object,OnStageEventArgs> _viewOnStageEventHandler;
-  private OnStageEventCallbackDelegate _viewOnStageEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void OffStageEventCallbackDelegate(IntPtr control);
-  private DaliEventHandler<object,OffStageEventArgs> _viewOffStageEventHandler;
-  private OffStageEventCallbackDelegate _viewOffStageEventCallbackDelegate;
-
-  /**
-   * @brief Event for KeyInputFocusGained signal which can be used to subscribe/unsubscribe the event handler
-   * (in the type of KeyInputFocusGainedEventHandler-DaliEventHandler<object,KeyInputFocusGainedEventArgs>)
-   * provided by the user. KeyInputFocusGained signal is emitted when the control gets Key Input Focus.
-   */
-  public event DaliEventHandler<object,KeyInputFocusGainedEventArgs> KeyInputFocusGained
-  {
-    add
-    {
-      lock(this)
-      {
-        // Restricted to only one listener
-        if (_KeyInputFocusGainedEventHandler == null)
+        /**
+         * @brief Event arguments that passed via KeyInputFocusLost signal
+         *
+         */
+        public class KeyInputFocusLostEventArgs : EventArgs
         {
-          _KeyInputFocusGainedEventHandler += value;
-          Console.WriteLine("View Key EVENT Locked....");
-          _KeyInputFocusGainedCallbackDelegate = new KeyInputFocusGainedCallbackDelegate(OnKeyInputFocusGained);
-          this.KeyInputFocusGainedSignal().Connect(_KeyInputFocusGainedCallbackDelegate);
+            private View _view;
+
+            /**
+             * @brief View - is the view that loses Key Input Focus
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
         }
-      }
-    }
 
-    remove
-    {
-      lock(this)
-      {
-        if (_KeyInputFocusGainedEventHandler != null)
+        /**
+         * @brief Event arguments that passed via Key signal
+         *
+         */
+        public class KeyEventArgs : EventArgs
         {
-          this.KeyInputFocusGainedSignal().Disconnect(_KeyInputFocusGainedCallbackDelegate);
+            private View _view;
+            private Key _key;
+
+            /**
+             * @brief View - is the view that recieves the key.
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+
+            /**
+             * @brief Key - is the key sent to the View.
+             *
+             */
+            public Key Key
+            {
+                get
+                {
+                    return _key;
+                }
+                set
+                {
+                    _key = value;
+                }
+            }
         }
 
-        _KeyInputFocusGainedEventHandler -= value;
-      }
-    }
-  }
+        /**
+         * @brief Event arguments that passed via OnRelayout signal
+         *
+         */
+        public class OnRelayoutEventArgs : EventArgs
+        {
+            private View _view;
+
+            /**
+             * @brief View - is the view that is being resized upon relayout
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+        }
 
-  private void OnKeyInputFocusGained(IntPtr view)
-  {
-    KeyInputFocusGainedEventArgs e = new KeyInputFocusGainedEventArgs();
-    Console.WriteLine("View Key ....");
-    // Populate all members of "e" (KeyInputFocusGainedEventArgs) with real data
-    e.View = Dali.View.GetViewFromPtr(view);
 
-    if (_KeyInputFocusGainedEventHandler != null)
-    {
-      //here we send all data to user event handlers
-      _KeyInputFocusGainedEventHandler(this, e);
-    }
+        /**
+         * @brief Event arguments that passed via Touch signal
+         *
+         */
+        public class TouchEventArgs : EventArgs
+        {
+            private View _view;
+            private Touch _touch;
+
+            /**
+             * @brief View - is the view that is being touched
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+
+            /**
+             * @brief Touch - contains the information of touch points
+             *
+             */
+            public Touch Touch
+            {
+                get
+                {
+                    return _touch;
+                }
+                set
+                {
+                    _touch = value;
+                }
+            }
+        }
 
-  }
+        /**
+         * @brief Event arguments that passed via Hover signal
+         *
+         */
+        public class HoverEventArgs : EventArgs
+        {
+            private View _view;
+            private Hover _hover;
+
+            /**
+             * @brief View - is the view that is being hovered
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+
+            /**
+             * @brief Hover - contains touch points that represent the points
+             * that are currently being hovered or the points where a hover has stopped
+             *
+             */
+            public Hover Hover
+            {
+                get
+                {
+                    return _hover;
+                }
+                set
+                {
+                    _hover = value;
+                }
+            }
+        }
 
-  /**
-   * @brief Event for KeyInputFocusLost signal which can be used to subscribe/unsubscribe the event handler
-   * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler<object,KeyInputFocusLostEventArgs>)
-   * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus.
-   */
-  public event DaliEventHandler<object,KeyInputFocusLostEventArgs> KeyInputFocusLost
-  {
-    add
-    {
-      lock(this)
-      {
-        // Restricted to only one listener
-        if (_KeyInputFocusLostEventHandler == null)
+        /**
+         * @brief Event arguments that passed via Wheel signal
+         *
+         */
+        public class WheelEventArgs : EventArgs
         {
-          _KeyInputFocusLostEventHandler += value;
+            private View _view;
+            private Wheel _wheel;
+
+            /**
+             * @brief View - is the view that is being wheeled
+             *
+             */
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+
+            /**
+             * @brief Wheel - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL
+             *
+             */
+            public Wheel Wheel
+            {
+