update devel/master branch to 0.2.32
authorxb.teng <xb.teng@samsung.com>
Mon, 27 Mar 2017 10:53:22 +0000 (18:53 +0800)
committerxb.teng <xb.teng@samsung.com>
Tue, 28 Mar 2017 11:08:37 +0000 (19:08 +0800)
Change-Id: Ie42227c43abba44e840b32e2f412b51740d91e4e
Signed-off-by: xb.teng <xb.teng@samsung.com>
319 files changed:
src/Tizen.NUI/Tizen.NUI.csproj
src/Tizen.NUI/devel-src/AccessibilityActionSignal.cs
src/Tizen.NUI/devel-src/AccessibilityFocusOvershotSignal.cs
src/Tizen.NUI/devel-src/AccessibilityManager.cs
src/Tizen.NUI/devel-src/Actor.cs
src/Tizen.NUI/devel-src/ActorContainer.cs
src/Tizen.NUI/devel-src/ActorHoverSignal.cs
src/Tizen.NUI/devel-src/ActorSignal.cs
src/Tizen.NUI/devel-src/ActorTouchDataSignal.cs
src/Tizen.NUI/devel-src/ActorWheelSignal.cs
src/Tizen.NUI/devel-src/AlignType.cs [moved from src/Tizen.NUI/devel-src/CameraType.cs with 59% similarity]
src/Tizen.NUI/devel-src/Alignment.cs
src/Tizen.NUI/devel-src/AlphaFunction.cs
src/Tizen.NUI/devel-src/AngleAxis.cs
src/Tizen.NUI/devel-src/AngleThresholdPair.cs
src/Tizen.NUI/devel-src/AnimatablePropertyComponentRegistration.cs
src/Tizen.NUI/devel-src/AnimatablePropertyRegistration.cs
src/Tizen.NUI/devel-src/Animation.cs
src/Tizen.NUI/devel-src/AnimationSignal.cs
src/Tizen.NUI/devel-src/Any.cs
src/Tizen.NUI/devel-src/Application.cs
src/Tizen.NUI/devel-src/ApplicationControlSignal.cs
src/Tizen.NUI/devel-src/ApplicationExtensions.cs
src/Tizen.NUI/devel-src/ApplicationSignal.cs
src/Tizen.NUI/devel-src/AsyncImageLoader.cs
src/Tizen.NUI/devel-src/BaseHandle.cs
src/Tizen.NUI/devel-src/BaseObject.cs
src/Tizen.NUI/devel-src/BlendEquationType.cs
src/Tizen.NUI/devel-src/BlendFactorType.cs
src/Tizen.NUI/devel-src/BlendModeType.cs
src/Tizen.NUI/devel-src/BufferImage.cs
src/Tizen.NUI/devel-src/Builder.cs
src/Tizen.NUI/devel-src/Button.cs
src/Tizen.NUI/devel-src/ButtonSignal.cs
src/Tizen.NUI/devel-src/CameraActor.cs
src/Tizen.NUI/devel-src/CheckBoxButton.cs
src/Tizen.NUI/devel-src/ChildPropertyRegistration.cs
src/Tizen.NUI/devel-src/ClampState.cs
src/Tizen.NUI/devel-src/ClampState2D.cs
src/Tizen.NUI/devel-src/ClippingModeType.cs [deleted file]
src/Tizen.NUI/devel-src/Color.cs
src/Tizen.NUI/devel-src/ColorMode.cs [deleted file]
src/Tizen.NUI/devel-src/ConnectionTracker.cs
src/Tizen.NUI/devel-src/ConnectionTrackerInterface.cs
src/Tizen.NUI/devel-src/ControlKeySignal.cs
src/Tizen.NUI/devel-src/ControlOrientationType.cs
src/Tizen.NUI/devel-src/CustomActorImpl.cs
src/Tizen.NUI/devel-src/CustomAlgorithmInterface.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/CustomView.cs
src/Tizen.NUI/devel-src/CustomView/Spin.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/CustomView/VisualView.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/DaliApplication.cs [deleted file]
src/Tizen.NUI/devel-src/DaliEnumConstants.cs
src/Tizen.NUI/devel-src/DaliEventHandler.cs
src/Tizen.NUI/devel-src/DaliException.cs
src/Tizen.NUI/devel-src/DefaultItemLayoutProperty.cs
src/Tizen.NUI/devel-src/DefaultItemLayoutType.cs
src/Tizen.NUI/devel-src/DefaultRuler.cs
src/Tizen.NUI/devel-src/Degree.cs
src/Tizen.NUI/devel-src/DepthFunctionType.cs
src/Tizen.NUI/devel-src/DepthTestModeType.cs
src/Tizen.NUI/devel-src/DepthWriteModeType.cs
src/Tizen.NUI/devel-src/DirectionBias.cs
src/Tizen.NUI/devel-src/DirectionType.cs [moved from src/Tizen.NUI/devel-src/HorizontalAlignmentType.cs with 85% similarity]
src/Tizen.NUI/devel-src/DisposeQueue.cs
src/Tizen.NUI/devel-src/DragAndDropDetector.cs
src/Tizen.NUI/devel-src/DrawModeType.cs [deleted file]
src/Tizen.NUI/devel-src/EncodedBufferImage.cs
src/Tizen.NUI/devel-src/FaceCullingModeType.cs
src/Tizen.NUI/devel-src/FilterModeType.cs
src/Tizen.NUI/devel-src/FittingModeType.cs
src/Tizen.NUI/devel-src/FixedRuler.cs
src/Tizen.NUI/devel-src/FlexContainer.cs
src/Tizen.NUI/devel-src/FloatSignal.cs
src/Tizen.NUI/devel-src/FocusChangedSignal.cs
src/Tizen.NUI/devel-src/FocusGroupChangedSignal.cs
src/Tizen.NUI/devel-src/FocusManager.cs
src/Tizen.NUI/devel-src/FrameBuffer.cs
src/Tizen.NUI/devel-src/FrameBufferImage.cs
src/Tizen.NUI/devel-src/FriendAssembly.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/GaussianBlurView.cs
src/Tizen.NUI/devel-src/GaussianBlurViewSignal.cs
src/Tizen.NUI/devel-src/Geometry.cs
src/Tizen.NUI/devel-src/Gesture.cs
src/Tizen.NUI/devel-src/GradientVisualSpreadMethodType.cs
src/Tizen.NUI/devel-src/GradientVisualUnitsType.cs
src/Tizen.NUI/devel-src/Handle.cs
src/Tizen.NUI/devel-src/Hover.cs
src/Tizen.NUI/devel-src/Image.cs
src/Tizen.NUI/devel-src/ImageSignal.cs
src/Tizen.NUI/devel-src/ImageView.cs
src/Tizen.NUI/devel-src/Item.cs
src/Tizen.NUI/devel-src/ItemContainer.cs
src/Tizen.NUI/devel-src/ItemFactory.cs
src/Tizen.NUI/devel-src/ItemIdContainer.cs
src/Tizen.NUI/devel-src/ItemLayout.cs
src/Tizen.NUI/devel-src/ItemRange.cs
src/Tizen.NUI/devel-src/ItemView.cs
src/Tizen.NUI/devel-src/Key.cs
src/Tizen.NUI/devel-src/KeyEventSignal.cs
src/Tizen.NUI/devel-src/KeyFrames.cs
src/Tizen.NUI/devel-src/KeyInputFocusManager.cs
src/Tizen.NUI/devel-src/KeyInputFocusSignal.cs
src/Tizen.NUI/devel-src/KeyboardPreFocusChangeSignal.cs
src/Tizen.NUI/devel-src/Layer.cs
src/Tizen.NUI/devel-src/LinearConstrainer.cs
src/Tizen.NUI/devel-src/LoadingState.cs
src/Tizen.NUI/devel-src/LongPressGesture.cs
src/Tizen.NUI/devel-src/LongPressGestureDetectedSignal.cs
src/Tizen.NUI/devel-src/LongPressGestureDetector.cs
src/Tizen.NUI/devel-src/ManualPINVOKE.cs
src/Tizen.NUI/devel-src/Matrix.cs
src/Tizen.NUI/devel-src/Matrix3.cs
src/Tizen.NUI/devel-src/MeshVisualShadingModeValue.cs
src/Tizen.NUI/devel-src/Meta.cs
src/Tizen.NUI/devel-src/Model3dView.cs
src/Tizen.NUI/devel-src/NDalic.cs
src/Tizen.NUI/devel-src/NDalicPINVOKE.cs
src/Tizen.NUI/devel-src/NUIApplication.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/NativeImage.cs
src/Tizen.NUI/devel-src/NativeImageInterface.cs
src/Tizen.NUI/devel-src/NinePatchImage.cs
src/Tizen.NUI/devel-src/ObjectCreatedSignal.cs
src/Tizen.NUI/devel-src/ObjectDestroyedSignal.cs
src/Tizen.NUI/devel-src/ObjectRegistry.cs
src/Tizen.NUI/devel-src/PageFactory.cs
src/Tizen.NUI/devel-src/PagePanSignal.cs
src/Tizen.NUI/devel-src/PageTurnLandscapeView.cs
src/Tizen.NUI/devel-src/PageTurnPortraitView.cs
src/Tizen.NUI/devel-src/PageTurnSignal.cs
src/Tizen.NUI/devel-src/PageTurnView.cs
src/Tizen.NUI/devel-src/PanGesture.cs
src/Tizen.NUI/devel-src/PanGestureDetectedSignal.cs
src/Tizen.NUI/devel-src/PanGestureDetector.cs
src/Tizen.NUI/devel-src/Path.cs
src/Tizen.NUI/devel-src/PathConstrainer.cs
src/Tizen.NUI/devel-src/PinchGesture.cs
src/Tizen.NUI/devel-src/PinchGestureDetectedSignal.cs
src/Tizen.NUI/devel-src/PinchGestureDetector.cs
src/Tizen.NUI/devel-src/PixelData.cs
src/Tizen.NUI/devel-src/PixelFormat.cs
src/Tizen.NUI/devel-src/PointStateType.cs [deleted file]
src/Tizen.NUI/devel-src/Popup.cs
src/Tizen.NUI/devel-src/Position.cs
src/Tizen.NUI/devel-src/Position2D.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/PositionInheritanceMode.cs
src/Tizen.NUI/devel-src/PrimitiveVisualShapeType.cs
src/Tizen.NUI/devel-src/ProgressBar.cs
src/Tizen.NUI/devel-src/ProgressBarValueChangedSignal.cs [moved from src/Tizen.NUI/devel-src/BoolSignal.cs with 51% similarity]
src/Tizen.NUI/devel-src/ProjectionMode.cs [deleted file]
src/Tizen.NUI/devel-src/Property.cs
src/Tizen.NUI/devel-src/PropertyBuffer.cs
src/Tizen.NUI/devel-src/PropertyCondition.cs
src/Tizen.NUI/devel-src/PropertyNotification.cs
src/Tizen.NUI/devel-src/PropertyNotifySignal.cs
src/Tizen.NUI/devel-src/PropertyRangeManager.cs
src/Tizen.NUI/devel-src/PropertyRanges.cs
src/Tizen.NUI/devel-src/PropertyRegistration.cs
src/Tizen.NUI/devel-src/PushButton.cs
src/Tizen.NUI/devel-src/Quaternion.cs [deleted file]
src/Tizen.NUI/devel-src/Radian.cs
src/Tizen.NUI/devel-src/RadioButton.cs
src/Tizen.NUI/devel-src/Rectangle.cs
src/Tizen.NUI/devel-src/RefObject.cs
src/Tizen.NUI/devel-src/RelayoutContainer.cs
src/Tizen.NUI/devel-src/RenderBufferFormat.cs
src/Tizen.NUI/devel-src/RenderModeType.cs
src/Tizen.NUI/devel-src/RenderTask.cs
src/Tizen.NUI/devel-src/RenderTaskList.cs
src/Tizen.NUI/devel-src/RenderTaskSignal.cs
src/Tizen.NUI/devel-src/Renderer.cs
src/Tizen.NUI/devel-src/RenderingType.cs
src/Tizen.NUI/devel-src/ResizePolicyType.cs [deleted file]
src/Tizen.NUI/devel-src/ResourceImage.cs
src/Tizen.NUI/devel-src/ResourceImageSignal.cs
src/Tizen.NUI/devel-src/Rotation.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/Ruler.cs
src/Tizen.NUI/devel-src/RulerDomain.cs
src/Tizen.NUI/devel-src/RulerPtr.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_CallbackBase.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Configuration__ContextLoss.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__CallbackBase.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Constraint.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__FunctorDelegate.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Internal__Texture.cs [moved from src/Tizen.NUI/devel-src/SWIGTYPE_p_f___bool.cs with 78% similarity]
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__ClampState.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__TouchEvent.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_FunctorDelegate.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_KeyboardFocusManager.cs [moved from src/Tizen.NUI/devel-src/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs with 67% similarity]
src/Tizen.NUI/devel-src/SWIGTYPE_p_PropertyInputContainer.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_double.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_float__float.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_float.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_int.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_std__type_info.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_uint8_t.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_unsigned_char.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_unsigned_int.cs
src/Tizen.NUI/devel-src/SWIGTYPE_p_unsigned_short.cs
src/Tizen.NUI/devel-src/Sampler.cs
src/Tizen.NUI/devel-src/SamplingModeType.cs
src/Tizen.NUI/devel-src/ScrollBar.cs
src/Tizen.NUI/devel-src/ScrollView.cs
src/Tizen.NUI/devel-src/ScrollViewEffect.cs
src/Tizen.NUI/devel-src/ScrollViewPagePathEffect.cs
src/Tizen.NUI/devel-src/ScrollViewSnapStartedSignal.cs
src/Tizen.NUI/devel-src/Scrollable.cs
src/Tizen.NUI/devel-src/ScrollableSignal.cs
src/Tizen.NUI/devel-src/Shader.cs
src/Tizen.NUI/devel-src/SignalConnectorType.cs
src/Tizen.NUI/devel-src/SignalObserver.cs
src/Tizen.NUI/devel-src/Size.cs
src/Tizen.NUI/devel-src/Size2D.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/SizeScalePolicyType.cs [deleted file]
src/Tizen.NUI/devel-src/Slider.cs
src/Tizen.NUI/devel-src/SliderMarkReachedSignal.cs
src/Tizen.NUI/devel-src/SliderValueChangedSignal.cs
src/Tizen.NUI/devel-src/SlotObserver.cs
src/Tizen.NUI/devel-src/SnapType.cs
src/Tizen.NUI/devel-src/Stage.cs
src/Tizen.NUI/devel-src/StageWheelSignal.cs
src/Tizen.NUI/devel-src/StencilFunctionType.cs
src/Tizen.NUI/devel-src/StencilOperationType.cs
src/Tizen.NUI/devel-src/StringValuePair.cs
src/Tizen.NUI/devel-src/StyleChangeType.cs [deleted file]
src/Tizen.NUI/devel-src/StyleChangedSignal.cs
src/Tizen.NUI/devel-src/StyleManager.cs
src/Tizen.NUI/devel-src/TableView.cs
src/Tizen.NUI/devel-src/TapGesture.cs
src/Tizen.NUI/devel-src/TapGestureDetectedSignal.cs
src/Tizen.NUI/devel-src/TapGestureDetector.cs
src/Tizen.NUI/devel-src/TextEditor.cs
src/Tizen.NUI/devel-src/TextEditorSignal.cs
src/Tizen.NUI/devel-src/TextField.cs
src/Tizen.NUI/devel-src/TextFieldSignal.cs
src/Tizen.NUI/devel-src/TextLabel.cs
src/Tizen.NUI/devel-src/Texture.cs
src/Tizen.NUI/devel-src/TextureSet.cs
src/Tizen.NUI/devel-src/TextureType.cs
src/Tizen.NUI/devel-src/TimePeriod.cs
src/Tizen.NUI/devel-src/Timer.cs
src/Tizen.NUI/devel-src/TimerSignalType.cs
src/Tizen.NUI/devel-src/ToggleButton.cs
src/Tizen.NUI/devel-src/ToolkitPropertyRange.cs
src/Tizen.NUI/devel-src/TooltipPositionType.cs
src/Tizen.NUI/devel-src/Touch.cs
src/Tizen.NUI/devel-src/TouchPoint.cs
src/Tizen.NUI/devel-src/TouchPointContainer.cs
src/Tizen.NUI/devel-src/TouchSignal.cs
src/Tizen.NUI/devel-src/TransitionData.cs
src/Tizen.NUI/devel-src/TypeAction.cs
src/Tizen.NUI/devel-src/TypeInfo.cs
src/Tizen.NUI/devel-src/TypeRegistration.cs
src/Tizen.NUI/devel-src/TypeRegistry.cs
src/Tizen.NUI/devel-src/Uint16Pair.cs
src/Tizen.NUI/devel-src/Vector2.cs
src/Tizen.NUI/devel-src/Vector3.cs
src/Tizen.NUI/devel-src/Vector4.cs
src/Tizen.NUI/devel-src/VectorBase.cs
src/Tizen.NUI/devel-src/VectorFloat.cs
src/Tizen.NUI/devel-src/VectorInteger.cs
src/Tizen.NUI/devel-src/VectorUint16Pair.cs
src/Tizen.NUI/devel-src/VectorUnsignedChar.cs
src/Tizen.NUI/devel-src/VerticalAlignmentType.cs [deleted file]
src/Tizen.NUI/devel-src/VideoView.cs
src/Tizen.NUI/devel-src/VideoViewSignal.cs
src/Tizen.NUI/devel-src/View.cs
src/Tizen.NUI/devel-src/ViewImpl.cs
src/Tizen.NUI/devel-src/ViewMode.cs
src/Tizen.NUI/devel-src/ViewRegistry.cs
src/Tizen.NUI/devel-src/ViewRegistryHelper.cs
src/Tizen.NUI/devel-src/ViewWrapperImpl.cs
src/Tizen.NUI/devel-src/VisualBase.cs
src/Tizen.NUI/devel-src/VisualFactory.cs
src/Tizen.NUI/devel-src/VisualMaps.cs [new file with mode: 0755]
src/Tizen.NUI/devel-src/VisualTransformPolicyType.cs [moved from src/Tizen.NUI/devel-src/DimensionType.cs with 77% similarity]
src/Tizen.NUI/devel-src/VisualTransformPropertyType.cs
src/Tizen.NUI/devel-src/VisualType.cs
src/Tizen.NUI/devel-src/VoidSignal.cs
src/Tizen.NUI/devel-src/Wheel.cs
src/Tizen.NUI/devel-src/Window.cs
src/Tizen.NUI/devel-src/WrapModeType.cs
src/Tizen.NUI/devel-src/dotnetcore/AddedException.cs [moved from src/Tizen.NUI/devel-src/dotnetcore/addedManually.cs with 84% similarity]
src/Tizen.NUI/devel-src/dotnetcore/HandleRef.cs [moved from src/Tizen.NUI/devel-src/dotnetcore/handleref.cs with 81% similarity]
src/Tizen.NUI/devel-src/doublep.cs
src/Tizen.NUI/devel-src/floatp.cs
src/Tizen.NUI/devel-src/intp.cs
src/Tizen.NUI/devel-src/spin.cs [deleted file]
src/Tizen.NUI/devel-src/uintp.cs
src/Tizen.NUI/devel-src/ushortp.cs
src/Tizen.NUI/devel-src/visual-high-level/ImageVisual.cs [deleted file]
src/Tizen.NUI/devel-src/visual-high-level/TextVisual.cs [deleted file]
src/Tizen.NUI/devel-src/visual-high-level/VisualCommon.cs [deleted file]
src/Tizen.NUI/devel-src/visual-high-level/VisualView.cs [deleted file]

index aff0e98..80f96b4 100755 (executable)
@@ -48,8 +48,8 @@
     <Compile Include="devel-src\AccessibilityActionSignal.cs" />\r
     <Compile Include="devel-src\AccessibilityFocusOvershotSignal.cs" />\r
     <Compile Include="devel-src\AccessibilityManager.cs" />\r
+       <Compile Include="devel-src\ActorContainer.cs" />\r
     <Compile Include="devel-src\Actor.cs" />\r
-    <Compile Include="devel-src\ActorContainer.cs" />\r
     <Compile Include="devel-src\ActorHoverSignal.cs" />\r
     <Compile Include="devel-src\ActorSignal.cs" />\r
     <Compile Include="devel-src\ActorTouchDataSignal.cs" />\r
     <Compile Include="devel-src\BlendEquationType.cs" />\r
     <Compile Include="devel-src\BlendFactorType.cs" />\r
     <Compile Include="devel-src\BlendModeType.cs" />\r
-    <Compile Include="devel-src\BoolSignal.cs" />\r
     <Compile Include="devel-src\BufferImage.cs" />\r
     <Compile Include="devel-src\Builder.cs" />\r
     <Compile Include="devel-src\Button.cs" />\r
     <Compile Include="devel-src\ButtonSignal.cs" />\r
     <Compile Include="devel-src\CameraActor.cs" />\r
-    <Compile Include="devel-src\CameraType.cs" />\r
     <Compile Include="devel-src\CheckBoxButton.cs" />\r
     <Compile Include="devel-src\ChildPropertyRegistration.cs" />\r
     <Compile Include="devel-src\ClampState.cs" />\r
     <Compile Include="devel-src\ClampState2D.cs" />\r
-    <Compile Include="devel-src\ClippingModeType.cs" />\r
     <Compile Include="devel-src\Color.cs" />\r
-    <Compile Include="devel-src\ColorMode.cs" />\r
     <Compile Include="devel-src\ConnectionTracker.cs" />\r
     <Compile Include="devel-src\ConnectionTrackerInterface.cs" />\r
     <Compile Include="devel-src\ControlKeySignal.cs" />\r
     <Compile Include="devel-src\ControlOrientationType.cs" />\r
     <Compile Include="devel-src\CustomActor.cs" />\r
     <Compile Include="devel-src\CustomActorImpl.cs" />\r
+    <Compile Include="devel-src\CustomAlgorithmInterface.cs" />\r
     <Compile Include="devel-src\CustomView.cs" />\r
-    <Compile Include="devel-src\DaliApplication.cs" />\r
     <Compile Include="devel-src\DaliEnumConstants.cs" />\r
     <Compile Include="devel-src\DaliEventHandler.cs" />\r
     <Compile Include="devel-src\DaliException.cs" />\r
     <Compile Include="devel-src\DepthFunctionType.cs" />\r
     <Compile Include="devel-src\DepthTestModeType.cs" />\r
     <Compile Include="devel-src\DepthWriteModeType.cs" />\r
-    <Compile Include="devel-src\DimensionType.cs" />\r
+    <Compile Include="devel-src\DirectionType.cs" />\r
     <Compile Include="devel-src\DirectionBias.cs" />\r
     <Compile Include="devel-src\DisposeQueue.cs" />\r
-    <Compile Include="devel-src\dotnetcore\addedManually.cs" />\r
-    <Compile Include="devel-src\dotnetcore\handleref.cs" />\r
+    <Compile Include="devel-src\dotnetcore\AddedException.cs" />\r
+    <Compile Include="devel-src\dotnetcore\HandleRef.cs" />\r
     <Compile Include="devel-src\doublep.cs" />\r
     <Compile Include="devel-src\DragAndDropDetector.cs" />\r
-    <Compile Include="devel-src\DrawModeType.cs" />\r
     <Compile Include="devel-src\EncodedBufferImage.cs" />\r
     <Compile Include="devel-src\FaceCullingModeType.cs" />\r
     <Compile Include="devel-src\FilterModeType.cs" />\r
     <Compile Include="devel-src\FocusManager.cs" />\r
     <Compile Include="devel-src\FrameBuffer.cs" />\r
     <Compile Include="devel-src\FrameBufferImage.cs" />\r
+    <Compile Include="devel-src\FriendAssembly.cs" />\r
     <Compile Include="devel-src\GaussianBlurView.cs" />\r
     <Compile Include="devel-src\GaussianBlurViewSignal.cs" />\r
     <Compile Include="devel-src\Geometry.cs" />\r
     <Compile Include="devel-src\GradientVisualSpreadMethodType.cs" />\r
     <Compile Include="devel-src\GradientVisualUnitsType.cs" />\r
     <Compile Include="devel-src\Handle.cs" />\r
-    <Compile Include="devel-src\HorizontalAlignmentType.cs" />\r
     <Compile Include="devel-src\Hover.cs" />\r
     <Compile Include="devel-src\Image.cs" />\r
     <Compile Include="devel-src\ImageSignal.cs" />\r
     <Compile Include="devel-src\NDalic.cs" />\r
     <Compile Include="devel-src\NDalicPINVOKE.cs" />\r
     <Compile Include="devel-src\NinePatchImage.cs" />\r
+    <Compile Include="devel-src\NUIApplication.cs" />\r
     <Compile Include="devel-src\ObjectCreatedSignal.cs" />\r
     <Compile Include="devel-src\ObjectDestroyedSignal.cs" />\r
     <Compile Include="devel-src\ObjectRegistry.cs" />\r
     <Compile Include="devel-src\PinchGestureDetector.cs" />\r
     <Compile Include="devel-src\PixelData.cs" />\r
     <Compile Include="devel-src\PixelFormat.cs" />\r
-    <Compile Include="devel-src\PointStateType.cs" />\r
     <Compile Include="devel-src\Popup.cs" />\r
+    <Compile Include="devel-src\Position2D.cs" />\r
     <Compile Include="devel-src\Position.cs" />\r
     <Compile Include="devel-src\PositionInheritanceMode.cs" />\r
     <Compile Include="devel-src\PrimitiveVisualShapeType.cs" />\r
     <Compile Include="devel-src\ProgressBar.cs" />\r
-    <Compile Include="devel-src\ProjectionMode.cs" />\r
+    <Compile Include="devel-src\ProgressBarValueChangedSignal.cs" />\r
     <Compile Include="devel-src\Property.cs" />\r
     <Compile Include="devel-src\PropertyBuffer.cs" />\r
     <Compile Include="devel-src\PropertyCondition.cs" />\r
     <Compile Include="devel-src\PropertyRanges.cs" />\r
     <Compile Include="devel-src\PropertyRegistration.cs" />\r
     <Compile Include="devel-src\PushButton.cs" />\r
-    <Compile Include="devel-src\Quaternion.cs" />\r
     <Compile Include="devel-src\Radian.cs" />\r
     <Compile Include="devel-src\RadioButton.cs" />\r
     <Compile Include="devel-src\Rectangle.cs" />\r
     <Compile Include="devel-src\RenderTask.cs" />\r
     <Compile Include="devel-src\RenderTaskList.cs" />\r
     <Compile Include="devel-src\RenderTaskSignal.cs" />\r
-    <Compile Include="devel-src\ResizePolicyType.cs" />\r
     <Compile Include="devel-src\ResourceImage.cs" />\r
     <Compile Include="devel-src\ResourceImageSignal.cs" />\r
+    <Compile Include="devel-src\Rotation.cs" />\r
     <Compile Include="devel-src\Ruler.cs" />\r
     <Compile Include="devel-src\RulerDomain.cs" />\r
     <Compile Include="devel-src\RulerPtr.cs" />\r
     <Compile Include="devel-src\Shader.cs" />\r
     <Compile Include="devel-src\SignalConnectorType.cs" />\r
     <Compile Include="devel-src\SignalObserver.cs" />\r
+    <Compile Include="devel-src\Size2D.cs" />\r
     <Compile Include="devel-src\Size.cs" />\r
-    <Compile Include="devel-src\SizeScalePolicyType.cs" />\r
     <Compile Include="devel-src\Slider.cs" />\r
     <Compile Include="devel-src\SliderMarkReachedSignal.cs" />\r
     <Compile Include="devel-src\SliderValueChangedSignal.cs" />\r
     <Compile Include="devel-src\SlotObserver.cs" />\r
     <Compile Include="devel-src\SnapType.cs" />\r
-    <Compile Include="devel-src\spin.cs" />\r
+    <Compile Include="devel-src\CustomView\Spin.cs" />\r
     <Compile Include="devel-src\Stage.cs" />\r
     <Compile Include="devel-src\StageWheelSignal.cs" />\r
     <Compile Include="devel-src\StencilFunctionType.cs" />\r
     <Compile Include="devel-src\StencilOperationType.cs" />\r
     <Compile Include="devel-src\StringValuePair.cs" />\r
     <Compile Include="devel-src\StyleChangedSignal.cs" />\r
-    <Compile Include="devel-src\StyleChangeType.cs" />\r
     <Compile Include="devel-src\StyleManager.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_CallbackBase.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Configuration__ContextLoss.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__Constraint.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__FunctorDelegate.cs" />\r
+    <Compile Include="devel-src\SWIGTYPE_p_Dali__Internal__Texture.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__Internal__TypeRegistry.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fboolF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs" />\r
-    <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_Dali__TouchEvent.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_double.cs" />\r
+    <Compile Include="devel-src\SWIGTYPE_p_f_float__float.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_float.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_FunctorDelegate.cs" />\r
-    <Compile Include="devel-src\SWIGTYPE_p_f_float__float.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_r_Dali__Vector2__bool.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs" />\r
-    <Compile Include="devel-src\SWIGTYPE_p_f___bool.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_int.cs" />\r
+    <Compile Include="devel-src\SWIGTYPE_p_KeyboardFocusManager.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_PropertyInputContainer.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_std__type_info.cs" />\r
     <Compile Include="devel-src\SWIGTYPE_p_uint8_t.cs" />\r
     <Compile Include="devel-src\VectorInteger.cs" />\r
     <Compile Include="devel-src\VectorUint16Pair.cs" />\r
     <Compile Include="devel-src\VectorUnsignedChar.cs" />\r
-    <Compile Include="devel-src\VerticalAlignmentType.cs" />\r
     <Compile Include="devel-src\VideoView.cs" />\r
     <Compile Include="devel-src\VideoViewSignal.cs" />\r
     <Compile Include="devel-src\View.cs" />\r
     <Compile Include="devel-src\ViewRegistryHelper.cs" />\r
     <Compile Include="devel-src\ViewWrapper.cs" />\r
     <Compile Include="devel-src\ViewWrapperImpl.cs" />\r
-    <Compile Include="devel-src\visual-high-level\ImageVisual.cs" />\r
-    <Compile Include="devel-src\visual-high-level\TextVisual.cs" />\r
-    <Compile Include="devel-src\visual-high-level\VisualCommon.cs" />\r
-    <Compile Include="devel-src\visual-high-level\VisualView.cs" />\r
+    <Compile Include="devel-src\CustomView\VisualView.cs" />\r
     <Compile Include="devel-src\VisualBase.cs" />\r
     <Compile Include="devel-src\VisualFactory.cs" />\r
+    <Compile Include="devel-src\VisualMaps.cs" />\r
+    <Compile Include="devel-src\VisualTransformPolicyType.cs" />\r
     <Compile Include="devel-src\VisualTransformPropertyType.cs" />\r
     <Compile Include="devel-src\VisualType.cs" />\r
     <Compile Include="devel-src\VoidSignal.cs" />\r
     <Compile Include="devel-src\Wheel.cs" />\r
     <Compile Include="devel-src\Window.cs" />\r
     <Compile Include="devel-src\WrapModeType.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Reference Include="Tizen.Applications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=4aa249e9db245e88, processorArchitecture=MSIL">\r
       </FlavorProperties>\r
     </VisualStudio>\r
   </ProjectExtensions>\r
-</Project>
\ No newline at end of file
+</Project>\r
index e087fa5..38fd528 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AccessibilityActionSignal : global::System.IDisposable {
+internal class AccessibilityActionSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 69329e3..7571e6b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AccessibilityFocusOvershotSignal : global::System.IDisposable {
+internal class AccessibilityFocusOvershotSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 3181a07..52109cf 100755 (executable)
@@ -13,7 +13,7 @@ namespace Tizen.NUI {
     using System;
     using System.Runtime.InteropServices;
 
-public class AccessibilityManager : BaseHandle {
+internal class AccessibilityManager : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal AccessibilityManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AccessibilityManager_SWIGUpcast(cPtr), cMemoryOwn) {
index 9dc6cb4..1771594 100755 (executable)
-/** 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 />
+// 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
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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.
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Actor is the primary object with which Dali applications interact.
+    /// UI controls can be built by combining multiple actors.
+    /// </summary>
+    public class Actor : Handle
+    {
+        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);
+        }
+
+        /// <summary>
+        /// To make Actor instance be disposed.
+        /// </summary>
+        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();
+            }
+        }
+
+        internal static Actor GetActorFromPtr(global::System.IntPtr cPtr)
+        {
+            Actor ret = new Actor(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal IntPtr GetPtrfromActor()
+        {
+            return (IntPtr)swigCPtr;
+        }
+
+        /// <summary>
+        ///  Retrieve the position of the Actor.
+        ///  The coordinates are relative to the Actor's parent.
+        /// </summary>
+        public Position CurrentPosition
+        {
+            get
+            {
+                return GetCurrentPosition();
+            }
+        }
+
+        /// <summary>
+        ///  Retrieve the size of the Actor.
+        ///  The coordinates are relative to the Actor's parent.
+        /// </summary>
+        public Size CurrentSize
+        {
+            get
+            {
+                return GetCurrentSize();
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the actor's parent.
+        /// </summary>
+        public Actor Parent
+        {
+            get
+            {
+                return GetParent();
+            }
+        }
+
+        /// <summary>
+        /// Retrieves and sets the actor's opacity.
+        /// </summary>
+        public float Opacity
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Actor.Property.COLOR_ALPHA).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.COLOR_ALPHA, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Retrieves screen postion of actor's
+        /// </summary>
+        public Vector2 ScreenPosition
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(Actor.Property.SCREEN_POSITION).Get(temp);
+                return temp;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the anchor point should be used to determine the position of the actor.
+        /// This is true by default. 
+        /// Note: If false, then the top-left of the actor is used for the position.
+        /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the actor's position.
+        /// </summary>
+        public 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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Queries whether the actor is connected to the Stage.
+        /// When an actor is connected, it will be directly or indirectly parented to the root Actor.
+        /// </summary>
+        public bool IsOnStage
+        {
+            get
+            {
+                return OnStage();
+            }
+        }
+
+        /// <summary>
+        /// Gets depth in the hierarchy for the actor.
+        /// </summary>
+        public int HierarchyDepth
+        {
+            get
+            {
+                return GetHierarchyDepth();
+            }
+        }
+
+        /// <summary>
+        ///  Sets the sibling order of the actor so depth position can be defined within the same parent. 
+        ///  Note The initial value is 0.
+        ///  Raise, Lower, RaiseToTop, LowerToBottom, RaiseAbove and LowerBelow will override the sibling order.
+        ///  The values set by this Property will likely change.
+        /// </summary>
+        public int SiblingOrder
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(Actor.Property.SIBLING_ORDER).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.SIBLING_ORDER, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Sets the size of an actor for Width and Height.
+        /// Geometry can be scaled to fit within this area.
+        /// This does not interfere with the actors scale factor.
+        /// The actors default depth is the minimum of Width & Height.
+        /// </summary>
+        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 PropertyValue(new Size(value)));
+            }
+        }
+
+        /// <summary>
+        /// Sets the position of the Actor for X and Y.
+        /// By default, sets the position vector between the parent origin and anchor point(default).
+        /// If Position inheritance if disabled, sets the world position.
+        /// </summary>
+        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 PropertyValue(new Position(value)));
+            }
+        }
+
+        /// <summary>
+        /// Sets the visibility flag of an actor as true to be shown.
+        /// Note This is an asynchronous method; the value written may not match a value subsequently read with Visible.
+        /// If an actor's visibility flag is set to false, then the actor and its children will not be rendered.
+        /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true.
+        /// </summary>
+        public void Show()
+        {
+            SetVisible(true);
+        }
+
+        /// <summary>
+        /// Sets the visibility flag of an actor as false to be hidden.
+        /// </summary>
+        public void Hide()
+        {
+            SetVisible(false);
+        }
+
+        /// <summary>
+        /// Raise actor above the next highest level of actor(s).
+        /// Note Sibling order of actors within the parent will be updated automatically.
+        /// Initially actors added to a parent will have the same sibling order and shown in relation to insertion order.
+        /// Raising this actor above actors with the same sibling order as each other will raise this actor above them.
+        /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        public void Raise()
+        {
+            NDalicPINVOKE.Raise(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Lower the actor to underneath the level below actor(s).
+        /// Note Sibling order of actors within the parent will be updated automatically.
+        /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them.
+        /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        public void Lower()
+        {
+            NDalicPINVOKE.Lower(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Raise actor above all other actors.
+        /// Note Sibling order of actors within the parent will be updated automatically.
+        /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        public void RaiseToTop()
+        {
+            NDalicPINVOKE.RaiseToTop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Lower actor to the bottom of all actors.
+        /// Note Sibling order of actors within the parent will be updated automatically.
+        /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        public void LowerToBottom()
+        {
+            NDalicPINVOKE.LowerToBottom(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        ///  Raise the actor to above the target actor.
+        ///  Note Sibling order of actors within the parent will be updated automatically.
+        ///  Actors on the level above the target actor will still be shown above this actor.
+        ///  Raising this actor above actors with the same sibling order as each other will raise this actor above them.
+        ///  Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        /// <param name="target">Will be raised above this actor</param>
+        public void RaiseAbove(Actor target)
+        {
+            NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Lower the actor to below the target actor.
+        /// Note Sibling order of actors within the parent will be updated automatically.
+        /// Lowering this actor below actors with the same sibling order as each other will lower this actor above them.
+        /// Once a raise or lower API is used that actor will then have an exclusive sibling order independent of insertion.
+        /// </summary>
+        /// <param name="target">Will be lowered below this actor</param>
+        public void LowerBelow(Actor target)
+        {
+            NDalicPINVOKE.RaiseAbove(swigCPtr, Actor.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Actor_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get();
+            internal static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get();
+            internal static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get();
+            internal static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get();
+
+            internal Property() : this(NDalicPINVOKE.new_Actor_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get();
+            internal static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get();
+            internal static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get();
+            internal static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get();
+            internal static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get();
+            internal static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get();
+            internal static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get();
+            internal static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get();
+            internal static readonly int SIZE = NDalicPINVOKE.Actor_Property_SIZE_get();
+            internal static readonly int SIZE_WIDTH = NDalicPINVOKE.Actor_Property_SIZE_WIDTH_get();
+            internal static readonly int SIZE_HEIGHT = NDalicPINVOKE.Actor_Property_SIZE_HEIGHT_get();
+            internal static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get();
+            internal static readonly int POSITION = NDalicPINVOKE.Actor_Property_POSITION_get();
+            internal static readonly int POSITION_X = NDalicPINVOKE.Actor_Property_POSITION_X_get();
+            internal static readonly int POSITION_Y = NDalicPINVOKE.Actor_Property_POSITION_Y_get();
+            internal static readonly int POSITION_Z = NDalicPINVOKE.Actor_Property_POSITION_Z_get();
+            internal static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get();
+            internal static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get();
+            internal static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get();
+            internal static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get();
+            internal static readonly int ORIENTATION = NDalicPINVOKE.Actor_Property_ORIENTATION_get();
+            internal static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get();
+            internal static readonly int SCALE = NDalicPINVOKE.Actor_Property_SCALE_get();
+            internal static readonly int SCALE_X = NDalicPINVOKE.Actor_Property_SCALE_X_get();
+            internal static readonly int SCALE_Y = NDalicPINVOKE.Actor_Property_SCALE_Y_get();
+            internal static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get();
+            internal static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get();
+            internal static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get();
+            internal static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get();
+            internal static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get();
+            internal static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get();
+            internal static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get();
+            internal static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get();
+            internal static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get();
+            internal static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get();
+            internal static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get();
+            internal static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get();
+            internal static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get();
+            internal static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get();
+            internal static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get();
+            internal static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get();
+            internal static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get();
+            internal static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get();
+            internal static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get();
+            internal static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get();
+            internal static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get();
+            internal static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get();
+            internal static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get();
+            internal static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get();
+            internal static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get();
+            internal static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get();
+            internal static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get();
+            internal static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get();
+            internal static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized Actor.
+        /// </summary>
+        public Actor() : this(NDalicPINVOKE.Actor_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Downcasts a handle to Actor handle. 
+        /// If handle points to an Actor object, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.   *
+        /// </summary>
+        /// <param name="handle">handle to An object</param>
+        /// <returns>handle to a Actor object or an uninitialized handle</returns>
+        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;
+        }
+
+        internal Actor(Actor copy) : this(NDalicPINVOKE.new_Actor__SWIG_1(Actor.getCPtr(copy)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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;
+        }
+
+        internal string GetName()
+        {
+            string ret = NDalicPINVOKE.Actor_GetName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetName(string name)
+        {
+            NDalicPINVOKE.Actor_SetName(swigCPtr, name);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal uint GetId()
+        {
+            uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool IsRoot()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsRoot(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool OnStage()
+        {
+            bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool IsLayer()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Layer GetLayer()
+        {
+            Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Adds a child Actor to this Actor.
+        /// Precondition : This Actor(the parent) has been initialized. The child actor has been initialized. The child actor is not the same as the parent actor.
+        /// PostCondition : The child will be referenced by its parent. This means that the child will be kept alive, even if the handle passed into this method is reset or destroyed.
+        /// Note : If the child already has a parent, it will be removed from old parent and reparented to this actor. This may change child's position, color, scale etc as it now inherits them from this actor.
+        /// </summary>
+        /// <param name="child">The child</param>
+        public void Add(Actor child)
+        {
+            NDalicPINVOKE.Actor_Add(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Removes a child Actor from this Actor. If the actor was not a child of this actor, this is a no-op.
+        /// Precondition : This Actor(the parent) has been initialized. The child actor is not the same as the parent actor.
+        /// </summary>
+        /// <param name="child">The child</param>
+        public void Remove(Actor child)
+        {
+            NDalicPINVOKE.Actor_Remove(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void Unparent()
+        {
+            NDalicPINVOKE.Actor_Unparent(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the number of children held by the actor.
+        /// Precondition :  The Actor has been initialized.
+        /// </summary>
+        /// <returns>The number of children</returns>
+        public uint GetChildCount()
+        {
+            uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieve and child actor by index.
+        /// Precondition : The Actor has been initialized.
+        /// </summary>
+        /// <param name="index">The index of the child to retrieve</param>
+        /// <returns>The actor for the given index or empty handle if children not initialized</returns>
+        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;
+        }
+
+        /// <summary>
+        /// Search through this actor's hierarchy for an actor with the given name.
+        /// The actor itself is also considered in the search.
+        ///Precondition :  The Actor has been initialized.
+        /// </summary>
+        /// <param name="actorName">The name of the actor to find</param>
+        /// <returns>A handle to the actor if found, or an empty handle if not</returns>
+        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;
+        }
+
+        internal Actor FindChildById(uint id)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Actor GetParent()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Actor_GetParent(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetParentOrigin(Vector3 origin)
+        {
+            NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetCurrentParentOrigin()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetAnchorPoint(Vector3 anchorPoint)
+        {
+            NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetCurrentAnchorPoint()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetSize(float width, float height)
+        {
+            NDalicPINVOKE.Actor_SetSize__SWIG_0(swigCPtr, width, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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();
+        }
+
+        internal void SetSize(Vector2 size)
+        {
+            NDalicPINVOKE.Actor_SetSize__SWIG_2(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSize(Vector3 size)
+        {
+            NDalicPINVOKE.Actor_SetSize__SWIG_3(swigCPtr, Vector3.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetTargetSize()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetTargetSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Size GetCurrentSize()
+        {
+            Size ret = new Size(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the natural size of the actor.
+        /// Deriving classes stipulate the natural size and by default an actor has a ZERO natural size.
+        /// </summary>
+        /// <returns>The actor's natural size</returns>
+        public Vector3 GetNaturalSize()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetPosition(float x, float y)
+        {
+            NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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();
+        }
+
+        internal void SetPosition(Vector3 position)
+        {
+            NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetX(float x)
+        {
+            NDalicPINVOKE.Actor_SetX(swigCPtr, x);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetY(float y)
+        {
+            NDalicPINVOKE.Actor_SetY(swigCPtr, y);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetZ(float z)
+        {
+            NDalicPINVOKE.Actor_SetZ(swigCPtr, z);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void TranslateBy(Vector3 distance)
+        {
+            NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Position GetCurrentPosition()
+        {
+            Position ret = new Position(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 GetCurrentWorldPosition()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetInheritPosition(bool inherit)
+        {
+            NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PositionInheritanceMode GetPositionInheritanceMode()
+        {
+            PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool IsPositionInherited()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal void SetOrientation(Rotation orientation)
+        {
+            NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal void RotateBy(Rotation relativeRotation)
+        {
+            NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Rotation.getCPtr(relativeRotation));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Rotation GetCurrentOrientation()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetInheritOrientation(bool inherit)
+        {
+            NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsOrientationInherited()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Rotation GetCurrentWorldOrientation()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetScale(float scale)
+        {
+            NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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();
+        }
+
+        internal void SetScale(Vector3 scale)
+        {
+            NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void ScaleBy(Vector3 relativeScale)
+        {
+            NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetCurrentScale()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 GetCurrentWorldScale()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetInheritScale(bool inherit)
+        {
+            NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsScaleInherited()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Matrix GetCurrentWorldMatrix()
+        {
+            Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetVisible(bool visible)
+        {
+            NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsVisible()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetOpacity(float opacity)
+        {
+            NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetCurrentOpacity()
+        {
+            float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetColor(Vector4 color)
+        {
+            NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector4 GetCurrentColor()
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetColorMode(ColorMode colorMode)
+        {
+            NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ColorMode GetColorMode()
+        {
+            ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 GetCurrentWorldColor()
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetDrawMode(DrawModeType drawMode)
+        {
+            NDalicPINVOKE.Actor_SetDrawMode(swigCPtr, (int)drawMode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal DrawModeType GetDrawMode()
+        {
+            DrawModeType ret = (DrawModeType)NDalicPINVOKE.Actor_GetDrawMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetSensitive(bool sensitive)
+        {
+            NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsSensitive()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Converts screen coordinates into the actor's coordinate system using the default camera.
+        /// Precondition : The Actor has been initialized.
+        /// Note : The actor coordinates are relative to the top-left(0.0, 0.0, 0.5)
+        /// </summary>
+        /// <param name="localX">On return, the X-coordinate relative to the actor</param>
+        /// <param name="localY">On return, the Y-coordinate relative to the actor</param>
+        /// <param name="screenX">The screen X-coordinate</param>
+        /// <param name="screenY">The screen Y-coordinate</param>
+        /// <returns>True if the conversion succeeded</returns>
+        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;
+        }
+
+        internal void SetLeaveRequired(bool required)
+        {
+            NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool GetLeaveRequired()
+        {
+            bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetKeyboardFocusable(bool focusable)
+        {
+            NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsKeyboardFocusable()
+        {
+            bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetResizePolicy(ResizePolicyType policy, DimensionType dimension)
+        {
+            NDalicPINVOKE.Actor_SetResizePolicy(swigCPtr, (int)policy, (int)dimension);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ResizePolicyType GetResizePolicy(DimensionType dimension)
+        {
+            ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.Actor_GetResizePolicy(swigCPtr, (int)dimension);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetSizeScalePolicy(SizeScalePolicyType policy)
+        {
+            NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal SizeScalePolicyType GetSizeScalePolicy()
+        {
+            SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the relative to parent size factor of the actor.
+        /// This factor is only used when ResizePolicy is set to either
+        /// This actor's size is set to the actor's size multiplied by or added to this factor, depending on ResizePolicy
+        /// Precondition : The Actor has been initialized.
+        /// </summary>
+        /// <param name="factor">A Vector3 representing the relative factor to be applied to each axis</param>
+        public void SetSizeModeFactor(Vector3 factor)
+        {
+            NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetSizeModeFactor()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetSizeModeFactor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Calculates the height of the actor given a width.
+        /// The natural size is used for default calculation. 
+        /// size 0 is treated as aspect ratio 1:1.
+        /// </summary>
+        /// <param name="width">Width to use</param>
+        /// <returns>the height based on the width</returns>
+        public float GetHeightForWidth(float width)
+        {
+            float ret = NDalicPINVOKE.Actor_GetHeightForWidth(swigCPtr, width);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Calculates the width of the actor given a height.
+        /// The natural size is used for default calculation.
+        /// size 0 is treated as aspect ratio 1:1.
+        /// </summary>
+        /// <param name="height">Height to use</param>
+        /// <returns>the width based on the height</returns>
+        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;
+        }
+
+        /// <summary>
+        /// Sets the padding for use in layout.
+        /// </summary>
+        /// <param name="padding">padding Padding for the actor</param>
+        public void SetPadding(PaddingType padding)
+        {
+            NDalicPINVOKE.Actor_SetPadding(swigCPtr, PaddingType.getCPtr(padding));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Returns the value of the padding.
+        /// </summary>
+        /// <param name="paddingOut">The returned padding data</param>
+        public void GetPadding(PaddingType paddingOut)
+        {
+            NDalicPINVOKE.Actor_GetPadding(swigCPtr, PaddingType.getCPtr(paddingOut));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetMinimumSize(Vector2 size)
+        {
+            NDalicPINVOKE.Actor_SetMinimumSize(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector2 GetMinimumSize()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMinimumSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetMaximumSize(Vector2 size)
+        {
+            NDalicPINVOKE.Actor_SetMaximumSize(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector2 GetMaximumSize()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Actor_GetMaximumSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal int GetHierarchyDepth()
+        {
+            int ret = NDalicPINVOKE.Actor_GetHierarchyDepth(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal uint AddRenderer(Renderer renderer)
+        {
+            uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal uint GetRendererCount()
+        {
+            uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Renderer GetRendererAt(uint index)
+        {
+            Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void RemoveRenderer(Renderer renderer)
+        {
+            NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void RemoveRenderer(uint index)
+        {
+            NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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;
+        }
+
+        internal ActorTouchDataSignal TouchSignal()
+        {
+            ActorTouchDataSignal ret = new ActorTouchDataSignal(NDalicPINVOKE.Actor_TouchSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorHoverSignal HoveredSignal()
+        {
+            ActorHoverSignal ret = new ActorHoverSignal(NDalicPINVOKE.Actor_HoveredSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorWheelSignal WheelEventSignal()
+        {
+            ActorWheelSignal ret = new ActorWheelSignal(NDalicPINVOKE.Actor_WheelEventSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorSignal OnStageSignal()
+        {
+            ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorSignal OffStageSignal()
+        {
+            ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorSignal OnRelayoutSignal()
+        {
+            ActorSignal ret = new ActorSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets/Sets the origin of an actor, within its parent's area.
+        /// This is expressed in unit coordinates, such that(0.0, 0.0, 0.5) is the top-left corner of the parent, and(1.0, 1.0, 0.5) is the bottom-right corner.
+        /// The default parent-origin is ParentOrigin.TopLeft (0.0, 0.0, 0.5).
+        /// An actor's position is the distance between this origin, and the actor's anchor-point.
+        /// Precondition : The Actor has been initialized.
+        /// </summary>
+        public Position ParentOrigin
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.PARENT_ORIGIN).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.PARENT_ORIGIN, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the anchor-point of an actor. 
+        /// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the actor, and(1.0, 1.0, 0.5) is the bottom-right corner.
+        /// The default anchor point is AnchorPoint.Center (0.5, 0.5, 0.5).
+        /// An actor position is the distance between its parent-origin and this anchor-point.
+        /// An actor's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
+        /// Precondition : The Actor has been initialized.
+        /// </summary>
+        public Position AnchorPoint
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.ANCHOR_POINT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+
+        /// <summary>
+        /// Gets/Sets the size of an actor.
+        /// Geometry can be scaled to fit within this area.
+        /// This does not interfere with the actors scale factor.
+        /// </summary>
+        public Size Size
+        {
+            get
+            {
+                Size temp = new Size(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.SIZE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the size width of an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the size height of an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the size depth of an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the position of the Actor.
+        /// By default, sets the position vector between the parent origin and anchor point(default).
+        /// If Position inheritance if disabled, sets the world position.
+        /// </summary>
+        public Position Position
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.POSITION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+
+        /// <summary>
+        /// Gets/Sets the position x of the Actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the position y of the Actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the position z of the Actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the world position of the Actor.
+        /// </summary>
+        public Vector3 WorldPosition
+        {
+            get
+            {
+                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.WORLD_POSITION).Get(temp);
+                return temp;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the orientation of the Actor.
+        /// An actor's orientation is the rotation from its default orientation, and the rotation is centered around its anchor-point.
+        /// Note: This is an asynchronous method.
+        /// </summary>
+        public Rotation Orientation
+        {
+            get
+            {
+                Rotation temp = new Rotation();
+                GetProperty(Actor.Property.ORIENTATION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.ORIENTATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the world orientation of the Actor.
+        /// </summary>
+        public Rotation WorldOrientation
+        {
+            get
+            {
+                Rotation temp = new Rotation();
+                GetProperty(Actor.Property.WORLD_ORIENTATION).Get(temp);
+                return temp;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the scale factor applied to an actor.
+        /// Note : This is an asynchronous method.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the scale x factor applied to an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the scale y factor applied to an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the scale z factor applied to an actor.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets the world scale of Actor.
+        /// </summary>
+        public Vector3 WorldScale
+        {
+            get
+            {
+                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.WORLD_SCALE).Get(temp);
+                return temp;
+            }
+        }
 
-namespace Tizen.NUI {
+        /// <summary>
+        /// Retrieves the visibility flag of an actor.
+        /// Note : If an actor is not visible, then the actor and its children will not be rendered.
+        /// This is regardless of the individual visibility values of the children i.e.an actor will only be rendered if all of its parents have visibility set to true.
+        /// </summary>
+        public bool Visible
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.VISIBLE).Get(ref temp);
+                return temp;
+            }
+            /* only get is required : removed
+            set
+            {
+                SetProperty(Actor.Property.VISIBLE, new Tizen.NUI.PropertyValue(value));
+            }
+            */
+        }
 
-    using System;
-    using System.Runtime.InteropServices;
+        /// <summary>
+        /// Gets/Sets the actor's mix color; this is an RGBA value.
+        /// The final color of the actor depends on its color mode.
+        /// Note : This is an asynchronous method.
+        /// </summary>
+        public Color MixColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-public class Actor : Handle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        /// <summary>
+        /// Gets/Sets the actor's mix color red.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  internal Actor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Actor_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        /// <summary>
+        /// Gets/Sets the actor's mix color green.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  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;
-  }
+        /// <summary>
+        /// Gets/Sets the actor's mix color blue
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  ~Actor() {
-    DisposeQueue.Instance.Add(this);
-  }
+        /// <summary>
+        /// Gets/Sets the actor's mix color alpha.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Gets the actor's world color.
+        /// </summary>
+        public Color WorldColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Actor.Property.WORLD_COLOR).Get(temp);
+                return temp;
+            }
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Actor(swigCPtr);
+        /// <summary>
+        /// Gets/Sets the Actor's name.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                string temp;
+                GetProperty(Actor.Property.NAME).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.NAME, new Tizen.NUI.PropertyValue(value));
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Gets/Sets the status of whether an actor should emit touch or hover signals.
+        /// </summary>
+        public bool Sensitive
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.SENSITIVE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.SENSITIVE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
+        /// <summary>
+        /// Gets/Sets the status of whether the actor should receive a notification when touch or hover motion events leave the boundary of the actor.
+        /// </summary>
+        public bool LeaveRequired
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.LEAVE_REQUIRED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.LEAVE_REQUIRED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    public static Actor GetActorFromPtr(global::System.IntPtr cPtr) {
-      Actor ret = new Actor(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
+        /// <summary>
+        /// Gets/Sets the status of whether a child actor inherits it's parent's orientation.
+        /// </summary>
+        public bool InheritOrientation
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.INHERIT_ORIENTATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.INHERIT_ORIENTATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    public IntPtr GetPtrfromActor ()
-    {
-       return (IntPtr)swigCPtr;
-    }
+        /// <summary>
+        /// Gets/Sets the status of whether a child actor inherits it's parent's scale.
+        /// </summary>
+        public bool InheritScale
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.INHERIT_SCALE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.INHERIT_SCALE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    public Position CurrentPosition
-    {
-      get
-      {
-        return GetCurrentPosition();
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the actor's color mode.
+        /// This specifies whether the Actor uses its own color, or inherits its parent color.
+        /// The default is UseOwnMultiplyParentAlpha.
+        /// </summary>
+        public ColorMode ColorMode
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.COLOR_MODE).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "ColorMode get error!");
+                }
+                switch (temp)
+                {
+                    case "USE_OWN_COLOR":
+                    return ColorMode.UseOwnColor;
+                    case "USE_PARENT_COLOR":
+                    return ColorMode.UseParentColor;
+                    case "USE_OWN_MULTIPLY_PARENT_COLOR":
+                    return ColorMode.UseOwnMultiplyParentColor;
+                    case "USE_OWN_MULTIPLY_PARENT_ALPHA":
+                    return ColorMode.UseOwnMultiplyParentAlpha;
+                    default:
+                    return ColorMode.UseOwnMultiplyParentAlpha;
+                }
+            }
+            set
+            {
+                SetProperty(Actor.Property.COLOR_MODE, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
 
-    public Size3D CurrentSize
-    {
-      get
-      {
-        return GetCurrentSize();
-      }
-    }
 
-    public Actor Parent
-    {
-      get
-      {
-        return GetParent();
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the status of how the actor and its children should be drawn.
+        /// Not all actors are renderable, but DrawMode can be inherited from any actor.
+        /// If an object is in a 3D layer, it will be depth-tested against other objects in the world i.e. it may be obscured if other objects are in front.
+        /// If DrawMode.Overlay2D is used, the actor and its children will be drawn as a 2D overlay.
+        /// Overlay actors are drawn in a separate pass, after all non-overlay actors within the Layer.
+        /// For overlay actors, the drawing order is with respect to tree levels of Actors, and depth-testing will not be used.
+        /// </summary>
+        public DrawModeType DrawMode
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.DRAW_MODE).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "DrawMode get error!");
+                }
+                switch (temp)
+                {
+                    case "NORMAL":
+                    return DrawModeType.Normal;
+                    case "OVERLAY_2D":
+                    return DrawModeType.Overlay2D;
+                    case "STENCIL":
+                    return DrawModeType.Stencil;
+                    default:
+                    return DrawModeType.Normal;
+                }
+            }
+            set
+            {
+                SetProperty(Actor.Property.DRAW_MODE, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
 
-   public bool Visibility
-   {
-      get
-      {
-        return IsVisible();
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the relative to parent size factor of the actor.
+        /// This factor is only used when ResizePolicyType is set to either: ResizePolicyType.SizeRelativeToParent or ResizePolicyType.SizeFixedOffsetFromParent.
+        /// This actor's size is set to the actor's size multiplied by or added to this factor, depending on ResizePolicyType.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-   public float Opacity
-   {
-      set
-      {
-        SetOpacity(value);
-      }
-      get
-      {
-        return GetCurrentOpacity();
-      }
-   }
-
-    public bool StateFocusEnable
-    {
-      set
-      {
-        SetKeyboardFocusable(value);
-      }
-      get
-      {
-        return IsKeyboardFocusable();
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the width resize policy to be used for the given dimension(s).
+        /// </summary>
+        public ResizePolicyType WidthResizePolicy
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.WIDTH_RESIZE_POLICY).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "WidthResizePolicy get error!");
+                }
+                switch (temp)
+                {
+                    case "FIXED":
+                    return ResizePolicyType.Fixed;
+                    case "USE_NATURAL_SIZE":
+                    return ResizePolicyType.UseNaturalSize;
+                    case "FILL_TO_PARENT":
+                    return ResizePolicyType.FillToParent;
+                    case "SIZE_RELATIVE_TO_PARENT":
+                    return ResizePolicyType.SizeRelativeToParent;
+                    case "SIZE_FIXED_OFFSET_FROM_PARENT":
+                    return ResizePolicyType.SizeFixedOffsetFromParent;
+                    case "FIT_TO_CHILDREN":
+                    return ResizePolicyType.FitToChildren;
+                    case "DIMENSION_DEPENDENCY":
+                    return ResizePolicyType.DimensionDependency;
+                    case "USE_ASSIGNED_SIZE":
+                    return ResizePolicyType.UseAssignedSize;
+                    default:
+                    return ResizePolicyType.Fixed;
+                }
+            }
+            set
+            {
+                SetProperty(Actor.Property.WIDTH_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
 
-    public bool IsOnStage
-    {
-      get
-      {
-        return OnStage();
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the height resize policy to be used for the given dimension(s).
+        /// </summary>
+        public ResizePolicyType HeightResizePolicy
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.HEIGHT_RESIZE_POLICY).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "HeightResizePolicy get error!");
+                }
+                switch (temp)
+                {
+                    case "FIXED":
+                    return ResizePolicyType.Fixed;
+                    case "USE_NATURAL_SIZE":
+                    return ResizePolicyType.UseNaturalSize;
+                    case "FILL_TO_PARENT":
+                    return ResizePolicyType.FillToParent;
+                    case "SIZE_RELATIVE_TO_PARENT":
+                    return ResizePolicyType.SizeRelativeToParent;
+                    case "SIZE_FIXED_OFFSET_FROM_PARENT":
+                    return ResizePolicyType.SizeFixedOffsetFromParent;
+                    case "FIT_TO_CHILDREN":
+                    return ResizePolicyType.FitToChildren;
+                    case "DIMENSION_DEPENDENCY":
+                    return ResizePolicyType.DimensionDependency;
+                    case "USE_ASSIGNED_SIZE":
+                    return ResizePolicyType.UseAssignedSize;
+                    default:
+                    return ResizePolicyType.Fixed;
+                }
+            }
+            set
+            {
+                SetProperty(Actor.Property.HEIGHT_RESIZE_POLICY, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
 
-    public int SiblingOrder
-    {
-      get
-      {
-        int temp = 0;
-        GetProperty( Actor.Property.SIBLING_ORDER).Get( ref temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( Actor.Property.SIBLING_ORDER, new Tizen.NUI.Property.Value( value ) );
-      }
-    }
+        /// <summary>
+        /// Gets/Sets the policy to use when setting size with size negotiation. 
+        /// Defaults to  SizeScalePolicyType.UseSizeSet.
+        /// </summary>
+        public SizeScalePolicyType SizeScalePolicy
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.SIZE_SCALE_POLICY).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "SizeScalePolicy get error!");
+                }
+                switch (temp)
+                {
+                    case "USE_SIZE_SET":
+                    return SizeScalePolicyType.UseSizeSet;
+                    case "FIT_WITH_ASPECT_RATIO":
+                    return SizeScalePolicyType.FitWithAspectRatio;
+                    case "FILL_WITH_ASPECT_RATIO":
+                    return SizeScalePolicyType.FillWithAspectRatio;
+                    default:
+                    return SizeScalePolicyType.UseSizeSet;
+                }
+            }
+            set
+            {
+                string valueToString = "";
+                switch (value)
+                {
+                    case SizeScalePolicyType.UseSizeSet:
+                    {
+                        valueToString = "USE_SIZE_SET";
+                        break;
+                    }
+                    case SizeScalePolicyType.FitWithAspectRatio:
+                    {
+                        valueToString = "FIT_WITH_ASPECT_RATIO";
+                        break;
+                    }
+                    case SizeScalePolicyType.FillWithAspectRatio:
+                    {
+                        valueToString = "FILL_WITH_ASPECT_RATIO";
+                        break;
+                    }
+                    default:
+                    {
+                        valueToString = "USE_SIZE_SET";
+                        break;
+                    }
+                }
+                SetProperty(Actor.Property.SIZE_SCALE_POLICY, new Tizen.NUI.PropertyValue(valueToString));
+            }
+        }
 
-    public void Show()
-    {
-      SetVisible(true);
-    }
+        /// <summary>
+        ///  Gets/Sets the status of whether the width size is dependent on height size.
+        /// </summary>
+        public bool WidthDependentOnHeight
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.WIDTH_FOR_HEIGHT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.WIDTH_FOR_HEIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    public void Hide()
-    {
-      SetVisible(false);
-    }
+        /// <summary>
+        ///  Gets/Sets the status of whether the height size is dependent on width size.
+        /// </summary>
+        public bool HeightDependentOnWidth
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.HEIGHT_FOR_WIDTH).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.HEIGHT_FOR_WIDTH, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the padding for use in layout.
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+
+        /// <summary>
+        /// Gets/Sets the minimum size an actor can be assigned in size negotiation.
+        /// </summary>
+        public Size2D MinimumSize
+        {
+            get
+            {
+                Size2D temp = new Size2D(0, 0);
+                GetProperty(Actor.Property.MINIMUM_SIZE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+
+        /// <summary>
+        /// Gets/Sets the maximum size an actor can be assigned in size negotiation.
+        /// </summary>
+        public Size2D MaximumSize
+        {
+            get
+            {
+                Size2D temp = new Size2D(0, 0);
+                GetProperty(Actor.Property.MAXIMUM_SIZE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.MAXIMUM_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether a child actor inherits it's parent's position.
+        /// Default is to inherit. 
+        /// Switching this off means that using Position sets the actor's world position, i.e. translates from the world origin(0,0,0) to the anchor point of the actor.
+        /// </summary>
+        public bool InheritPosition
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Actor.Property.INHERIT_POSITION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Actor.Property.INHERIT_POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets clipping behavior(mode) of it's children 
+        /// </summary>
+        public ClippingModeType ClippingMode
+        {
+            get
+            {
+                string temp;
+                if (GetProperty(Actor.Property.CLIPPING_MODE).Get(out temp) == false)
+                {
+                    //Tizen.Log.Error("NUI", "ClippingMode get error!");
+                }
+                switch (temp)
+                {
+                    case "DISABLED":
+                    return ClippingModeType.Disabled;
+                    case "CLIP_CHILDREN":
+                    return ClippingModeType.ClipChildren;
+                    default:
+                    return ClippingModeType.Disabled;
+                }
+            }
+            set
+            {
+                SetProperty(Actor.Property.CLIPPING_MODE, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
 
-  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 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(Quaternion orientation) {
-    NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Quaternion.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(Quaternion relativeRotation) {
-    NDalicPINVOKE.Actor_RotateBy__SWIG_2(swigCPtr, Quaternion.getCPtr(relativeRotation));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion GetCurrentOrientation() {
-    Quaternion ret = new Quaternion(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 Quaternion GetCurrentWorldOrientation() {
-    Quaternion ret = new Quaternion(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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Quaternion Orientation
-  {
-    get
-    {
-      Quaternion temp = new Quaternion();
-      GetProperty( Actor.Property.ORIENTATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.ORIENTATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Quaternion WorldOrientation
-  {
-    get
-    {
-      Quaternion temp = new Quaternion();
-      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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 Color
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Actor.Property.COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Actor.Property.COLOR, new Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.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 Tizen.NUI.Property.Value( value ) );
     }
-  }
-  public Vector2 MaximumSize
-  {
-    get
+
+    /// <summary>
+    /// This specifies whether the Actor uses its own color, or inherits
+    /// ColorMode.UseOwnColor : Actor will use its own color
+    /// ColorMode.UseParentColor : Actor will use its parent color
+    /// ColorMode.UseOwnMultiplyParentColor : Actor will blend its color with its parents color.
+    /// ColorMode.UseOwnMultiplyParentAlpha : Actor will blend its alpha with its parents alpha. This means when parent fades in or out child does as well. This is the default.
+    /// </summary>
+    public enum ColorMode
     {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( Actor.Property.MAXIMUM_SIZE).Get(  temp );
-      return temp;
+        UseOwnColor,
+        UseParentColor,
+        UseOwnMultiplyParentColor,
+        UseOwnMultiplyParentAlpha
     }
-    set
+
+    /// <summary>
+    /// This specifies the dimesion of width or heigh for size negotiation.
+    /// </summary>
+    public enum DimensionType
     {
-      SetProperty( Actor.Property.MAXIMUM_SIZE, new Tizen.NUI.Property.Value( value ) );
+        Width = 0x1,
+        Height = 0x2,
+        AllDimensions = 0x3
     }
-  }
-  public bool InheritPosition
-  {
-    get
+
+    /// <summary>
+    /// This specifies draw mode types
+    /// </summary>
+    public enum DrawModeType
     {
-      bool temp = false;
-      GetProperty( Actor.Property.INHERIT_POSITION).Get( ref temp );
-      return temp;
+        Normal = 0,
+        Overlay2D = 1,
+        Stencil = 3
     }
-    set
+
+    /// <summary>
+    /// This specifies resize policy types
+    /// </summary>
+    public enum ResizePolicyType
     {
-      SetProperty( Actor.Property.INHERIT_POSITION, new Tizen.NUI.Property.Value( value ) );
+        Fixed,
+        UseNaturalSize,
+        FillToParent,
+        SizeRelativeToParent,
+        SizeFixedOffsetFromParent,
+        FitToChildren,
+        DimensionDependency,
+        UseAssignedSize
     }
-  }
-  public string ClippingMode
-  {
-    get
+
+    /// <summary>
+    /// This specifies size scale policy types
+    /// </summary>
+    public enum SizeScalePolicyType
     {
-      string temp;
-      GetProperty( Actor.Property.CLIPPING_MODE).Get( out temp );
-      return temp;
+        UseSizeSet,
+        FitWithAspectRatio,
+        FillWithAspectRatio
     }
-    set
+
+    /// <summary>
+    /// This specifies clipping mode types
+    /// </summary>
+    public enum ClippingModeType
     {
-      SetProperty( Actor.Property.CLIPPING_MODE, new Tizen.NUI.Property.Value( value ) );
+        Disabled,
+        ClipChildren
     }
-  }
-
-}
 
 }
index 8d76b2b..524a943 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+internal class ActorContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<Actor>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
index 202e2ce..d5091a3 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorHoverSignal : global::System.IDisposable {
+internal class ActorHoverSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index bc12edc..3720a95 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorSignal : global::System.IDisposable {
+internal class ActorSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index f54f11a..d3b6fb4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorTouchDataSignal : global::System.IDisposable {
+    internal class ActorTouchDataSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index a3de152..a8dad29 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ActorWheelSignal : global::System.IDisposable {
+    internal class ActorWheelSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
similarity index 59%
rename from src/Tizen.NUI/devel-src/CameraType.cs
rename to src/Tizen.NUI/devel-src/AlignType.cs
index 4c13687..c1537eb 100755 (executable)
@@ -8,11 +8,20 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public enum CameraType {
-  FREE_LOOK,
-  LOOK_AT_TARGET
-}
-
+/* moved to VisualMaps.cs 
+namespace Tizen.NUI
+{
+    public enum AlignType
+    {
+        TOP_BEGIN = 0,
+        TOP_CENTER,
+        TOP_END,
+        CENTER_BEGIN,
+        CENTER,
+        CENTER_END,
+        BOTTOM_BEGIN,
+        BOTTOM_CENTER,
+        BOTTOM_END
+    }
 }
+*/
\ No newline at end of file
index 5acc2cd..429b74f 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Alignment : View {
+internal class Alignment : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Alignment(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Alignment_SWIGUpcast(cPtr), cMemoryOwn) {
index 6e28620..4f7ff1c 100755 (executable)
-//------------------------------------------------------------------------------
-// <auto-generated />
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Alpha functions are used in animations to specify the rate of change of the animation parameter over time.
+    /// Understanding an animation as a parametric function over time, the alpha function is applied to the parameter of
+    /// the animation before computing the final animation value.
+    /// </summary>
+    public class AlphaFunction : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal AlphaFunction(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-namespace Tizen.NUI {
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(AlphaFunction obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-public class AlphaFunction : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+        ~AlphaFunction()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal AlphaFunction(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        /// <summary>
+        /// To make AlphaFunction instance be disposed.
+        /// </summary>
+        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_AlphaFunction(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(AlphaFunction obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// Constructor.
+        /// Creates an alpha function object with user defined alpha function.
+        /// </summary>
+        /// <param name="func">User defined fuction. It must be a method formatted as float alphafunction(float progress)</param>
+        public AlphaFunction(System.Delegate func) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(new SWIGTYPE_p_f_float__float(System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func), true))), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  ~AlphaFunction() {
-    DisposeQueue.Instance.Add(this);
-  }
+        /// <summary>
+        /// Default constructor.
+        /// Creates an alpha function object with the default built-in alpha function.
+        /// </summary>
+        public AlphaFunction() : this(NDalicPINVOKE.new_AlphaFunction__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Constructor.
+        /// Creates an alpha function object with the built-in alpha function passed as a parameter to the constructor.
+        /// </summary>
+        /// <param name="function">One of the built-in alpha functions</param>
+        public AlphaFunction(AlphaFunction.BuiltinFunctions function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_1((int)function), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_AlphaFunction(swigCPtr);
+        internal AlphaFunction(SWIGTYPE_p_f_float__float function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(function)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public AlphaFunction(System.Delegate func) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(new SWIGTYPE_p_f_float__float(System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func), true))), true)
-  {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AlphaFunction() : this(NDalicPINVOKE.new_AlphaFunction__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AlphaFunction(AlphaFunction.BuiltinFunction function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_1((int)function), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AlphaFunction(SWIGTYPE_p_f_float__float function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(function)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public AlphaFunction(Vector2 controlPoint0, Vector2 controlPoint1) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_3(Vector2.getCPtr(controlPoint0), Vector2.getCPtr(controlPoint1)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetBezierControlPoints() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.AlphaFunction_GetBezierControlPoints(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SWIGTYPE_p_f_float__float GetCustomFunction() {
-    global::System.IntPtr cPtr = NDalicPINVOKE.AlphaFunction_GetCustomFunction(swigCPtr);
-    SWIGTYPE_p_f_float__float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_float__float(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public AlphaFunction.BuiltinFunction GetBuiltinFunction() {
-    AlphaFunction.BuiltinFunction ret = (AlphaFunction.BuiltinFunction)NDalicPINVOKE.AlphaFunction_GetBuiltinFunction(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public AlphaFunction.Mode GetMode() {
-    AlphaFunction.Mode ret = (AlphaFunction.Mode)NDalicPINVOKE.AlphaFunction_GetMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum BuiltinFunction {
-    Default,
-    Linear,
-    Reverse,
-    EaseInSquare,
-    EaseOutSquare,
-    EaseIn,
-    EaseOut,
-    EaseInOut,
-    EaseInSine,
-    EaseOutSine,
-    EaseInOutSine,
-    Bounce,
-    Sin,
-    EaseOutBack,
-    Count
-  }
-
-  public enum Mode {
-    CustomFunction = 1,
-    Bezier
-  }
 
-}
+        /// <summary>
+        /// Constructor.
+        /// Creates a bezier alpha function.The bezier will have the first point at(0,0) and the end point at(1,1).
+        /// Note : The x components of the control points will be clamped to the range[0, 1] to prevent non monotonic curves.
+        /// </summary>
+        /// <param name="controlPoint0">A Vector2 which will be used as the first control point of the curve</param>
+        /// <param name="controlPoint1">A Vector2 which will be used as the second control point of the curve</param>
+        public AlphaFunction(Vector2 controlPoint0, Vector2 controlPoint1) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_3(Vector2.getCPtr(controlPoint0), Vector2.getCPtr(controlPoint1)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrives the control points of the alpha function.
+        /// </summary>
+        /// <param name="controlPoint0">A Vector2 which is used as the first control point of the curve</param>
+        /// <param name="controlPoint1">A Vector2 which is used as the second control point of the curve</param>
+        public void GetBezierControlPoints(out Vector2 controlPoint0, out Vector2 controlPoint1)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.AlphaFunction_GetBezierControlPoints(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+            controlPoint0 = new Vector2(ret.X, ret.Y);
+            controlPoint1 = new Vector2(ret.Z, ret.W);
+        }
+
+        internal SWIGTYPE_p_f_float__float GetCustomFunction()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.AlphaFunction_GetCustomFunction(swigCPtr);
+            SWIGTYPE_p_f_float__float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_float__float(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the built-in function used by the alpha function. 
+        /// In case no built-in function has been specified, it will return AlphaFunction::DEFAULT
+        /// </summary>
+        /// <returns>One of the built-in alpha functions.</returns>
+        public AlphaFunction.BuiltinFunctions GetBuiltinFunction()
+        {
+            AlphaFunction.BuiltinFunctions ret = (AlphaFunction.BuiltinFunctions)NDalicPINVOKE.AlphaFunction_GetBuiltinFunction(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        ///  Returns the functioning mode of the alpha function
+        /// </summary>
+        /// <returns>The functioning mode of the alpha function</returns>
+        public AlphaFunction.Modes GetMode()
+        {
+            AlphaFunction.Modes ret = (AlphaFunction.Modes)NDalicPINVOKE.AlphaFunction_GetMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// This specifies the various types of BuiltinFunctions
+        /// </summary>
+        public enum BuiltinFunctions
+        {
+            Default,
+            Linear,
+            Reverse,
+            EaseInSquare,
+            EaseOutSquare,
+            EaseIn,
+            EaseOut,
+            EaseInOut,
+            EaseInSine,
+            EaseOutSine,
+            EaseInOutSine,
+            Bounce,
+            Sin,
+            EaseOutBack,
+            Count
+        }
+
+        /// <summary>
+        /// This specifies which mode is set for AlphaFuction
+        /// </summary>
+        public enum Modes
+        {
+            CustomFunction = 1,
+            Bezier
+        }
+
+    }
 
 }
index a5c79cc..46138c6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AngleAxis : global::System.IDisposable {
+    internal class AngleAxis : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 186f190..765f824 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AngleThresholdPair : global::System.IDisposable {
+    internal class AngleThresholdPair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index c660895..7fbe27c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AnimatablePropertyComponentRegistration : global::System.IDisposable {
+    internal class AnimatablePropertyComponentRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 770d447..4e70249 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AnimatablePropertyRegistration : global::System.IDisposable {
+    internal class AnimatablePropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -46,11 +46,11 @@ public class AnimatablePropertyRegistration : global::System.IDisposable {
   }
 
 
-  public AnimatablePropertyRegistration(TypeRegistration registered, string name, int index, Property.Type type) : this(NDalicPINVOKE.new_AnimatablePropertyRegistration__SWIG_0(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
+  public AnimatablePropertyRegistration(TypeRegistration registered, string name, int index, PropertyType type) : this(NDalicPINVOKE.new_AnimatablePropertyRegistration__SWIG_0(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public AnimatablePropertyRegistration(TypeRegistration registered, string name, int index, Property.Value value) : this(NDalicPINVOKE.new_AnimatablePropertyRegistration__SWIG_1(TypeRegistration.getCPtr(registered), name, index, Property.Value.getCPtr(value)), true) {
+  public AnimatablePropertyRegistration(TypeRegistration registered, string name, int index, PropertyValue value) : this(NDalicPINVOKE.new_AnimatablePropertyRegistration__SWIG_1(TypeRegistration.getCPtr(registered), name, index, PropertyValue.getCPtr(value)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index af03167..29bfffd 100755 (executable)
-/** 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 />
+// 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
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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.
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Animation can be used to animate the properties of any number of objects, typically Actors.
+    /// If the "Finished" event is connected to a member function of an object, it must be disconnected before the object is destroyed.
+    /// This is typically done in the object destructor, and requires either the Animation handle to be stored.
+    /// The overall animation time is superseded by the values given in the Duration property used when calling the AnimateTo(), AnimateBy(), AnimateBetween() and AnimatePath() methods.
+    /// If any of the individual calls to those functions exceeds the overall animation time(Duration), then the overall animation time is automatically extended.
+    /// </summary>
+    public class Animation : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-namespace Tizen.NUI {
+        internal Animation(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Animation_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-using System;
-using System.Runtime.InteropServices;
+        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 class Animation : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        ~Animation()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal Animation(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Animation_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        /// <summary>
+        /// To make Animation instance be disposed.
+        /// </summary>
+        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();
+            }
+        }
 
-  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;
-  }
+        /// <summary>
+        /// Create an initialized Animation.
+        /// The animation will not loop.
+        /// The default end action is "Cancel".
+        /// The default Alpha function is linear.
+        /// Precodition : DurationmSeconds must be greater than zero.
+        /// </summary>
+        /// <param name="durationMilliSeconds">The duration in milli seconds (int).</param>
+        public Animation(int durationMilliSeconds) : this(NDalicPINVOKE.Animation_New((float)durationMilliSeconds / 1000.0f), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  ~Animation() {
-    DisposeQueue.Instance.Add(this);
-  }
+        private AnimationFinishedEventCallbackType _animationFinishedEventCallback;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void AnimationFinishedEventCallbackType(IntPtr data);
+        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
+            {
+                if (_animationFinishedEventHandler == null)
+                {
+                    _animationFinishedEventCallback = OnFinished;
+                    FinishedSignal().Connect(_animationFinishedEventCallback);
+                }
+
+                _animationFinishedEventHandler += value;
+            }
+            remove
+            {
+                _animationFinishedEventHandler -= value;
+
+                if (_animationFinishedEventHandler == null && _animationFinishedEventCallback != null)
+                {
+                    FinishedSignal().Disconnect(_animationFinishedEventCallback);
+                }
+            }
+        }
+        private void OnFinished(IntPtr data)
+        {
+            if (_animationFinishedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _animationFinishedEventHandler(this, null);
+            }
+        }
 
-  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);
+        internal static Animation GetAnimationFromPtr(global::System.IntPtr cPtr)
+        {
+            Animation ret = new Animation(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        private float MilliSecondsToSeconds(int millisec)
+        {
+            return (float)millisec / 1000.0f;
+        }
 
+        private int SecondsToMilliSeconds(float sec)
+        {
+            return (int)(sec * 1000);
+        }
 
 
-    private EventCallbackDelegateType1 _animationFinishedEventCallbackDelegate;
-    private event EventHandler _animationFinishedEventHandler;
+        /// <summary>
+        /// Gets/Sets the duration of animation
+        /// </summary>
+        public int Duration
+        {
+            set
+            {
+                SetDuration(MilliSecondsToSeconds(value));
+            }
+            get
+            {
+                return SecondsToMilliSeconds(GetDuration());
+            }
+        }
 
-    /**
-      * @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;
-        }
-      }
-    }
+        /// <summary>
+        ///  Gets/Sets the default alpha function for an animation.
+        /// </summary>
+        public AlphaFunction DefaultAlphaFunction
+        {
+            set
+            {
+                SetDefaultAlphaFunction(value);
+            }
+            get
+            {
+                AlphaFunction ret = GetDefaultAlphaFunction();
+                return ret;
+            }
+        }
 
-    // Callback for Animation FinishedSignal
-    private void OnFinished(IntPtr data)
-    {
-      if (_animationFinishedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _animationFinishedEventHandler(this, null);
-      }
-    }
+        /// <summary>
+        /// Queries the state of the animation.
+        /// </summary>
+        public States State
+        {
+            get
+            {
+                return GetState();
+            }
+        }
 
-  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() );
-    }
-  }
+        /// <summary>
+        /// Set : Enables looping for 'count' repeats. A zero is the same as Looping = true; i.e.repeat forever.
+        /// If Play() Stop() or 'count' loops is reached, the loop counter will reset.
+        /// Setting this parameter does not cause the animation to Play().
+        /// 
+        /// Get : Gets the loop count. A zero is the same as Looping = true; ie repeat forever. 
+        /// The loop count is initially 1 for play once.
+        /// </summary>
+        public int LoopCount
+        {
+            set
+            {
+                SetLoopCount(value);
+            }
+            get
+            {
+                int ret = GetLoopCount();
+                return ret;
+            }
+        }
 
-  public AlphaFunction DefaultAlphaFunction
-  {
-    set
-    {
-       SetDefaultAlphaFunction(value);
-    }
-    get
-    {
-       AlphaFunction ret = GetDefaultAlphaFunction();
-       return ret;
-    }
-  }
+        /// <summary>
+        /// Gets/Sets the status of whether the animation will loop.
+        /// This property resets the loop count and should not be used with LoopCount property.
+        /// Setting this parameter does not cause the animation to Play().
+        /// </summary>
+        public bool Looping
+        {
+            set
+            {
+                SetLooping(value);
+            }
+            get
+            {
+                bool ret = IsLooping();
+                return ret;
+            }
+        }
 
-  public Animation.State Status
-  {
-    get
-    {
-       return GetState();
-    }
-  }
 
-  public int LoopCount
-  {
-    set
-    {
-      SetLoopCount(value);
-    }
-    get
-    {
-      int ret = GetLoopCount();
-      return ret;
-    }
-  }
+        /// <summary>
+        /// Gets/Sets the end action of the animation.
+        /// This action is performed when the animation ends or if it is stopped.
+        /// Default end action is Cancel
+        /// </summary>
+        public EndActions EndAction
+        {
+            set
+            {
+                SetEndAction(value);
+            }
+            get
+            {
+                return GetEndAction();
+            }
+        }
 
-  public bool Looping
-  {
-    set
-    {
-      SetLooping(value);
-    }
-    get
-    {
-      bool ret = IsLooping();
-      return ret;
-    }
-  }
 
-  public Animation.EndActions EndAction
-  {
-    set
-    {
-      SetEndAction(value);
-    }
-    get
-    {
-      return GetEndAction();
-    }
-  }
+        /// <summary>
+        /// Stops the animation.
+        /// </summary>
+        /// <param name="action">end action can be set</param>
+        public void Stop(EndActions action = EndActions.Cancel)
+        {
+            SetEndAction(action);
+            NDalicPINVOKE.Animation_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public void Stop(Animation.EndActions action) 
-  {
-    SetEndAction(action);
-    NDalicPINVOKE.Animation_Stop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Gets the current loop count.
+        /// A value 0 to CurrentLoop indicating the current loop count when looping.
+        /// </summary>
+        public int CurrentLoop
+        {
+            get
+            {
+                return GetCurrentLoop();
+            }
+        }
 
-  public int StartTime { set; get; }
-  public int EndTime { set; get; }
-  public string TargetProperty { set; get; }
-  public object Destination { set; get; }
-  public Tizen.NUI.AlphaFunction AlphaFunction { set; get; }
+        /// <summary>
+        /// Gets/Sets the disconnect action.
+        /// If any of the animated property owners are disconnected from the stage while the animation is being played, then this action is performed.
+        /// Default action is to Cancel.
+        /// </summary>
+        public EndActions DisconnectAction
+        {
+            set
+            {
+                NDalicPINVOKE.Animation_SetDisconnectAction(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetDisconnectAction(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
 
 
-  public void AnimateBy(Actor target)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        /// <summary>
+        /// Gets/Sets the progress of the animation.
+        /// The animation will play(or continue playing) from this point.
+        /// The progress must be in the 0-1 interval or in the play range interval if defined
+        /// otherwise, it will be ignored.
+        /// </summary>
+        public float CurrentProgress
+        {
+            set
+            {
+                NDalicPINVOKE.Animation_SetCurrentProgress(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Animation_GetCurrentProgress(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
 
-    dynamic obj = (object)Destination;
+        /// <summary>
+        /// Gets/Sets Specifies a speed factor for the animation.
+        /// The speed factor is a multiplier of the normal velocity of the animation.
+        /// Values between[0, 1] will slow down the animation and values above one will speed up the animation.
+        /// It is also possible to specify a negative multiplier to play the animation in reverse.
+        /// </summary>
+        public float SpeedFactor
+        {
+            set
+            {
+                NDalicPINVOKE.Animation_SetSpeedFactor(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Animation_GetSpeedFactor(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        /// <summary>
+        /// Gets/Sets the playing range.
+        /// Animation will play between the values specified. Both values(range.x and range.y ) should be between 0-1,
+        /// otherwise they will be ignored.If the range provided is not in proper order(minimum, maximum ), it will be reordered.
+        /// </summary>
+        public Vector2 PlayRange
+        {
+            set
+            {
+                NDalicPINVOKE.Animation_SetPlayRange(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Vector2 ret = new Vector2(NDalicPINVOKE.Animation_GetPlayRange(swigCPtr), true);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
 
-  public void AnimateBy(Actor target, string propertyIndex)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        /// <summary>
+        /// Animates a property value by a relative amount.
+        /// The default alpha function will be used.
+        /// The effect will start & end when the animation begins & ends.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="relativeValue">The property value will change by this amount</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimateBy(Actor target, string property, object relativeValue, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            dynamic obj = (object)relativeValue;
+
+            if (alphaFunction != null)
+            {
+                AnimateBy(_prop, new PropertyValue(obj), alphaFunction);
+            }
+            else
+            {
+                AnimateBy(_prop, new PropertyValue(obj));
+            }
+        }
 
-    dynamic obj = (object)Destination;
+        /// <summary>
+        /// Animates a property value by a relative amount.
+        /// The default alpha function will be used.
+        /// The effect will start & end when the animation begins & ends.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="relativeValue">The property value will change by this amount</param>
+        /// <param name="startTime">Start time of animation</param>
+        /// <param name="endTime">End time of animation</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimateBy(Actor target, string property, object relativeValue, int startTime, int endTime, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            dynamic obj = (object)relativeValue;
+
+            if (alphaFunction != null)
+            {
+                Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+                AnimateBy(_prop, new PropertyValue(obj), alphaFunction, time);
+            }
+            else
+            {
+                Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+                AnimateBy(_prop, new PropertyValue(obj), time);
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        /// <summary>
+        /// Animates a property to a destination value.
+        /// The default alpha function will be used.
+        /// The effect will start & end when the animation begins & ends.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="destinationValue">The destination value</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimateTo(Actor target, string property, object destinationValue, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            dynamic obj = (object)destinationValue;
+
+            if (alphaFunction != null)
+            {
+                AnimateTo(_prop, new PropertyValue(obj), alphaFunction);
+            }
+            else
+            {
+                AnimateTo(_prop, new PropertyValue(obj));
+            }
+        }
 
-  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;
+        /// <summary>
+        /// Animates a property to a destination value.
+        /// The default alpha function will be used.
+        /// The effect will start & end when the animation begins & ends.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="destinationValue">The destination value</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        /// <param name="startTime">Start time of animation</param>
+        /// <param name="endTime">End time of animation</param>
+        /// <param name="alphaFunction"></param>
+        public void AnimateTo(Actor target, string property, object destinationValue, int startTime, int endTime, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            dynamic obj = (object)destinationValue;
+
+            if (alphaFunction != null)
+            {
+                Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+                AnimateTo(_prop, new PropertyValue(obj), alphaFunction, time);
+            }
+            else
+            {
+                Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+                AnimateTo(_prop, new PropertyValue(obj), time);
+            }
+        }
 
-    dynamic obj = (object)relativeValue;
+        /// <summary>
+        /// Animates a property between keyframes.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="keyFrames">The set of time/value pairs between which to animate</param>
+        /// <param name="interpolation">The method used to interpolate between values</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            if (alphaFunction != null)
+            {
+                AnimateBetween(_prop, keyFrames, alphaFunction, interpolation);
+            }
+            else
+            {
+                AnimateBetween(_prop, keyFrames, interpolation);
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBy(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBy(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
 
-  public void AnimateTo(Actor target)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        /// <summary>
+        /// Animates a property between keyframes.
+        /// </summary>
+        /// <param name="target">The target object to animate</param>
+        /// <param name="property">The target property to animate</param>
+        /// <param name="keyFrames">The set of time/value pairs between which to animate</param>
+        /// <param name="startTime">Start time of animation</param>
+        /// <param name="endTime">End time of animation</param>
+        /// <param name="interpolation">The method used to interpolate between values</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimateBetween(Actor target, string property, KeyFrames keyFrames, int startTime, int endTime, Interpolation interpolation = Interpolation.Linear, AlphaFunction alphaFunction = null)
+        {
+            string _str1 = property.Substring(0, 1);
+            string _str2 = property.Substring(1);
+            string _str = _str1.ToLower() + _str2;
+
+            Property _prop = new Property(target, _str);
+            if (_prop.propertyIndex == Property.INVALID_INDEX)
+            {
+                throw new System.Exception("second argument string property is invalid parameter!");
+            }
+
+            Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+            if (alphaFunction != null)
+            {
+                AnimateBetween(_prop, keyFrames, alphaFunction, time, interpolation);
+            }
+            else
+            {
+                AnimateBetween(_prop, keyFrames, time, interpolation);
+            }
+        }
 
-    dynamic obj = (object)Destination;
+        /// <summary>
+        /// Animates an actor's position and orientation through a predefined path.
+        /// The actor will rotate to orient the supplied forward vector with the path's tangent. 
+        /// If forward is the zero vector then no rotation will happen.
+        /// </summary>
+        /// <param name="actor">The actor to animate</param>
+        /// <param name="path">It defines position and orientation</param>
+        /// <param name="forward">The vector (in local space coordinate system) that will be oriented with the path's tangent direction</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimatePath(Actor actor, Path path, Vector3 forward, AlphaFunction alphaFunction = null)
+        {
+            if (alphaFunction == null)
+            {
+                Animate(actor, path, forward);
+            }
+            else
+            {
+                Animate(actor, path, forward, alphaFunction);
+            }
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        /// <summary>
+        /// Animates an actor's position and orientation through a predefined path.
+        /// The actor will rotate to orient the supplied forward vector with the path's tangent. 
+        /// If forward is the zero vector then no rotation will happen.
+        /// </summary>
+        /// <param name="actor">The actor to animate</param>
+        /// <param name="path">It defines position and orientation</param>
+        /// <param name="forward">The vector (in local space coordinate system) that will be oriented with the path's tangent direction</param>
+        /// <param name="startTime">Start time of animation</param>
+        /// <param name="endTime">End time of animation</param>
+        /// <param name="alphaFunction">The alpha function to apply</param>
+        public void AnimatePath(Actor actor, Path path, Vector3 forward, int startTime, int endTime, AlphaFunction alphaFunction = null)
+        {
+            TimePeriod time = new TimePeriod(MilliSecondsToSeconds(startTime), MilliSecondsToSeconds(endTime - startTime));
+            if (alphaFunction == null)
+            {
+                Animate(actor, path, forward, time);
+            }
+            else
+            {
+                Animate(actor, path, forward, alphaFunction, time);
+            }
+        }
 
-  public void AnimateTo(Actor target, string propertyIndex)
-  {
-    string _str1 = propertyIndex.Substring(0, 1);
-    string _str2 = propertyIndex.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        /// <summary>
+        /// Creates an initialized Animation.
+        /// The animation will not loop.
+        /// The default end action is "Cancel".
+        /// The default alpha function is linear.
+        /// </summary>
+        public Animation() : this(NDalicPINVOKE.Animation_New(0.0f), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    dynamic obj = (object)Destination;
+        internal Animation(float durationSeconds) : this(NDalicPINVOKE.Animation_New(durationSeconds), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        }
 
-  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;
+        /// <summary>
+        /// Downcasts a handle to Animation handle.
+        /// If handle points to an Animation object, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to an Animation object or an uninitialized handle</returns>
+        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;
+        }
 
-    dynamic obj = (object)destinationValue;
+        internal Animation(Animation handle) : this(NDalicPINVOKE.new_Animation__SWIG_1(Animation.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateTo(new Property(target, _str), new Property.Value(obj), this.AlphaFunction );
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateTo(new Property(target, _str), new Property.Value(obj), time );
-      }
-    }
-  }
+        internal 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 AnimateBetween(Actor target, KeyFrames keyFrames)
-  {
-    string _str1 = TargetProperty.Substring(0, 1);
-    string _str2 = TargetProperty.Substring(1);
-    string _str = _str1.ToLower() + _str2;
+        internal void SetDuration(float seconds)
+        {
+            NDalicPINVOKE.Animation_SetDuration(swigCPtr, seconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
+        internal float GetDuration()
+        {
+            float ret = NDalicPINVOKE.Animation_GetDuration(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction);
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.TimePeriod( MilliSecondsToSeconds( this.StartTime ), MilliSecondsToSeconds( this.EndTime - this.StartTime ) );
-        AnimateBetween(new Property(target, _str), keyFrames, time);
-      }
-    }
-  }
+        internal void SetLooping(bool looping)
+        {
+            NDalicPINVOKE.Animation_SetLooping(swigCPtr, looping);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  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;
+        internal void SetLoopCount(int count)
+        {
+            NDalicPINVOKE.Animation_SetLoopCount(swigCPtr, count);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
+        internal int GetLoopCount()
+        {
+            int ret = NDalicPINVOKE.Animation_GetLoopCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    if( this.AlphaFunction != null )
-    {
-      if( this.StartTime == 0 && this.EndTime == 0 )
-      {
-        AnimateBetween(new Property(target, _str), keyFrames, this.AlphaFunction, interpolation);
-      }
-      else
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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
-      {
-        Tizen.NUI.TimePeriod time = new Tizen.NUI.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.
-   * The default end action is "Bake".
-   * The default Alpha function is linear.
-   * @since 1.0.0
-   * @param [in] durationmSeconds The duration in milli seconds (int).
-   * @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
-  }
+        internal int GetCurrentLoop()
+        {
+            int ret = NDalicPINVOKE.Animation_GetCurrentLoop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        internal bool IsLooping()
+        {
+            bool ret = NDalicPINVOKE.Animation_IsLooping(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetEndAction(Animation.EndActions action)
+        {
+            NDalicPINVOKE.Animation_SetEndAction(swigCPtr, (int)action);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Animation.EndActions GetEndAction()
+        {
+            Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetDisconnectAction(Animation.EndActions disconnectAction)
+        {
+            NDalicPINVOKE.Animation_SetDisconnectAction(swigCPtr, (int)disconnectAction);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Animation.EndActions GetDisconnectAction()
+        {
+            Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetDisconnectAction(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetDefaultAlphaFunction(AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_SetDefaultAlphaFunction(swigCPtr, AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal AlphaFunction GetDefaultAlphaFunction()
+        {
+            AlphaFunction ret = new AlphaFunction(NDalicPINVOKE.Animation_GetDefaultAlphaFunction(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetCurrentProgress(float progress)
+        {
+            NDalicPINVOKE.Animation_SetCurrentProgress(swigCPtr, progress);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetCurrentProgress()
+        {
+            float ret = NDalicPINVOKE.Animation_GetCurrentProgress(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetSpeedFactor(float factor)
+        {
+            NDalicPINVOKE.Animation_SetSpeedFactor(swigCPtr, factor);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetSpeedFactor()
+        {
+            float ret = NDalicPINVOKE.Animation_GetSpeedFactor(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetPlayRange(Vector2 range)
+        {
+            NDalicPINVOKE.Animation_SetPlayRange(swigCPtr, Vector2.getCPtr(range));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector2 GetPlayRange()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Animation_GetPlayRange(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Play the animation.
+        /// </summary>
+        public void Play()
+        {
+            NDalicPINVOKE.Animation_Play(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Plays the animation from a given point.
+        /// The progress must be in the 0-1 interval or in the play range interval if defined 
+        /// otherwise, it will be ignored.
+        /// </summary>
+        /// <param name="progress">A value between [0,1], or between the play range if specified, from where the animation should start playing</param>
+        public void PlayFrom(float progress)
+        {
+            NDalicPINVOKE.Animation_PlayFrom(swigCPtr, progress);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Pauses the animation.
+        /// </summary>
+        public void Pause()
+        {
+            NDalicPINVOKE.Animation_Pause(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Animation.States GetState()
+        {
+            Animation.States ret = (Animation.States)NDalicPINVOKE.Animation_GetState(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Stops the animation.
+        /// </summary>
+        public void Stop()
+        {
+            NDalicPINVOKE.Animation_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Clears the animation.
+        /// This disconnects any objects that were being animated, effectively stopping the animation.
+        /// </summary>
+        public void Clear()
+        {
+            NDalicPINVOKE.Animation_Clear(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal AnimationSignal FinishedSignal()
+        {
+            AnimationSignal ret = new AnimationSignal(NDalicPINVOKE.Animation_FinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void AnimateBy(Property target, PropertyValue relativeValue)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_0(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateBy(Property target, PropertyValue relativeValue, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_1(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateBy(Property target, PropertyValue relativeValue, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_2(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateBy(Property target, PropertyValue relativeValue, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateBy__SWIG_3(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(relativeValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateTo(Property target, PropertyValue destinationValue)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_0(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateTo(Property target, PropertyValue destinationValue, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_1(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateTo(Property target, PropertyValue destinationValue, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_2(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AnimateTo(Property target, PropertyValue destinationValue, AlphaFunction alpha, TimePeriod period)
+        {
+            NDalicPINVOKE.Animation_AnimateTo__SWIG_3(swigCPtr, Property.getCPtr(target), PropertyValue.getCPtr(destinationValue), AlphaFunction.getCPtr(alpha), TimePeriod.getCPtr(period));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal 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();
+        }
+
+        internal void Show(Actor actor, float delaySeconds)
+        {
+            NDalicPINVOKE.Animation_Show(swigCPtr, Actor.getCPtr(actor), delaySeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void Hide(Actor actor, float delaySeconds)
+        {
+            NDalicPINVOKE.Animation_Hide(swigCPtr, Actor.getCPtr(actor), delaySeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Enumeration for what to do when the animation ends, is stopped, or is destroyed.
+        /// Cancel : When the animation ends, the animated property values are saved.
+        /// Discard : When the animation ends, the animated property values are forgotten.
+        /// StopFinal : If the animation is stopped, the animated property values are saved as if the animation had run to completion, otherwise behaves like Cancel.
+        /// </summary>
+        public enum EndActions
+        {
+            Cancel,
+            Discard,
+            StopFinal
+        }
+
+        /// <summary>
+        /// Enumeration for what interpolation method to use on key-frame animations.
+        /// Linear : Values in between key frames are interpolated using a linear polynomial. (Default)
+        /// Cubic : Values in between key frames are interpolated using a cubic polynomial.
+        /// </summary>
+        public enum Interpolation
+        {
+            Linear,
+            Cubic
+        }
+
+        /// <summary>
+        /// Enumeration for what state the animation is in.
+        /// Note: Calling Reset() on this class will NOT reset the animation. It will call BaseHandle.Reset() which drops the object handle.
+        /// </summary>
+        public enum States
+        {
+            Stopped,
+            Playing,
+            Paused
+        }
+
+    }
 
 }
index 52f3ed0..10b205b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class AnimationSignal : global::System.IDisposable {
+    internal class AnimationSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index fe00c2b..11e0c2c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Any : global::System.IDisposable {
+    internal class Any : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 6bc3014..57d18be 100755 (executable)
@@ -8,7 +8,8 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
     using System;
     using System.Runtime.InteropServices;
@@ -19,23 +20,23 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationInitEventArgs : EventArgs
     {
-    private Application _application;
+        private Application _application;
 
-      /**
-        * @brief Application - is the application that is being initialized
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        /**
+          * @brief Application - is the application that is being initialized
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -44,22 +45,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationTerminateEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Terminated
-        *
-        */
-    public Application Application
-      {
-        get
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being Terminated
+          *
+          */
+        public Application Application
         {
-          return _application;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -68,22 +69,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationPauseEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Paused
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being Paused
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -92,22 +93,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationResumeEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Resumed
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being Resumed
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -116,22 +117,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationResetEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Reset
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being Reset
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -140,22 +141,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationResizeEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being Resized
-        *
-        */
-    public Application Application
-      {
-        get
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being Resized
+          *
+          */
+        public Application Application
         {
-          return _application;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -164,22 +165,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationLanguageChangedEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected with Device's language change
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being affected with Device's language change
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -188,22 +189,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationRegionChangedEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected with Device's region change
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being affected with Device's region change
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -212,22 +213,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationBatteryLowEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected when the battery level of the device is low
-        *
-        */
-    public Application Application
-      {
-        get
-        {
-          return _application;
-        }
-        set
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being affected when the battery level of the device is low
+          *
+          */
+        public Application Application
         {
-          _application = value;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-      }
     }
 
     /**
@@ -236,22 +237,22 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationMemoryLowEventArgs : EventArgs
     {
-    private Application _application;
-      /**
-        * @brief Application - is the application that is being affected when the memory level of the device is low
-        *
-        */
-    public Application Application
-      {
-        get
+        private Application _application;
+        /**
+          * @brief Application - is the application that is being affected when the memory level of the device is low
+          *
+          */
+        public Application Application
         {
-          return _application;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-        set
-        {
-          _application = value;
-        }
-      }
     }
 
     /**
@@ -260,988 +261,1049 @@ namespace Tizen.NUI {
       */
     public class NUIApplicationAppControlEventArgs : EventArgs
     {
-    private Application _application;
-    private IntPtr _voidp;
-      /**
-        * @brief Application - is the application that is receiving the launch request from another application
-        *
-        */
-    public Application Application
-      {
-        get
+        private Application _application;
+        private IntPtr _voidp;
+        /**
+          * @brief Application - is the application that is receiving the launch request from another application
+          *
+          */
+        public Application Application
         {
-          return _application;
+            get
+            {
+                return _application;
+            }
+            set
+            {
+                _application = value;
+            }
         }
-        set
+        /**
+          * @brief VoidP - contains the information about why the application is launched
+          *
+          */
+        public IntPtr VoidP
         {
-          _application = value;
+            get
+            {
+                return _voidp;
+            }
+            set
+            {
+                _voidp = value;
+            }
         }
-      }
-      /**
-        * @brief VoidP - contains the information about why the application is launched
-        *
-        */
-    public IntPtr VoidP
-      {
-        get
+    }
+
+    public class Application : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Application(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Application_SWIGUpcast(cPtr), cMemoryOwn)
         {
-          return _voidp;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
         }
-        set
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Application obj)
         {
-          _voidp = value;
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
-      }
-    }
-
-public class Application : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal Application(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Application_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Application obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~Application()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~Application() {
-    DisposeQueue.Instance.Add(this);
-  }
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Application(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        private static void LOG(string str)
+        {
+            //Tizen.Log.Debug("NUI", str);
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Application(swigCPtr);
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationInitEventArgs> _applicationInitEventHandler;
+        private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate;
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;
+        private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationPauseEventArgs> _applicationPauseEventHandler;
+        private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationResumeEventArgs> _applicationResumeEventHandler;
+        private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationResetEventArgs> _applicationResetEventHandler;
+        private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationResizeEventArgs> _applicationResizeEventHandler;
+        private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> _applicationLanguageChangedEventHandler;
+        private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate;
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> _applicationRegionChangedEventHandler;
+        private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationBatteryLowEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> _applicationBatteryLowEventHandler;
+        private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationMemoryLowEventCallbackDelegate(IntPtr application);
+        private DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> _applicationMemoryLowEventHandler;
+        private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp);
+        private DaliEventHandler<object, NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;
+        private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;
+
+        /**
+          * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)
+          *  provided by the user. Initialized signal is emitted when application is initialised
+          */
+        public event DaliEventHandler<object, NUIApplicationInitEventArgs> Initialized
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationInitEventHandler == null)
+                    {
+                        _applicationInitEventHandler += value;
+
+                        _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);
+                        this.InitSignal().Connect(_applicationInitEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationInitEventHandler != null)
+                    {
+                        this.InitSignal().Disconnect(_applicationInitEventCallbackDelegate);
+                    }
+
+                    _applicationInitEventHandler -= value;
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        // Callback for Application InitSignal
+        private void OnApplicationInit(IntPtr data)
+        {
+            NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationInitEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationInitEventArgs> _applicationInitEventHandler;
-    private NUIApplicationInitEventCallbackDelegate _applicationInitEventCallbackDelegate;
+            // Populate all members of "e" (NUIApplicationInitEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
+            if (_applicationInitEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationInitEventHandler(this, e);
+            }
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationTerminateEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationTerminateEventArgs> _applicationTerminateEventHandler;
-    private NUIApplicationTerminateEventCallbackDelegate _applicationTerminateEventCallbackDelegate;
+        /**
+          * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
+          *  provided by the user. Terminated signal is emitted when application is terminated
+          */
+        public event DaliEventHandler<object, NUIApplicationTerminateEventArgs> Terminated
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationTerminateEventHandler == null)
+                    {
+                        _applicationTerminateEventHandler += value;
+
+                        _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);
+                        this.TerminateSignal().Connect(_applicationTerminateEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationTerminateEventHandler != null)
+                    {
+                        this.TerminateSignal().Disconnect(_applicationTerminateEventCallbackDelegate);
+                    }
+
+                    _applicationTerminateEventHandler -= value;
+                }
+            }
+        }
 
+        // Callback for Application TerminateSignal
+        private void OnNUIApplicationTerminate(IntPtr data)
+        {
+            NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationPauseEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationPauseEventArgs> _applicationPauseEventHandler;
-    private NUIApplicationPauseEventCallbackDelegate _applicationPauseEventCallbackDelegate;
+            // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResumeEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResumeEventArgs> _applicationResumeEventHandler;
-    private NUIApplicationResumeEventCallbackDelegate _applicationResumeEventCallbackDelegate;
+            if (_applicationTerminateEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationTerminateEventHandler(this, e);
+            }
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResetEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResetEventArgs> _applicationResetEventHandler;
-    private NUIApplicationResetEventCallbackDelegate _applicationResetEventCallbackDelegate;
+        /**
+          * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
+          * provided by the user. Paused signal is emitted when application is paused
+          */
+        public event DaliEventHandler<object, NUIApplicationPauseEventArgs> Paused
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationPauseEventHandler == null)
+                    {
+                        _applicationPauseEventHandler += value;
+
+                        _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);
+                        this.PauseSignal().Connect(_applicationPauseEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationPauseEventHandler != null)
+                    {
+                        this.PauseSignal().Disconnect(_applicationPauseEventCallbackDelegate);
+                    }
+
+                    _applicationPauseEventHandler -= value;
+                }
+            }
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationResizeEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationResizeEventArgs> _applicationResizeEventHandler;
-    private NUIApplicationResizeEventCallbackDelegate _applicationResizeEventCallbackDelegate;
+        // Callback for Application PauseSignal
+        private void OnNUIApplicationPause(IntPtr data)
+        {
+            NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationLanguageChangedEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs> _applicationLanguageChangedEventHandler;
-    private NUIApplicationLanguageChangedEventCallbackDelegate _applicationLanguageChangedEventCallbackDelegate;
+            // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
+            if (_applicationPauseEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationPauseEventHandler(this, e);
+            }
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationRegionChangedEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationRegionChangedEventArgs> _applicationRegionChangedEventHandler;
-    private NUIApplicationRegionChangedEventCallbackDelegate _applicationRegionChangedEventCallbackDelegate;
+        /**
+          * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
+          *  provided by the user. Resumed signal is emitted when application is resumed
+          */
+        public event DaliEventHandler<object, NUIApplicationResumeEventArgs> Resumed
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationResumeEventHandler == null)
+                    {
+                        _applicationResumeEventHandler += value;
+
+                        _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);
+                        this.ResumeSignal().Connect(_applicationResumeEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationResumeEventHandler != null)
+                    {
+                        this.ResumeSignal().Disconnect(_applicationResumeEventCallbackDelegate);
+                    }
+
+                    _applicationResumeEventHandler -= value;
+                }
+            }
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationBatteryLowEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationBatteryLowEventArgs> _applicationBatteryLowEventHandler;
-    private NUIApplicationBatteryLowEventCallbackDelegate _applicationBatteryLowEventCallbackDelegate;
+        // Callback for Application ResumeSignal
+        private void OnNUIApplicationResume(IntPtr data)
+        {
+            NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationMemoryLowEventCallbackDelegate(IntPtr application);
-    private DaliEventHandler<object,NUIApplicationMemoryLowEventArgs> _applicationMemoryLowEventHandler;
-    private NUIApplicationMemoryLowEventCallbackDelegate _applicationMemoryLowEventCallbackDelegate;
+            // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    private delegate void NUIApplicationAppControlEventCallbackDelegate(IntPtr application, IntPtr voidp);
-    private DaliEventHandler<object,NUIApplicationAppControlEventArgs> _applicationAppControlEventHandler;
-    private NUIApplicationAppControlEventCallbackDelegate _applicationAppControlEventCallbackDelegate;
+            if (_applicationResumeEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationResumeEventHandler(this, e);
+            }
+        }
 
-    /**
-      * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationInitEventHandler - DaliEventHandler<object,NUIApplicationInitEventArgs>)
-      *  provided by the user. Initialized signal is emitted when application is initialised
-      */
-    public event DaliEventHandler<object,NUIApplicationInitEventArgs> Initialized
-    {
-      add
-      {
-        lock(this)
+        /**
+          * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)
+          *  provided by the user. Reset signal is emitted when application is reset
+          */
+        public event DaliEventHandler<object, NUIApplicationResetEventArgs> Reset
         {
-          // Restricted to only one listener
-          if (_applicationInitEventHandler == null)
-          {
-            _applicationInitEventHandler += value;
-
-            _applicationInitEventCallbackDelegate = new NUIApplicationInitEventCallbackDelegate(OnApplicationInit);
-            this.InitSignal().Connect(_applicationInitEventCallbackDelegate);
-          }
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationResetEventHandler == null)
+                    {
+                        _applicationResetEventHandler += value;
+
+                        _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);
+                        this.ResetSignal().Connect(_applicationResetEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationResetEventHandler != null)
+                    {
+                        this.ResetSignal().Disconnect(_applicationResetEventCallbackDelegate);
+                    }
+
+                    _applicationResetEventHandler -= value;
+                }
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        // Callback for Application ResetSignal
+        private void OnNUIApplicationReset(IntPtr data)
         {
-          if (_applicationInitEventHandler != null)
-          {
-            this.InitSignal().Disconnect(_applicationInitEventCallbackDelegate);
-          }
-
-          _applicationInitEventHandler -= value;
-        }
-      }
-    }
+            NUIApplicationResetEventArgs e = new NUIApplicationResetEventArgs();
 
-    // Callback for Application InitSignal
-    private void OnApplicationInit(IntPtr data)
-    {
-      NUIApplicationInitEventArgs e = new NUIApplicationInitEventArgs();
+            // Populate all members of "e" (NUIApplicationResetEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-      // Populate all members of "e" (NUIApplicationInitEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+            if (_applicationResetEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationResetEventHandler(this, e);
+            }
+        }
 
-      if (_applicationInitEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationInitEventHandler(this, e);
-      }
-    }
+        /**
+          * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
+          *  provided by the user. Resized signal is emitted when application is resized
+          */
+        public event DaliEventHandler<object, NUIApplicationResizeEventArgs> Resized
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationResizeEventHandler == null)
+                    {
+                        _applicationResizeEventHandler += value;
+
+                        _applicationResizeEventCallbackDelegate = new NUIApplicationResizeEventCallbackDelegate(OnNUIApplicationResize);
+                        this.ResizeSignal().Connect(_applicationResizeEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationResizeEventHandler != null)
+                    {
+                        this.ResizeSignal().Disconnect(_applicationResizeEventCallbackDelegate);
+                    }
+
+                    _applicationResizeEventHandler -= value;
+                }
+            }
+        }
 
-    /**
-      * @brief Event for Terminated signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationTerminateEventHandler-DaliEventHandler<object,NUIApplicationTerminateEventArgs>)
-      *  provided by the user. Terminated signal is emitted when application is terminated
-      */
-    public event DaliEventHandler<object,NUIApplicationTerminateEventArgs> Terminated
-    {
-      add
-      {
-        lock(this)
+        // Callback for Application ResizeSignal
+        private void OnNUIApplicationResize(IntPtr data)
         {
-          // Restricted to only one listener
-          if (_applicationTerminateEventHandler == null)
-          {
-            _applicationTerminateEventHandler += value;
+            NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();
 
-            _applicationTerminateEventCallbackDelegate = new NUIApplicationTerminateEventCallbackDelegate(OnNUIApplicationTerminate);
-            this.TerminateSignal().Connect(_applicationTerminateEventCallbackDelegate);
-          }
+            // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
+
+            if (_applicationResizeEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationResizeEventHandler(this, e);
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        /**
+          * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)
+          *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.
+          */
+        public event DaliEventHandler<object, NUIApplicationLanguageChangedEventArgs> LanguageChanged
         {
-          if (_applicationTerminateEventHandler != null)
-          {
-            this.TerminateSignal().Disconnect(_applicationTerminateEventCallbackDelegate);
-          }
-
-          _applicationTerminateEventHandler -= value;
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationLanguageChangedEventHandler == null)
+                    {
+                        _applicationLanguageChangedEventHandler += value;
+
+                        _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);
+                        this.LanguageChangedSignal().Connect(_applicationLanguageChangedEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationLanguageChangedEventHandler != null)
+                    {
+                        this.LanguageChangedSignal().Disconnect(_applicationLanguageChangedEventCallbackDelegate);
+                    }
+
+                    _applicationLanguageChangedEventHandler -= value;
+                }
+            }
         }
-      }
-    }
 
-    // Callback for Application TerminateSignal
-    private void OnNUIApplicationTerminate(IntPtr data)
-    {
-      NUIApplicationTerminateEventArgs e = new NUIApplicationTerminateEventArgs();
+        // Callback for Application LanguageChangedSignal
+        private void OnNUIApplicationLanguageChanged(IntPtr data)
+        {
+            NUIApplicationLanguageChangedEventArgs e = new NUIApplicationLanguageChangedEventArgs();
 
-      // Populate all members of "e" (NUIApplicationTerminateEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+            // Populate all members of "e" (NUIApplicationLanguageChangedEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-      if (_applicationTerminateEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationTerminateEventHandler(this, e);
-      }
-    }
+            if (_applicationLanguageChangedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationLanguageChangedEventHandler(this, e);
+            }
+        }
 
-    /**
-      * @brief Event for Paused signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationPauseEventHandler-DaliEventHandler<object,NUIApplicationPauseEventArgs>)
-      * provided by the user. Paused signal is emitted when application is paused
-      */
-    public event DaliEventHandler<object,NUIApplicationPauseEventArgs> Paused
-    {
-      add
-      {
-        lock(this)
+        /**
+          * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)
+          *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.
+          */
+        public event DaliEventHandler<object, NUIApplicationRegionChangedEventArgs> RegionChanged
         {
-          // Restricted to only one listener
-          if (_applicationPauseEventHandler == null)
-          {
-            _applicationPauseEventHandler += value;
-
-            _applicationPauseEventCallbackDelegate = new NUIApplicationPauseEventCallbackDelegate(OnNUIApplicationPause);
-            this.PauseSignal().Connect(_applicationPauseEventCallbackDelegate);
-          }
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationRegionChangedEventHandler == null)
+                    {
+                        _applicationRegionChangedEventHandler += value;
+
+                        _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);
+                        this.RegionChangedSignal().Connect(_applicationRegionChangedEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationRegionChangedEventHandler != null)
+                    {
+                        this.RegionChangedSignal().Disconnect(_applicationRegionChangedEventCallbackDelegate);
+                    }
+
+                    _applicationRegionChangedEventHandler -= value;
+                }
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        // Callback for Application RegionChangedSignal
+        private void OnNUIApplicationRegionChanged(IntPtr data)
         {
-          if (_applicationPauseEventHandler != null)
-          {
-            this.PauseSignal().Disconnect(_applicationPauseEventCallbackDelegate);
-          }
-
-          _applicationPauseEventHandler -= value;
-        }
-      }
-    }
+            NUIApplicationRegionChangedEventArgs e = new NUIApplicationRegionChangedEventArgs();
 
-    // Callback for Application PauseSignal
-    private void OnNUIApplicationPause(IntPtr data)
-    {
-      NUIApplicationPauseEventArgs e = new NUIApplicationPauseEventArgs();
+            // Populate all members of "e" (NUIApplicationRegionChangedEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-      // Populate all members of "e" (NUIApplicationPauseEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+            if (_applicationRegionChangedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationRegionChangedEventHandler(this, e);
+            }
+        }
 
-      if (_applicationPauseEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationPauseEventHandler(this, e);
-      }
-    }
+        /**
+          * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
+          * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
+          */
+        public event DaliEventHandler<object, NUIApplicationBatteryLowEventArgs> BatteryLow
+        {
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationBatteryLowEventHandler == null)
+                    {
+                        _applicationBatteryLowEventHandler += value;
+
+                        _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);
+                        this.BatteryLowSignal().Connect(_applicationBatteryLowEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationBatteryLowEventHandler != null)
+                    {
+                        this.BatteryLowSignal().Disconnect(_applicationBatteryLowEventCallbackDelegate);
+                    }
+
+                    _applicationBatteryLowEventHandler -= value;
+                }
+            }
+        }
 
-    /**
-      * @brief Event for Resumed signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResumeEventHandler-DaliEventHandler<object,NUIApplicationResumeEventArgs>)
-      *  provided by the user. Resumed signal is emitted when application is resumed
-      */
-    public event DaliEventHandler<object,NUIApplicationResumeEventArgs> Resumed
-    {
-      add
-      {
-        lock(this)
+        // Callback for Application BatteryLowSignal
+        private void OnNUIApplicationBatteryLow(IntPtr data)
         {
-          // Restricted to only one listener
-          if (_applicationResumeEventHandler == null)
-          {
-            _applicationResumeEventHandler += value;
+            NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
 
-            _applicationResumeEventCallbackDelegate = new NUIApplicationResumeEventCallbackDelegate(OnNUIApplicationResume);
-            this.ResumeSignal().Connect(_applicationResumeEventCallbackDelegate);
-          }
+            // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
+
+            if (_applicationBatteryLowEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationBatteryLowEventHandler(this, e);
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        /**
+          * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)
+          *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.
+          */
+        public event DaliEventHandler<object, NUIApplicationMemoryLowEventArgs> MemoryLow
         {
-          if (_applicationResumeEventHandler != null)
-          {
-            this.ResumeSignal().Disconnect(_applicationResumeEventCallbackDelegate);
-          }
-
-          _applicationResumeEventHandler -= value;
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationMemoryLowEventHandler == null)
+                    {
+                        _applicationMemoryLowEventHandler += value;
+
+                        _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);
+                        this.MemoryLowSignal().Connect(_applicationMemoryLowEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationMemoryLowEventHandler != null)
+                    {
+                        this.MemoryLowSignal().Disconnect(_applicationMemoryLowEventCallbackDelegate);
+                    }
+
+                    _applicationMemoryLowEventHandler -= value;
+                }
+            }
         }
-      }
-    }
 
-    // Callback for Application ResumeSignal
-    private void OnNUIApplicationResume(IntPtr data)
-    {
-      NUIApplicationResumeEventArgs e = new NUIApplicationResumeEventArgs();
+        // Callback for Application MemoryLowSignal
+        private void OnNUIApplicationMemoryLow(IntPtr data)
+        {
+            NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
 
-      // Populate all members of "e" (NUIApplicationResumeEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+            // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(data);
 
-      if (_applicationResumeEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResumeEventHandler(this, e);
-      }
-    }
+            if (_applicationMemoryLowEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationMemoryLowEventHandler(this, e);
+            }
+        }
 
-    /**
-      * @brief Event for Reset signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResetEventHandler-DaliEventHandler<object,NUIApplicationResetEventArgs>)
-      *  provided by the user. Reset signal is emitted when application is reset
-      */
-    public event DaliEventHandler<object,NUIApplicationResetEventArgs> Reset
-    {
-      add
-      {
-        lock(this)
+        /**
+          * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler
+          * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)
+          *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.
+          */
+        public event DaliEventHandler<object, NUIApplicationAppControlEventArgs> AppControl
         {
-          // Restricted to only one listener
-          if (_applicationResetEventHandler == null)
-          {
-            _applicationResetEventHandler += value;
-
-            _applicationResetEventCallbackDelegate = new NUIApplicationResetEventCallbackDelegate(OnNUIApplicationReset);
-            this.ResetSignal().Connect(_applicationResetEventCallbackDelegate);
-          }
+            add
+            {
+                lock (this)
+                {
+                    // Restricted to only one listener
+                    if (_applicationAppControlEventHandler == null)
+                    {
+                        _applicationAppControlEventHandler += value;
+
+                        _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);
+                        this.AppControlSignal().Connect(_applicationAppControlEventCallbackDelegate);
+                    }
+                }
+            }
+
+            remove
+            {
+                lock (this)
+                {
+                    if (_applicationAppControlEventHandler != null)
+                    {
+                        this.AppControlSignal().Disconnect(_applicationAppControlEventCallbackDelegate);
+                    }
+
+                    _applicationAppControlEventHandler -= value;
+                }
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        // Callback for Application AppControlSignal
+        private void OnNUIApplicationAppControl(IntPtr application, IntPtr voidp)
         {
-          if (_applicationResetEventHandler != null)
-          {
-            this.ResetSignal().Disconnect(_applicationResetEventCallbackDelegate);
-          }
+            NUIApplicationAppControlEventArgs e = new NUIApplicationAppControlEventArgs();
+
+            // Populate all members of "e" (NUIApplicationAppControlEventArgs) with real data
+            e.Application = Application.GetApplicationFromPtr(application);
+            e.VoidP = voidp;
 
-          _applicationResetEventHandler -= value;
+            if (_applicationAppControlEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _applicationAppControlEventHandler(this, e);
+            }
         }
-      }
-    }
 
-    // Callback for Application ResetSignal
-    private void OnNUIApplicationReset(IntPtr data)
-    {
-      NUIApplicationResetEventArgs e = new NUIApplicationResetEventArgs();
+        private static Application _instance; // singleton
 
-      // Populate all members of "e" (NUIApplicationResetEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+        public delegate void InitDelegate();
 
-      if (_applicationResetEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResetEventHandler(this, e);
-      }
-    }
+        public delegate void TerminateDelegate();
 
-    /**
-      * @brief Event for Resized signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationResizeEventHandler-DaliEventHandler<object,NUIApplicationResizeEventArgs>)
-      *  provided by the user. Resized signal is emitted when application is resized
-      */
-    public event DaliEventHandler<object,NUIApplicationResizeEventArgs> Resized
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationResizeEventHandler == null)
-          {
-            _applicationResizeEventHandler += value;
+        public delegate void PauseDelegate();
 
-            _applicationResizeEventCallbackDelegate = new NUIApplicationResizeEventCallbackDelegate(OnNUIApplicationResize);
-            this.ResizeSignal().Connect(_applicationResizeEventCallbackDelegate);
-          }
-        }
-      }
+        public delegate void ResumeDelegate();
 
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationResizeEventHandler != null)
-          {
-            this.ResizeSignal().Disconnect(_applicationResizeEventCallbackDelegate);
-          }
+        public delegate void ResizeDelegate();
 
-          _applicationResizeEventHandler -= value;
-        }
-      }
-    }
+        public delegate void AppControlDelegate();
 
-    // Callback for Application ResizeSignal
-    private void OnNUIApplicationResize(IntPtr data)
-    {
-      NUIApplicationResizeEventArgs e = new NUIApplicationResizeEventArgs();
+        public delegate void LanguageChangedDelegate();
 
-      // Populate all members of "e" (NUIApplicationResizeEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+        public delegate void RegionChangedDelegate();
 
-      if (_applicationResizeEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationResizeEventHandler(this, e);
-      }
-    }
+        public delegate void BatteryLowDelegate();
 
-    /**
-      * @brief Event for LanguageChanged signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationLanguageChangedEventHandler-DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs>)
-      *  provided by the user. LanguageChanged signal is emitted when the region of the device is changed.
-      */
-    public event DaliEventHandler<object,NUIApplicationLanguageChangedEventArgs> LanguageChanged
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationLanguageChangedEventHandler == null)
-          {
-            _applicationLanguageChangedEventHandler += value;
+        public delegate void MemoryLowDelegate();
 
-            _applicationLanguageChangedEventCallbackDelegate = new NUIApplicationLanguageChangedEventCallbackDelegate(OnNUIApplicationLanguageChanged);
-            this.LanguageChangedSignal().Connect(_applicationLanguageChangedEventCallbackDelegate);
-          }
-        }
-      }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void InitDelegateInternal();
 
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationLanguageChangedEventHandler != null)
-          {
-            this.LanguageChangedSignal().Disconnect(_applicationLanguageChangedEventCallbackDelegate);
-          }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void TerminateDelegateInternal();
 
-          _applicationLanguageChangedEventHandler -= value;
-        }
-      }
-    }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void PauseDelegateInternal();
 
-    // Callback for Application LanguageChangedSignal
-    private void OnNUIApplicationLanguageChanged(IntPtr data)
-    {
-      NUIApplicationLanguageChangedEventArgs e = new NUIApplicationLanguageChangedEventArgs();
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void ResumeDelegateInternal();
 
-      // Populate all members of "e" (NUIApplicationLanguageChangedEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void ResizeDelegateInternal();
 
-      if (_applicationLanguageChangedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationLanguageChangedEventHandler(this, e);
-      }
-    }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void AppControlDelegateInternal();
 
-    /**
-      * @brief Event for RegionChanged signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationRegionChangedEventHandler-DaliEventHandler<object,NUIApplicationRegionChangedEventArgs>)
-      *  provided by the user. RegionChanged signal is emitted when the region of the device is changed.
-      */
-    public event DaliEventHandler<object,NUIApplicationRegionChangedEventArgs> RegionChanged
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationRegionChangedEventHandler == null)
-          {
-            _applicationRegionChangedEventHandler += value;
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void LanguageChangedDelegateInternal();
 
-            _applicationRegionChangedEventCallbackDelegate = new NUIApplicationRegionChangedEventCallbackDelegate(OnNUIApplicationRegionChanged);
-            this.RegionChangedSignal().Connect(_applicationRegionChangedEventCallbackDelegate);
-          }
-        }
-      }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void RegionChangedDelegateInternal();
 
-      remove
-      {
-        lock(this)
-        {
-          if (_applicationRegionChangedEventHandler != null)
-          {
-            this.RegionChangedSignal().Disconnect(_applicationRegionChangedEventCallbackDelegate);
-          }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void BatteryLowDelegateInternal();
 
-          _applicationRegionChangedEventHandler -= value;
-        }
-      }
-    }
+        [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
+        internal delegate void MemoryLowDelegateInternal();
 
-    // Callback for Application RegionChangedSignal
-    private void OnNUIApplicationRegionChanged(IntPtr data)
-    {
-      NUIApplicationRegionChangedEventArgs e = new NUIApplicationRegionChangedEventArgs();
+        static void Initialize()
+        {
+            // instance.InitDelegate();
+        }
 
-      // Populate all members of "e" (NUIApplicationRegionChangedEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+        public static Application Instance
+        {
+            get
+            {
+                return _instance;
+            }
+        }
 
-      if (_applicationRegionChangedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationRegionChangedEventHandler(this, e);
-      }
-    }
+        public static Application GetApplicationFromPtr(global::System.IntPtr cPtr)
+        {
+            Application ret = new Application(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    /**
-      * @brief Event for BatteryLow signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationBatteryLowEventHandler-DaliEventHandler<object,NUIApplicationBatteryLowEventArgs>) 
-      * provided by the user. BatteryLow signal is emitted when the battery level of the device is low.
-      */
-    public event DaliEventHandler<object,NUIApplicationBatteryLowEventArgs> BatteryLow
-    {
-      add
-      {
-        lock(this)
+        internal void SetupDelegates()
         {
-          // Restricted to only one listener
-          if (_applicationBatteryLowEventHandler == null)
-          {
-            _applicationBatteryLowEventHandler += value;
+            InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialize);
+            System.Console.WriteLine("InitSignal connection count");
 
-            _applicationBatteryLowEventCallbackDelegate = new NUIApplicationBatteryLowEventCallbackDelegate(OnNUIApplicationBatteryLow);
-            this.BatteryLowSignal().Connect(_applicationBatteryLowEventCallbackDelegate);
-          }
+            this.InitSignal().Connect(initializeCallback);
+            //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() );
         }
-      }
 
-      remove
-      {
-        lock(this)
+        public static Application NewApplication()
         {
-          if (_applicationBatteryLowEventHandler != null)
-          {
-            this.BatteryLowSignal().Disconnect(_applicationBatteryLowEventCallbackDelegate);
-          }
-
-          _applicationBatteryLowEventHandler -= value;
+            _instance = NewApplication("", Application.WindowMode.Opaque);
+            return _instance;
         }
-      }
-    }
 
-    // Callback for Application BatteryLowSignal
-    private void OnNUIApplicationBatteryLow(IntPtr data)
-    {
-      NUIApplicationBatteryLowEventArgs e = new NUIApplicationBatteryLowEventArgs();
+        public static Application NewApplication(string stylesheet)
+        {
+            _instance = NewApplication(stylesheet, Application.WindowMode.Opaque);
+            return _instance;
+        }
 
-      // Populate all members of "e" (NUIApplicationBatteryLowEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
+        public static Application NewApplication(string stylesheet, Application.WindowMode windowMode)
+        {
+            LOG(" NewApplication(string stylesheet, Application.WindowMode windowMode) is called! ");
 
-      if (_applicationBatteryLowEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationBatteryLowEventHandler(this, e);
-      }
-    }
+            // register all Views with the type registry, so that can be created / styled via JSON
+            ViewRegistryHelper.Initialize();
 
-    /**
-      * @brief Event for MemoryLow signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationMemoryLowEventHandler-DaliEventHandler<object,NUIApplicationMemoryLowEventArgs>)
-      *  provided by the user. MemoryLow signal is emitted when the memory level of the device is low.
-      */
-    public event DaliEventHandler<object,NUIApplicationMemoryLowEventArgs> MemoryLow
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_applicationMemoryLowEventHandler == null)
-          {
-            _applicationMemoryLowEventHandler += value;
+            Application ret = New(1, stylesheet, windowMode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-            _applicationMemoryLowEventCallbackDelegate = new NUIApplicationMemoryLowEventCallbackDelegate(OnNUIApplicationMemoryLow);
-            this.MemoryLowSignal().Connect(_applicationMemoryLowEventCallbackDelegate);
-          }
+            // we've got an application now connect the signals
+            ret.SetupDelegates();
+            // set the singleton
+            _instance = ret;
+            return ret;
         }
-      }
 
-      remove
-      {
-        lock(this)
+        public bool AddIdle(System.Delegate func)
         {
-          if (_applicationMemoryLowEventHandler != null)
-          {
-            this.MemoryLowSignal().Disconnect(_applicationMemoryLowEventCallbackDelegate);
-          }
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
+            System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));
 
-          _applicationMemoryLowEventHandler -= value;
-        }
-      }
-    }
+            bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));
 
-    // Callback for Application MemoryLowSignal
-    private void OnNUIApplicationMemoryLow(IntPtr data)
-    {
-      NUIApplicationMemoryLowEventArgs e = new NUIApplicationMemoryLowEventArgs();
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      // Populate all members of "e" (NUIApplicationMemoryLowEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(data);
 
-      if (_applicationMemoryLowEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationMemoryLowEventHandler(this, e);
-      }
-    }
 
-    /**
-      * @brief Event for AppControl signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of NUIApplicationAppControlEventHandler-DaliEventHandler<object,NUIApplicationAppControlEventArgs>)
-      *  provided by the user. AppControl signal is emitted when another application sends a launch request to the application.
-      */
-    public event DaliEventHandler<object,NUIApplicationAppControlEventArgs> AppControl
-    {
-      add
-      {
-        lock(this)
+        /**
+        * Outer::outer_method(int)
+        */
+        public static Application New()
         {
-          // Restricted to only one listener
-          if (_applicationAppControlEventHandler == null)
-          {
-            _applicationAppControlEventHandler += value;
+            LOG("New() is called!");
 
-            _applicationAppControlEventCallbackDelegate = new NUIApplicationAppControlEventCallbackDelegate(OnNUIApplicationAppControl);
-            this.AppControlSignal().Connect(_applicationAppControlEventCallbackDelegate);
-          }
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_0(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
 
-      remove
-      {
-        lock(this)
+        public static Application New(int argc)
         {
-          if (_applicationAppControlEventHandler != null)
-          {
-            this.AppControlSignal().Disconnect(_applicationAppControlEventCallbackDelegate);
-          }
+            LOG("New(int argc) is called!");
 
-          _applicationAppControlEventHandler -= value;
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_1(argc), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
-    }
-
-    // Callback for Application AppControlSignal
-    private void OnNUIApplicationAppControl(IntPtr application, IntPtr voidp)
-    {
-      NUIApplicationAppControlEventArgs e = new NUIApplicationAppControlEventArgs();
-
-      // Populate all members of "e" (NUIApplicationAppControlEventArgs) with real data
-      e.Application = Application.GetApplicationFromPtr(application);
-      e.VoidP = voidp;
-
-      if (_applicationAppControlEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _applicationAppControlEventHandler(this, e);
-      }
-    }
-
-    private static Application _instance; // singleton
-
-    public delegate void InitDelegate();
 
-    public delegate void TerminateDelegate();
+        public static Application New(int argc, string stylesheet)
+        {
+            LOG("New(int argc, string stylesheet) is called!");
 
-    public delegate void PauseDelegate();
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_2(argc, stylesheet), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public delegate void ResumeDelegate();
+        public static Application New(int argc, string stylesheet, Application.WindowMode windowMode)
+        {
+            LOG("New(int argc, string stylesheet, Application.WindowMode windowMode) is called!");
 
-    public delegate void ResizeDelegate();
+            Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public delegate void AppControlDelegate();
+        public Application() : this(NDalicPINVOKE.new_Application__SWIG_0(), true)
+        {
+            LOG("Application() is called!");
 
-    public delegate void LanguageChangedDelegate();
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    public delegate void RegionChangedDelegate();
+        public Application(Application application) : this(NDalicPINVOKE.new_Application__SWIG_1(Application.getCPtr(application)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    public delegate void BatteryLowDelegate();
+        public Application Assign(Application application)
+        {
+            Application ret = new Application(NDalicPINVOKE.Application_Assign(swigCPtr, Application.getCPtr(application)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public delegate void MemoryLowDelegate();
+        public void MainLoop()
+        {
+            NDalicPINVOKE.Application_MainLoop__SWIG_0(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void InitDelegateInternal();
+        internal void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration)
+        {
+            NDalicPINVOKE.Application_MainLoop__SWIG_1(swigCPtr, SWIGTYPE_p_Configuration__ContextLoss.getCPtr(configuration));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void TerminateDelegateInternal();
+        public void Lower()
+        {
+            NDalicPINVOKE.Application_Lower(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void PauseDelegateInternal();
+        public void Quit()
+        {
+            NDalicPINVOKE.Application_Quit(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void ResumeDelegateInternal();
+        internal bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback)
+        {
+            bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void ResizeDelegateInternal();
+        public Window GetWindow()
+        {
+            Window ret = new Window(NDalicPINVOKE.Application_GetWindow(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void AppControlDelegateInternal();
+        public void ReplaceWindow(Rectangle windowPosition, string name)
+        {
+            NDalicPINVOKE.Application_ReplaceWindow(swigCPtr, Rectangle.getCPtr(windowPosition), name);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void LanguageChangedDelegateInternal();
+        public static string GetResourcePath()
+        {
+            string ret = NDalicPINVOKE.Application_GetResourcePath();
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void RegionChangedDelegateInternal();
+        internal void SetViewMode(ViewMode viewMode)
+        {
+            NDalicPINVOKE.Application_SetViewMode(swigCPtr, (int)viewMode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void BatteryLowDelegateInternal();
+        internal ViewMode GetViewMode()
+        {
+            ViewMode ret = (ViewMode)NDalicPINVOKE.Application_GetViewMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    [System.Runtime.InteropServices.UnmanagedFunctionPointer(System.Runtime.InteropServices.CallingConvention.StdCall)]
-    internal delegate void MemoryLowDelegateInternal();
+        public void SetStereoBase(float stereoBase)
+        {
+            NDalicPINVOKE.Application_SetStereoBase(swigCPtr, stereoBase);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    static void Initialize()
-    {
-      //       instance.InitDelegate();
-    }
+        public float GetStereoBase()
+        {
+            float ret = NDalicPINVOKE.Application_GetStereoBase(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public static Application Instance
-    {
-       get
-       {
-            return _instance;
-       }
-    }
+        internal ApplicationSignal InitSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_InitSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public static Application GetApplicationFromPtr(global::System.IntPtr cPtr) {
-      Application ret = new Application(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
+        internal ApplicationSignal TerminateSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_TerminateSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    internal void SetupDelegates() {
-      InitDelegateInternal initializeCallback = new InitDelegateInternal( Initialize );
-      //Console.WriteLine( "InitSignal connection count");
+        internal ApplicationSignal PauseSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_PauseSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      this.InitSignal().Connect( initializeCallback );
-      //Console.WriteLine( "InitSignal connection count = " + app.InitSignal().GetConnectionCount() );
-    }
+        internal ApplicationSignal ResumeSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResumeSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public static Application NewApplication() {
-     _instance = NewApplication("", Application.WINDOW_MODE.OPAQUE);
-     return _instance;
-    }
+        internal ApplicationSignal ResetSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResetSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public static Application NewApplication(string stylesheet) {
-      _instance = NewApplication(stylesheet, Application.WINDOW_MODE.OPAQUE);
-      return _instance;
-    }
+        internal ApplicationSignal ResizeSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResizeSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode) {
+        internal ApplicationControlSignal AppControlSignal()
+        {
+            ApplicationControlSignal ret = new ApplicationControlSignal(NDalicPINVOKE.Application_AppControlSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      // register all Views with the type registry, so that can be created / styled via JSON
-      ViewRegistryHelper.Initialize();
+        internal ApplicationSignal LanguageChangedSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_LanguageChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      Application ret = New(1, stylesheet, windowMode);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        internal ApplicationSignal RegionChangedSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_RegionChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      // we've got an application now connect the signals
-      ret.SetupDelegates();
-      // set the singleton
-      _instance = ret;
-      return ret;
-    }
+        internal ApplicationSignal BatteryLowSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    public bool AddIdle(System.Delegate func) {
-      System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
-      System.IntPtr ip2 = NDalicManualPINVOKE.MakeCallback(new System.Runtime.InteropServices.HandleRef(this, ip));
+        internal ApplicationSignal MemoryLowSignal()
+        {
+            ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip2));
+        public enum WindowMode
+        {
+            Opaque = 0,
+            Transparent = 1
+        }
 
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
     }
 
-    
-  
-  /**
-  * Outer::outer_method(int)
-  */
-  public static Application New() {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_0(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_1(argc), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc, string stylesheet) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_2(argc, stylesheet), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Application New(int argc, string stylesheet, Application.WINDOW_MODE windowMode) {
-    Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Application() : this(NDalicPINVOKE.new_Application__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Application(Application application) : this(NDalicPINVOKE.new_Application__SWIG_1(Application.getCPtr(application)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Application Assign(Application application) {
-    Application ret = new Application(NDalicPINVOKE.Application_Assign(swigCPtr, Application.getCPtr(application)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void MainLoop() {
-    NDalicPINVOKE.Application_MainLoop__SWIG_0(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration) {
-    NDalicPINVOKE.Application_MainLoop__SWIG_1(swigCPtr, SWIGTYPE_p_Configuration__ContextLoss.getCPtr(configuration));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Lower() {
-    NDalicPINVOKE.Application_Lower(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Quit() {
-    NDalicPINVOKE.Application_Quit(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback) {
-    bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Window GetWindow() {
-    Window ret = new Window(NDalicPINVOKE.Application_GetWindow(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ReplaceWindow(Rectangle windowPosition, string name) {
-    NDalicPINVOKE.Application_ReplaceWindow(swigCPtr, Rectangle.getCPtr(windowPosition), name);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static string GetResourcePath() {
-    string ret = NDalicPINVOKE.Application_GetResourcePath();
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetViewMode(ViewMode viewMode) {
-    NDalicPINVOKE.Application_SetViewMode(swigCPtr, (int)viewMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ViewMode GetViewMode() {
-    ViewMode ret = (ViewMode)NDalicPINVOKE.Application_GetViewMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetStereoBase(float stereoBase) {
-    NDalicPINVOKE.Application_SetStereoBase(swigCPtr, stereoBase);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetStereoBase() {
-    float ret = NDalicPINVOKE.Application_GetStereoBase(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal InitSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_InitSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal TerminateSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_TerminateSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal PauseSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_PauseSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResumeSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResumeSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResetSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResetSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal ResizeSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResizeSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationControlSignal AppControlSignal() {
-    ApplicationControlSignal ret = new ApplicationControlSignal(NDalicPINVOKE.Application_AppControlSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal LanguageChangedSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_LanguageChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal RegionChangedSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_RegionChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal BatteryLowSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ApplicationSignal MemoryLowSignal() {
-    ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum WINDOW_MODE {
-    OPAQUE = 0,
-    TRANSPARENT = 1
-  }
-
-}
-
 }
index 0ea3b37..6d6ac1a 100755 (executable)
@@ -8,81 +8,97 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class ApplicationControlSignal : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal ApplicationControlSignal(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+    internal class ApplicationControlSignal : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ApplicationControlSignal obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal ApplicationControlSignal(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  ~ApplicationControlSignal() {
-    DisposeQueue.Instance.Add(this);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ApplicationControlSignal obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        ~ApplicationControlSignal()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ApplicationControlSignal(swigCPtr);
+        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_ApplicationControlSignal(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
 
-  public bool Empty() {
-    bool ret = NDalicPINVOKE.ApplicationControlSignal_Empty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        public bool Empty()
+        {
+            bool ret = NDalicPINVOKE.ApplicationControlSignal_Empty(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public uint GetConnectionCount() {
-    uint ret = NDalicPINVOKE.ApplicationControlSignal_GetConnectionCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        public uint GetConnectionCount()
+        {
+            uint ret = NDalicPINVOKE.ApplicationControlSignal_GetConnectionCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public void Connect(System.Delegate func) {
-System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
-    {
-      NDalicPINVOKE.ApplicationControlSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  }
+        public void Connect(System.Delegate func)
+        {
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
+            {
+                NDalicPINVOKE.ApplicationControlSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+        }
 
-  public void Disconnect(System.Delegate func) {
-System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
-    {
-      NDalicPINVOKE.ApplicationControlSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  }
+        public void Disconnect(System.Delegate func)
+        {
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
+            {
+                NDalicPINVOKE.ApplicationControlSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+        }
 
-  public void Emit(Application arg1, System.IntPtr arg2) {
-    NDalicPINVOKE.ApplicationControlSignal_Emit(swigCPtr, Application.getCPtr(arg1), arg2);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        public void Emit(Application arg1, System.IntPtr arg2)
+        {
+            NDalicPINVOKE.ApplicationControlSignal_Emit(swigCPtr, Application.getCPtr(arg1), arg2);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public ApplicationControlSignal() : this(NDalicPINVOKE.new_ApplicationControlSignal(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        public ApplicationControlSignal() : this(NDalicPINVOKE.new_ApplicationControlSignal(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+    }
 
 }
index 6fc9b2a..e2bcbc6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ApplicationExtensions : global::System.IDisposable {
+internal class ApplicationExtensions : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 363e732..85afaea 100755 (executable)
@@ -8,81 +8,97 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class ApplicationSignal : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal ApplicationSignal(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+    internal class ApplicationSignal : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ApplicationSignal obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal ApplicationSignal(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  ~ApplicationSignal() {
-    DisposeQueue.Instance.Add(this);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ApplicationSignal obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        ~ApplicationSignal()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ApplicationSignal(swigCPtr);
+        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_ApplicationSignal(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
 
-  public bool Empty() {
-    bool ret = NDalicPINVOKE.ApplicationSignal_Empty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        public bool Empty()
+        {
+            bool ret = NDalicPINVOKE.ApplicationSignal_Empty(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public uint GetConnectionCount() {
-    uint ret = NDalicPINVOKE.ApplicationSignal_GetConnectionCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        public uint GetConnectionCount()
+        {
+            uint ret = NDalicPINVOKE.ApplicationSignal_GetConnectionCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public void Connect(System.Delegate func) {
-System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
-    {
-      NDalicPINVOKE.ApplicationSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  }
+        public void Connect(System.Delegate func)
+        {
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
+            {
+                NDalicPINVOKE.ApplicationSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+        }
 
-  public void Disconnect(System.Delegate func) {
-System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
-    {
-      NDalicPINVOKE.ApplicationSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  }
+        public void Disconnect(System.Delegate func)
+        {
+            System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func);
+            {
+                NDalicPINVOKE.ApplicationSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+        }
 
-  public void Emit(Application arg) {
-    NDalicPINVOKE.ApplicationSignal_Emit(swigCPtr, Application.getCPtr(arg));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        public void Emit(Application arg)
+        {
+            NDalicPINVOKE.ApplicationSignal_Emit(swigCPtr, Application.getCPtr(arg));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public ApplicationSignal() : this(NDalicPINVOKE.new_ApplicationSignal(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        public ApplicationSignal() : this(NDalicPINVOKE.new_ApplicationSignal(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+    }
 
 }
index 556b50b..1cae9ac 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class AsyncImageLoader : BaseHandle {
+    internal class AsyncImageLoader : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal AsyncImageLoader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AsyncImageLoader_SWIGUpcast(cPtr), cMemoryOwn) {
index 55d70e3..82b3f4f 100755 (executable)
@@ -158,7 +158,7 @@ public class BaseHandle : global::System.IDisposable {
   }
 
 
-  public BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) {
+  internal BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -176,8 +176,8 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  public bool DoAction(string actionName, Property.Map attributes) {
-    bool ret = NDalicPINVOKE.BaseHandle_DoAction(swigCPtr, actionName, Property.Map.getCPtr(attributes));
+  public bool DoAction(string actionName, PropertyMap attributes) {
+    bool ret = NDalicPINVOKE.BaseHandle_DoAction(swigCPtr, actionName, PropertyMap.getCPtr(attributes));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -194,7 +194,7 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  public BaseObject GetBaseObject() {
+  internal BaseObject GetBaseObject() {
     BaseObject ret = new BaseObject(NDalicPINVOKE.BaseHandle_GetBaseObject__SWIG_0(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -217,7 +217,7 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  public RefObject GetObjectPtr() {
+  internal RefObject GetObjectPtr() {
     global::System.IntPtr cPtr = NDalicPINVOKE.BaseHandle_GetObjectPtr(swigCPtr);
     RefObject ret = (cPtr == global::System.IntPtr.Zero) ? null : new RefObject(cPtr, false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
index 0b14524..6e00495 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class BaseObject : RefObject {
+    internal class BaseObject : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal BaseObject(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BaseObject_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -35,8 +35,8 @@ public class BaseObject : RefObject {
     }
   }
 
-  public bool DoAction(string actionName, Property.Map attributes) {
-    bool ret = NDalicPINVOKE.BaseObject_DoAction(swigCPtr, actionName, Property.Map.getCPtr(attributes));
+  public bool DoAction(string actionName, PropertyMap attributes) {
+    bool ret = NDalicPINVOKE.BaseObject_DoAction(swigCPtr, actionName, PropertyMap.getCPtr(attributes));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -53,7 +53,7 @@ public class BaseObject : RefObject {
     return ret;
   }
 
-  public bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) {
+  internal bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) {
     bool ret = NDalicPINVOKE.BaseObject_DoConnectSignal(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), signalName, SWIGTYPE_p_FunctorDelegate.getCPtr(functorDelegate));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 515df7d..0aeb0e4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum BlendEquationType {
+    internal enum BlendEquationType {
   ADD = 0x8006,
   SUBTRACT = 0x800A,
   REVERSE_SUBTRACT = 0x800B
index a2c2b4d..c0dc86b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum BlendFactorType {
+    internal enum BlendFactorType {
   ZERO = 0,
   ONE = 1,
   SRC_COLOR = 0x0300,
index 1066d9b..6ff903f 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum BlendModeType {
+    internal enum BlendModeType {
   OFF,
   AUTO,
   ON
index fdfebf0..3d25d36 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class BufferImage : Image {
+    internal class BufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal BufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BufferImage_SWIGUpcast(cPtr), cMemoryOwn) {
index 9bbe985..554dd57 100755 (executable)
@@ -156,24 +156,24 @@ public class Builder : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void AddConstants(Property.Map map) {
-    NDalicPINVOKE.Builder_AddConstants(swigCPtr, Property.Map.getCPtr(map));
+  public void AddConstants(PropertyMap map) {
+    NDalicPINVOKE.Builder_AddConstants(swigCPtr, PropertyMap.getCPtr(map));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void AddConstant(string key, Property.Value value) {
-    NDalicPINVOKE.Builder_AddConstant(swigCPtr, key, Property.Value.getCPtr(value));
+  public void AddConstant(string key, PropertyValue value) {
+    NDalicPINVOKE.Builder_AddConstant(swigCPtr, key, PropertyValue.getCPtr(value));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Property.Map GetConstants() {
-    Property.Map ret = new Property.Map(NDalicPINVOKE.Builder_GetConstants(swigCPtr), false);
+  public PropertyMap GetConstants() {
+    PropertyMap ret = new PropertyMap(NDalicPINVOKE.Builder_GetConstants(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Property.Value GetConstant(string key) {
-    Property.Value ret = new Property.Value(NDalicPINVOKE.Builder_GetConstant(swigCPtr, key), false);
+  public PropertyValue GetConstant(string key) {
+    PropertyValue ret = new PropertyValue(NDalicPINVOKE.Builder_GetConstant(swigCPtr, key), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -184,8 +184,8 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public Animation CreateAnimation(string animationName, Property.Map map) {
-    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_1(swigCPtr, animationName, Property.Map.getCPtr(map)), true);
+  public Animation CreateAnimation(string animationName, PropertyMap map) {
+    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_1(swigCPtr, animationName, PropertyMap.getCPtr(map)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -196,8 +196,8 @@ public class Builder : BaseHandle {
     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, PropertyMap map, Actor sourceActor) {
+    Animation ret = new Animation(NDalicPINVOKE.Builder_CreateAnimation__SWIG_3(swigCPtr, animationName, PropertyMap.getCPtr(map), Actor.getCPtr(sourceActor)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -208,8 +208,8 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public BaseHandle Create(string templateName, Property.Map map) {
-    BaseHandle ret = new BaseHandle(NDalicPINVOKE.Builder_Create__SWIG_1(swigCPtr, templateName, Property.Map.getCPtr(map)), true);
+  public BaseHandle Create(string templateName, PropertyMap map) {
+    BaseHandle ret = new BaseHandle(NDalicPINVOKE.Builder_Create__SWIG_1(swigCPtr, templateName, PropertyMap.getCPtr(map)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -247,7 +247,7 @@ public class Builder : BaseHandle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public FrameBufferImage GetFrameBufferImage(string name) {
+  internal FrameBufferImage GetFrameBufferImage(string name) {
     FrameBufferImage ret = new FrameBufferImage(NDalicPINVOKE.Builder_GetFrameBufferImage(swigCPtr, name), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -259,19 +259,19 @@ public class Builder : BaseHandle {
     return ret;
   }
 
-  public PathConstrainer GetPathConstrainer(string pathConstrainerName) {
+  internal PathConstrainer GetPathConstrainer(string pathConstrainerName) {
     PathConstrainer ret = new PathConstrainer(NDalicPINVOKE.Builder_GetPathConstrainer(swigCPtr, pathConstrainerName), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public LinearConstrainer GetLinearConstrainer(string linearConstrainerName) {
+  internal LinearConstrainer GetLinearConstrainer(string linearConstrainerName) {
     LinearConstrainer ret = new LinearConstrainer(NDalicPINVOKE.Builder_GetLinearConstrainer(swigCPtr, linearConstrainerName), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public VoidSignal QuitSignal() {
+  internal VoidSignal QuitSignal() {
     VoidSignal ret = new VoidSignal(NDalicPINVOKE.Builder_QuitSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 177db2c..d1bb50c 100755 (executable)
-//------------------------------------------------------------------------------
-// <auto-generated />
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
 
-namespace Tizen.NUI {
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Button is a base class for different kinds of buttons.
+    /// This class provides the disabled property and the clicked signal.
+    /// A Clicked event handler is emitted when the button is touched and the touch point doesn't leave the boundary of the button.
+    /// When the disabled property is set to true, no signal is emitted.
+    /// 'Visual' describes not just traditional images like png, bmp but refers to whatever is used to show the button, it could be a color, gradient or some other kind of renderer.
+    /// The button's appearance can be modified by setting properties for the various visuals/images.
+    /// It is not mandatory to set all visuals. A button could be defined only by setting its background visual or by setting its background and selected visuals.
+    /// The button visual is shown over the background visual.
+    /// When pressed the unselected visuals are replaced by the selected visual.
+    /// The text label is always placed on the top of all images.
+    /// When the button is disabled, background, button and selected visuals are replaced by their disabled visuals.
+    /// </summary>
+    public class Button : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Button(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Button_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-using System;
-using System.Runtime.InteropServices;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Button obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
+        ~Button()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-public class Button : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        /// <summary>
+        /// To make Button instance be disposed.
+        /// </summary>
+        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_Button(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  internal Button(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Button_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Button obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        private EventHandlerWithReturnType<object, EventArgs, bool> _clickedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool ClickedCallbackType(global::System.IntPtr data);
+        private ClickedCallbackType _clickedCallback;
 
-  ~Button() {
-    DisposeQueue.Instance.Add(this);
-  }
+        public event EventHandlerWithReturnType<object, EventArgs, bool> Clicked
+        {
+            add
+            {
+                if (_clickedEventHandler == null)
+                {
+                    _clickedCallback = OnClicked;
+                    ClickedSignal().Connect(_clickedCallback);
+                }
+
+                _clickedEventHandler += value;
+            }
+
+            remove
+            {
+                _clickedEventHandler -= value;
+
+                if (_clickedEventHandler == null && _clickedCallback != null)
+                {
+                    ClickedSignal().Disconnect(_clickedCallback);
+                }
+            }
+        }
 
-  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_Button(swigCPtr);
+        private bool OnClicked(IntPtr data)
+        {
+            if (_clickedEventHandler != null)
+            {
+                return _clickedEventHandler(this, null);
+            }
+            return false;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
 
 
-public class ClickedEventArgs : EventArgs
-{
-   private Button _button;
-
-   public Button Button
-   {
-      get
-      {
-         return _button;
-      }
-      set
-      {
-         _button = value;
-      }
-   }
-}
-
-public class PressedEventArgs : EventArgs
-{
-   private Button _button;
-
-   public Button Button
-   {
-      get
-      {
-         return _button;
-      }
-      set
-      {
-         _button = value;
-      }
-   }
-}
-
-public class ReleasedEventArgs : EventArgs
-{
-   private Button _button;
-
-   public Button Button
-   {
-      get
-      {
-         return _button;
-      }
-      set
-      {
-         _button = value;
-      }
-   }
-}
-
-public class StateChangedEventArgs : EventArgs
-{
-   private Button _button;
-
-   public Button Button
-   {
-      get
-      {
-         return _button;
-      }
-      set
-      {
-         _button = value;
-      }
-   }
-}
+        private EventHandlerWithReturnType<object, EventArgs, bool> _pressedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool PressedCallbackType(global::System.IntPtr data);
+        private PressedCallbackType _pressedCallback;
+
+        public event EventHandlerWithReturnType<object, EventArgs, bool> Pressed
+        {
+            add
+            {
+                if (_pressedEventHandler == null)
+                {
+                    _pressedCallback = OnPressed;
+                    PressedSignal().Connect(_pressedCallback);
+                }
+
+                _pressedEventHandler += value;
+            }
+
+            remove
+            {
+                _pressedEventHandler -= value;
+
+                if (_pressedEventHandler == null && _pressedCallback != null)
+                {
+                    this.PressedSignal().Disconnect(_pressedCallback);
+                }
+            }
+        }
+
+        private bool OnPressed(IntPtr data)
+        {
+            if (_pressedEventHandler != null)
+            {
+                return _pressedEventHandler(this, null);
+            }
+            return false;
+        }
 
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool ClickedCallbackDelegate(global::System.IntPtr data);
-  private DaliEventHandlerWithReturnType<object,ClickedEventArgs,bool> _buttonClickedEventHandler;
-  private ClickedCallbackDelegate _buttonClickedCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool PressedCallbackDelegate(global::System.IntPtr data);
-  private DaliEventHandlerWithReturnType<object,PressedEventArgs,bool> _buttonPressedEventHandler;
-  private PressedCallbackDelegate _buttonPressedCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool ReleasedCallbackDelegate(global::System.IntPtr data);
-  private DaliEventHandlerWithReturnType<object,ReleasedEventArgs,bool>  _buttonReleasedEventHandler;
-  private ReleasedCallbackDelegate _buttonReleasedCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool StateChangedCallbackDelegate(global::System.IntPtr data);
-  private DaliEventHandlerWithReturnType<object,StateChangedEventArgs,bool> _buttonStateChangedEventHandler;
-  private StateChangedCallbackDelegate _buttonStateChangedCallbackDelegate;
-
-
-  public event DaliEventHandlerWithReturnType<object,ClickedEventArgs,bool> Clicked
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_buttonClickedEventHandler == null)
-           {
-              _buttonClickedEventHandler += value;
-
-              _buttonClickedCallbackDelegate = new ClickedCallbackDelegate(OnClicked);
-              this.ClickedSignal().Connect(_buttonClickedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_buttonClickedEventHandler != null)
-           {
-               this.ClickedSignal().Disconnect(_buttonClickedCallbackDelegate);
-           }
 
-           _buttonClickedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for button click signal
-  private bool OnClicked (IntPtr data)
-  {
-     ClickedEventArgs e = new ClickedEventArgs();
-
-     e.Button = Button.GetButtonFromPtr(data);
-
-     if (_buttonClickedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        return _buttonClickedEventHandler(this, e);
-     }
-     return false;
-  }
-
-
-  public event DaliEventHandlerWithReturnType<object,PressedEventArgs,bool> Pressed
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_buttonPressedEventHandler == null)
-           {
-              _buttonPressedEventHandler += value;
+        private EventHandlerWithReturnType<object, EventArgs, bool> _releasedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool ReleasedCallbackType(global::System.IntPtr data);
+        private ReleasedCallbackType _releasedCallback;
 
-              _buttonPressedCallbackDelegate = new PressedCallbackDelegate(OnPressed);
-              this.PressedSignal().Connect(_buttonPressedCallbackDelegate);
-           }
+        public event EventHandlerWithReturnType<object, EventArgs, bool> Released
+        {
+            add
+            {
+                if (_releasedEventHandler == null)
+                {
+                    _releasedCallback = OnReleased;
+                    ReleasedSignal().Connect(_releasedCallback);
+                }
+                _releasedEventHandler += value;
+            }
+
+            remove
+            {
+                _releasedEventHandler -= value;
+
+                if (_releasedEventHandler == null && _releasedCallback != null)
+                {
+                    ReleasedSignal().Disconnect(_releasedCallback);
+                }
+
+            }
         }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_buttonPressedEventHandler != null)
-           {
-               this.PressedSignal().Disconnect(_buttonPressedCallbackDelegate);
-           }
 
-           _buttonPressedEventHandler -= value;
+        private bool OnReleased(IntPtr data)
+        {
+            if (_releasedEventHandler != null)
+            {
+                return _releasedEventHandler(this, null);
+            }
+            return false;
         }
-     }
-  }
 
-  // Callback for button click signal
-  private bool OnPressed (IntPtr data)
-  {
-     PressedEventArgs e = new PressedEventArgs();
 
-     e.Button = Button.GetButtonFromPtr(data);
+        private EventHandlerWithReturnType<object, EventArgs, bool> _stateChangedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool StateChangedCallback(global::System.IntPtr data);
+        private StateChangedCallback _stateChangedCallback;
+
+        public event EventHandlerWithReturnType<object, EventArgs, bool> StateChanged
+        {
+            add
+            {
+                if (_stateChangedEventHandler == null)
+                {
+                    _stateChangedCallback = OnStateChanged;
+                    StateChangedSignal().Connect(_stateChangedCallback);
+                }
+
+                _stateChangedEventHandler += value;
+            }
+
+            remove
+            {
+                _stateChangedEventHandler -= value;
+
+                if (_stateChangedEventHandler == null && _stateChangedCallback != null)
+                {
+                    StateChangedSignal().Disconnect(_stateChangedCallback);
+                }
+            }
+        }
+
+        private bool OnStateChanged(IntPtr data)
+        {
+            if (_stateChangedEventHandler != null)
+            {
+                return _stateChangedEventHandler(this, null);
+            }
+            return false;
+        }
 
-     if (_buttonPressedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-       return _buttonPressedEventHandler(this, e);
-     }
-     return false;
-  }
 
 
-  public event DaliEventHandlerWithReturnType<object,ReleasedEventArgs,bool> Released
-  {
-     add
-     {
-        lock(this)
+        internal static Button GetButtonFromPtr(global::System.IntPtr cPtr)
         {
-           // Restricted to only one listener
-           if (_buttonReleasedEventHandler == null)
-           {
-              _buttonReleasedEventHandler += value;
+            Button ret = new Button(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-              _buttonReleasedCallbackDelegate = new ReleasedCallbackDelegate(OnReleased);
-              this.ReleasedSignal().Connect(_buttonReleasedCallbackDelegate);
-           }
+        /// <summary>
+        /// Gets/Sets the unselected button foreground/icon visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap UnselectedVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.UNSELECTED_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.UNSELECTED_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
         }
-     }
 
-     remove
-     {
-        lock(this)
+        /// <summary>
+        /// Gets/Sets the selected button foreground/icon visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap SelectedVisual
         {
-           if (_buttonReleasedEventHandler != null)
-           {
-               this.ReleasedSignal().Disconnect(_buttonReleasedCallbackDelegate);
-           }
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.SELECTED_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.SELECTED_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-           _buttonReleasedEventHandler -= value;
+        /// <summary>
+        /// Gets/Sets the disabled selected state foreground/icon button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap DisabledSelectedVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.DISABLED_SELECTED_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED_SELECTED_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
         }
-     }
-  }
 
-  // Callback for button click signal
-  private bool OnReleased (IntPtr data)
-  {
-     ReleasedEventArgs e = new ReleasedEventArgs();
+        /// <summary>
+        /// Gets/Sets the disabled unselected state foreground/icon visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap DisabledUnselectedVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.DISABLED_UNSELECTED_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED_UNSELECTED_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-     e.Button = Button.GetButtonFromPtr(data);
-
-     if (_buttonReleasedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-       return _buttonReleasedEventHandler(this, e);
-     }
-     return false;
-  }
-
-
-  public event DaliEventHandlerWithReturnType<object,StateChangedEventArgs,bool> StateChanged
-  {
-     add
-     {
-        lock(this)
+        /// <summary>
+        /// Gets/Sets the disabled in the unselected state background, button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap UnselectedBackgroundVisual
         {
-           // Restricted to only one listener
-           if (_buttonStateChangedEventHandler == null)
-           {
-              _buttonStateChangedEventHandler += value;
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.UNSELECTED_BACKGROUND_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.UNSELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-              _buttonStateChangedCallbackDelegate = new StateChangedCallbackDelegate(OnStateChanged);
-              this.StateChangedSignal().Connect(_buttonStateChangedCallbackDelegate);
-           }
+        /// <summary>
+        /// Gets/Sets the selected background button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap SelectedBackgroundVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.SELECTED_BACKGROUND_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.SELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
         }
-     }
 
-     remove
-     {
-        lock(this)
+        /// <summary>
+        /// Gets/Sets the disabled while unselected background button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap DisabledUnselectedBackgroundVisual
         {
-           if (_buttonStateChangedEventHandler != null)
-           {
-               this.StateChangedSignal().Disconnect(_buttonStateChangedCallbackDelegate);
-           }
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.DISABLED_UNSELECTED_BACKGROUND_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED_UNSELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-           _buttonStateChangedEventHandler -= value;
-        }
-     }
-  }
+        /// <summary>
+        /// Gets/Sets the disabled while selected background button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap DisabledSelectedBackgroundVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.DISABLED_SELECTED_BACKGROUND_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED_SELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  // Callback for button click signal
-  private bool OnStateChanged (IntPtr data)
-  {
-     StateChangedEventArgs e = new StateChangedEventArgs();
-
-     e.Button = Button.GetButtonFromPtr(data);
-
-     if (_buttonStateChangedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-       return _buttonStateChangedEventHandler(this, e);
-     }
-     return false;
-  }
-
- public static Button GetButtonFromPtr(global::System.IntPtr cPtr) {
-    Button ret = new Button(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Gets/Sets the position of the the label in relation to the foreground/icon if both present
+        /// </summary>
+        public string LabelRelativeAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(Button.Property.LABEL_RELATIVE_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.LABEL_RELATIVE_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  public Tizen.NUI.Property.Map UnselectedVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.UNSELECTED_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// Gets/Sets the padding around the text
+        /// </summary>
+        public Vector4 LabelPadding
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Button.Property.LABEL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  public Tizen.NUI.Property.Map SelectedVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.SELECTED_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// Gets/Sets the padding around the foreground visual
+        /// </summary>
+        public Vector4 VisualPadding
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Button.Property.VISUAL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.VISUAL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  public Tizen.NUI.Property.Map DisabledSelectedVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.DISABLED_SELECTED_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_SELECTED_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Button_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get();
+            internal static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get();
+            internal static readonly int DISABLED_SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_VISUAL_get();
+            internal static readonly int DISABLED_UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_UNSELECTED_VISUAL_get();
+            internal static readonly int UNSELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_BACKGROUND_VISUAL_get();
+            internal static readonly int SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_BACKGROUND_VISUAL_get();
+            internal static readonly int DISABLED_UNSELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_UNSELECTED_BACKGROUND_VISUAL_get();
+            internal static readonly int DISABLED_SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_BACKGROUND_VISUAL_get();
+            internal static readonly int LABEL_RELATIVE_ALIGNMENT = NDalicManualPINVOKE.Button_Property_LABEL_RELATIVE_ALIGNMENT_get();
+            internal static readonly int LABEL_PADDING = NDalicManualPINVOKE.Button_Property_LABEL_PADDING_get();
+            internal static readonly int VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get();
+            //changed
+            internal Property() : this(NDalicPINVOKE.new_Button_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int DISABLED = NDalicPINVOKE.Button_Property_DISABLED_get();
+            internal static readonly int AUTO_REPEATING = NDalicPINVOKE.Button_Property_AUTO_REPEATING_get();
+            internal static readonly int INITIAL_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_INITIAL_AUTO_REPEATING_DELAY_get();
+            internal static readonly int NEXT_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_NEXT_AUTO_REPEATING_DELAY_get();
+            internal static readonly int TOGGLABLE = NDalicPINVOKE.Button_Property_TOGGLABLE_get();
+            internal static readonly int SELECTED = NDalicPINVOKE.Button_Property_SELECTED_get();
+            internal static readonly int UNSELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_UNSELECTED_STATE_IMAGE_get();
+            internal static readonly int SELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_SELECTED_STATE_IMAGE_get();
+            internal static readonly int DISABLED_STATE_IMAGE = NDalicPINVOKE.Button_Property_DISABLED_STATE_IMAGE_get();
+            internal static readonly int UNSELECTED_COLOR = NDalicPINVOKE.Button_Property_UNSELECTED_COLOR_get();
+            internal static readonly int SELECTED_COLOR = NDalicPINVOKE.Button_Property_SELECTED_COLOR_get();
+            internal static readonly int LABEL = NDalicPINVOKE.Button_Property_LABEL_get();
+            internal static readonly int LABEL_TEXT = NDalicPINVOKE.Button_Property_LABEL_TEXT_get();
 
-  public Tizen.NUI.Property.Map DisabledUnselectedVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.DISABLED_UNSELECTED_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_UNSELECTED_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        }
 
-  public Tizen.NUI.Property.Map UnselectedBackgroundVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.UNSELECTED_BACKGROUND_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_BACKGROUND_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// Creates an uninitialized Button.
+        /// Only derived versions can be instantiated.
+        /// </summary>
+        public Button() : this(NDalicPINVOKE.new_Button__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Tizen.NUI.Property.Map SelectedBackgroundVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.SELECTED_BACKGROUND_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_BACKGROUND_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal Button(Button button) : this(NDalicPINVOKE.new_Button__SWIG_1(Button.getCPtr(button)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Tizen.NUI.Property.Map DisabledUnselectedBackgroundVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.DISABLED_UNSELECTED_BACKGROUND_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_UNSELECTED_BACKGROUND_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal Button Assign(Button button)
+        {
+            Button ret = new Button(NDalicPINVOKE.Button_Assign(swigCPtr, Button.getCPtr(button)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public Tizen.NUI.Property.Map DisabledSelectedBackgroundVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.DISABLED_SELECTED_BACKGROUND_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_SELECTED_BACKGROUND_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// Downcasts a handle to Button handle.
+        /// If handle points to a Button, the downcast produces valid handle.
+        /// If not the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>A handle to a Button or an uninitialized handle</returns>
+        public new static Button DownCast(BaseHandle handle)
+        {
+            Button ret = new Button(NDalicPINVOKE.Button_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public string LabelRelativeAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.LABEL_RELATIVE_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL_RELATIVE_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal bool IsDisabled()
+        {
+            bool ret = NDalicPINVOKE.Button_IsDisabled(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public Vector4 LabelPadding
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.LABEL_PADDING).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal bool IsAutoRepeating()
+        {
+            bool ret = NDalicPINVOKE.Button_IsAutoRepeating(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public Vector4 VisualPadding
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.VISUAL_PADDING).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.VISUAL_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-
-  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_Button_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get();
-    public static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get();
-    public static readonly int DISABLED_SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_VISUAL_get();
-    public static readonly int DISABLED_UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_UNSELECTED_VISUAL_get();
-    public static readonly int UNSELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_BACKGROUND_VISUAL_get();
-    public static readonly int SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_BACKGROUND_VISUAL_get();
-    public static readonly int DISABLED_UNSELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_UNSELECTED_BACKGROUND_VISUAL_get();
-    public static readonly int DISABLED_SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_BACKGROUND_VISUAL_get();
-    public static readonly int LABEL_RELATIVE_ALIGNMENT = NDalicManualPINVOKE.Button_Property_LABEL_RELATIVE_ALIGNMENT_get();
-    public static readonly int LABEL_PADDING = NDalicManualPINVOKE.Button_Property_LABEL_PADDING_get();
-    public static readonly int VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get();
-  
-    public Property() : this(NDalicPINVOKE.new_Button_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int DISABLED = NDalicPINVOKE.Button_Property_DISABLED_get();
-    public static readonly int AUTO_REPEATING = NDalicPINVOKE.Button_Property_AUTO_REPEATING_get();
-    public static readonly int INITIAL_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_INITIAL_AUTO_REPEATING_DELAY_get();
-    public static readonly int NEXT_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_NEXT_AUTO_REPEATING_DELAY_get();
-    public static readonly int TOGGLABLE = NDalicPINVOKE.Button_Property_TOGGLABLE_get();
-    public static readonly int SELECTED = NDalicPINVOKE.Button_Property_SELECTED_get();
-    public static readonly int UNSELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_UNSELECTED_STATE_IMAGE_get();
-    public static readonly int SELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_SELECTED_STATE_IMAGE_get();
-    public static readonly int DISABLED_STATE_IMAGE = NDalicPINVOKE.Button_Property_DISABLED_STATE_IMAGE_get();
-    public static readonly int UNSELECTED_COLOR = NDalicPINVOKE.Button_Property_UNSELECTED_COLOR_get();
-    public static readonly int SELECTED_COLOR = NDalicPINVOKE.Button_Property_SELECTED_COLOR_get();
-    public static readonly int LABEL = NDalicPINVOKE.Button_Property_LABEL_get();
-    public static readonly int LABEL_TEXT = NDalicPINVOKE.Button_Property_LABEL_TEXT_get();
-  
-  }
-
-  public Button() : this(NDalicPINVOKE.new_Button__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Button(Button button) : this(NDalicPINVOKE.new_Button__SWIG_1(Button.getCPtr(button)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Button Assign(Button button) {
-    Button ret = new Button(NDalicPINVOKE.Button_Assign(swigCPtr, Button.getCPtr(button)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static Button DownCast(BaseHandle handle) {
-    Button ret = new Button(NDalicPINVOKE.Button_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsDisabled() {
-    bool ret = NDalicPINVOKE.Button_IsDisabled(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsAutoRepeating() {
-    bool ret = NDalicPINVOKE.Button_IsAutoRepeating(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetInitialAutoRepeatingDelay() {
-    float ret = NDalicPINVOKE.Button_GetInitialAutoRepeatingDelay(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetNextAutoRepeatingDelay() {
-    float ret = NDalicPINVOKE.Button_GetNextAutoRepeatingDelay(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsTogglableButton() {
-    bool ret = NDalicPINVOKE.Button_IsTogglableButton(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsSelected() {
-    bool ret = NDalicPINVOKE.Button_IsSelected(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetAnimationTime() {
-    float ret = NDalicPINVOKE.Button_GetAnimationTime(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public string GetLabelText() {
-    string ret = NDalicPINVOKE.Button_GetLabelText(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetLabel(Actor label) {
-    NDalicPINVOKE.Button_SetLabel(swigCPtr, Actor.getCPtr(label));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetButtonImage(Image image) {
-    NDalicPINVOKE.Button_SetButtonImage(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSelectedImage(Image image) {
-    NDalicPINVOKE.Button_SetSelectedImage(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetButtonImage() {
-    Actor ret = new Actor(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);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ButtonSignal PressedSignal() {
-    ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_PressedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ButtonSignal ReleasedSignal() {
-    ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ReleasedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ButtonSignal ClickedSignal() {
-    ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ClickedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ButtonSignal StateChangedSignal() {
-    ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_StateChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public bool Disabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.DISABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool AutoRepeating
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.AUTO_REPEATING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.AUTO_REPEATING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float InitialAutoRepeatingDelay
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float NextAutoRepeatingDelay
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool Togglable
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.TOGGLABLE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.TOGGLABLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool Selected
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Button.Property.SELECTED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map UnselectedStateImage
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.UNSELECTED_STATE_IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_STATE_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectedStateImage
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.SELECTED_STATE_IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_STATE_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map DisabledStateImage
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.DISABLED_STATE_IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.DISABLED_STATE_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 UnselectedColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.UNSELECTED_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.UNSELECTED_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 SelectedColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Button.Property.SELECTED_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.SELECTED_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Label
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Button.Property.LABEL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string LabelText
-  {
-    get
-    {
-      string temp;
-      GetProperty( Button.Property.LABEL_TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Button.Property.LABEL_TEXT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal float GetInitialAutoRepeatingDelay()
+        {
+            float ret = NDalicPINVOKE.Button_GetInitialAutoRepeatingDelay(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float GetNextAutoRepeatingDelay()
+        {
+            float ret = NDalicPINVOKE.Button_GetNextAutoRepeatingDelay(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool IsTogglableButton()
+        {
+            bool ret = NDalicPINVOKE.Button_IsTogglableButton(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        internal bool IsSelected()
+        {
+            bool ret = NDalicPINVOKE.Button_IsSelected(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves button's animation time.
+        /// </summary>
+        /// <returns></returns>
+        public float GetAnimationTime()
+        {
+            float ret = NDalicPINVOKE.Button_GetAnimationTime(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal string GetLabelText()
+        {
+            string ret = NDalicPINVOKE.Button_GetLabelText(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetLabel(Actor label)
+        {
+            NDalicPINVOKE.Button_SetLabel(swigCPtr, Actor.getCPtr(label));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetButtonImage(Image image)
+        {
+            NDalicPINVOKE.Button_SetButtonImage(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSelectedImage(Image image)
+        {
+            NDalicPINVOKE.Button_SetSelectedImage(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Actor GetButtonImage()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Actor GetSelectedImage()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ButtonSignal PressedSignal()
+        {
+            ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_PressedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ButtonSignal ReleasedSignal()
+        {
+            ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ReleasedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ButtonSignal ClickedSignal()
+        {
+            ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ClickedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ButtonSignal StateChangedSignal()
+        {
+            ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_StateChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Gets/Sets the button as disabled.
+        /// </summary>
+        public bool Disabled
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Button.Property.DISABLED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// If the autorepeating property is set to true then the togglable property is set to false
+        /// </summary>
+        public bool AutoRepeating
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Button.Property.AUTO_REPEATING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.AUTO_REPEATING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// By default this value is set to 0.15 seconds.
+        /// </summary>
+        public float InitialAutoRepeatingDelay
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.INITIAL_AUTO_REPEATING_DELAY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// default this value is set to 0.05 seconds
+        /// </summary>
+        public float NextAutoRepeatingDelay
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Button.Property.NEXT_AUTO_REPEATING_DELAY).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.NEXT_AUTO_REPEATING_DELAY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// If the togglable property is set to true, then the autorepeating property is set to false.
+        /// </summary>
+        public bool Togglable
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Button.Property.TOGGLABLE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.TOGGLABLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// /Gets/Sets the togglable button as either selected or unselected, togglable property must be set to true.
+        /// </summary>
+        public bool Selected
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Button.Property.SELECTED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.SELECTED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the unselected button foreground image
+        /// </summary>
+        public Tizen.NUI.PropertyMap UnselectedStateImage
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.UNSELECTED_STATE_IMAGE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.UNSELECTED_STATE_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the selected button foreground image
+        /// </summary>
+        public Tizen.NUI.PropertyMap SelectedStateImage
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.SELECTED_STATE_IMAGE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.SELECTED_STATE_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the disabled whilst unselected foreground button visual
+        /// </summary>
+        public Tizen.NUI.PropertyMap DisabledStateImage
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.DISABLED_STATE_IMAGE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.DISABLED_STATE_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets unselected color 
+        /// </summary>
+        public Color UnselectedColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Button.Property.UNSELECTED_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.UNSELECTED_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets selected color 
+        /// </summary>
+        public Color SelectedColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Button.Property.SELECTED_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.SELECTED_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets label
+        /// </summary>
+        public Tizen.NUI.PropertyMap Label
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(Button.Property.LABEL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.LABEL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets text of label
+        /// </summary>
+        public string LabelText
+        {
+            get
+            {
+                string temp;
+                GetProperty(Button.Property.LABEL_TEXT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Button.Property.LABEL_TEXT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
\ No newline at end of file
index da42891..47e39df 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ButtonSignal : global::System.IDisposable {
+    internal class ButtonSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 689d9ef..c405f7b 100755 (executable)
-/** 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 />
+// 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
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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.
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// CameraActor controls a camera. 
+    /// Allows the developer to use actor semantics to control a camera. 
+    /// NUI has a concept of a camera to display its virtual 3D world to a 2D screen.
+    /// There are 2 ways of using the camera in NUI: 
+    /// - For 2D applications, you do not need to care about the camera at all. The default camera is already best suited for 2D applications
+    /// (configured to have the origin of the coordinate system at the top-left corner of the screen, and unit 1 as 1 pixel of the screen). This is a typical way.
+    /// - For 3D applications, you can change the view by manipulating the camera.You can translate or rotate the camera in this case.
+    /// Note that the top-left corner of the screen and unit 1 no longer are (0,0,0) and 1 pixel after manipulating the camera.
+    /// There are two types of camera actor, FreeLook and LookAtTarget By default, the camera actor will be FreeLook. 
+    /// - A FreeLook camera uses actor's orientation to control where the camera is looking.
+    /// If no additional rotations are specified, the camera looks in the negative Z direction.
+    /// - For LookAtTarget, the actor's orientation is ignored, instead the camera looks at TargetPosition in world coordinates.
+    /// /// </summary>
+    public class CameraActor : Actor
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-namespace Tizen.NUI {
+        internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class CameraActor : Actor {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CameraActor obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal CameraActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~CameraActor()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CameraActor obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// To make CameraActor instance be disposed.
+        /// </summary>
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_CameraActor(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~CameraActor() {
-    DisposeQueue.Instance.Add(this);
-  }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_CameraActor_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get();
+            internal static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get();
+            internal static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get();
+            internal static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get();
+            internal static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get();
+            internal static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get();
+            internal static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get();
+            internal static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get();
+            internal static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get();
+            internal static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get();
+            internal static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get();
+            internal static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get();
+            internal static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get();
+            internal static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get();
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_CameraActor(swigCPtr);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Creates an initialized CameraActor handle.
+        /// </summary>
+        public CameraActor() : this(NDalicPINVOKE.CameraActor_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates a CameraActor object.
+        /// Sets the default camera perspective projection for the given canvas size
+        /// </summary>
+        /// <param name="size">The canvas size</param>
+        public CameraActor(Size2D size) : this(NDalicPINVOKE.CameraActor_New__SWIG_1(Size2D.getCPtr(size)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Downcasts a handle to CameraActor handle.
+        /// If handle points to a CameraActor, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">to An object</param>
+        /// <returns>Handle to a CameraActor or an uninitialized handle</returns>
+        public new static CameraActor DownCast(BaseHandle handle)
+        {
+            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.getCPtr(copy)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal CameraActor Assign(CameraActor rhs)
+        {
+            CameraActor ret = new CameraActor(NDalicPINVOKE.CameraActor_Assign(swigCPtr, CameraActor.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetType(CameraType type)
+        {
+            NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal CameraType GetType()
+        {
+            CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetProjectionMode(ProjectionMode mode)
+        {
+            NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ProjectionMode GetProjectionMode()
+        {
+            ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetFieldOfView(float fieldOfView)
+        {
+            NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetFieldOfView()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetAspectRatio(float aspectRatio)
+        {
+            NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetAspectRatio()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetNearClippingPlane(float nearClippingPlane)
+        {
+            NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetNearClippingPlane()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetFarClippingPlane(float farClippingPlane)
+        {
+            NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetFarClippingPlane()
+        {
+            float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetTargetPosition(Vector3 targetPosition)
+        {
+            NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Vector3 GetTargetPosition()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetInvertYAxis(bool invertYAxis)
+        {
+            NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool GetInvertYAxis()
+        {
+            bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetPerspectiveProjection(Vector2 size)
+        {
+            NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetOrthographicProjection(Vector2 size)
+        {
+            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far)
+        {
+            NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets/Sets the camera type. The default type is FreeLook
+        /// </summary>
+        public string Type
+        {
+            get
+            {
+                string temp;
+                GetProperty(CameraActor.Property.TYPE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TYPE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the projection mode.
+        /// </summary>
+        public string ProjectionMode
+        {
+            get
+            {
+                string temp;
+                GetProperty(CameraActor.Property.PROJECTION_MODE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.PROJECTION_MODE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the field of view.
+        /// </summary>
+        public float FieldOfView
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.FIELD_OF_VIEW).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.FIELD_OF_VIEW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the aspect ratio of the camera.
+        /// </summary>
+        public float AspectRatio
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.ASPECT_RATIO).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.ASPECT_RATIO, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets near plane distance
+        /// </summary>
+        public float NearPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets far plane distance
+        /// </summary>
+        public float FarPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.FAR_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets left plane distance
+        /// </summary>
+        public float LeftPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets right plane distance
+        /// </summary>
+        public float RightPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets top plane distance
+        /// </summary>
+        public float TopPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.TOP_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets bottom plane distance
+        /// </summary>
+        public float BottomPlaneDistance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the target position of the camera.
+        /// </summary>
+        public Position TargetPosition
+        {
+            get
+            {
+                Position temp = new Position(0.0f, 0.0f, 0.0f);
+                GetProperty(CameraActor.Property.TARGET_POSITION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.TARGET_POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        internal Matrix ProjectionMatrix
+        {
+            get
+            {
+                Matrix temp = new Matrix();
+                GetProperty(CameraActor.Property.PROJECTION_MATRIX).Get(temp);
+                return temp;
+            }
+        }
+
+        internal Matrix ViewMatrix
+        {
+            get
+            {
+                Matrix temp = new Matrix();
+                GetProperty(CameraActor.Property.VIEW_MATRIX).Get(temp);
+                return temp;
+            }
+        }
+
+        /// <summary>
+        /// Requests for an inversion on the Y axis on the projection calculation.
+        /// </summary>
+        public bool InvertYAxis
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(CameraActor.Property.INVERT_Y_AXIS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(CameraActor.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_CameraActor_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_CameraActor_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int TYPE = NDalicPINVOKE.CameraActor_Property_TYPE_get();
-    public static readonly int PROJECTION_MODE = NDalicPINVOKE.CameraActor_Property_PROJECTION_MODE_get();
-    public static readonly int FIELD_OF_VIEW = NDalicPINVOKE.CameraActor_Property_FIELD_OF_VIEW_get();
-    public static readonly int ASPECT_RATIO = NDalicPINVOKE.CameraActor_Property_ASPECT_RATIO_get();
-    public static readonly int NEAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_NEAR_PLANE_DISTANCE_get();
-    public static readonly int FAR_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_FAR_PLANE_DISTANCE_get();
-    public static readonly int LEFT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_LEFT_PLANE_DISTANCE_get();
-    public static readonly int RIGHT_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_RIGHT_PLANE_DISTANCE_get();
-    public static readonly int TOP_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_TOP_PLANE_DISTANCE_get();
-    public static readonly int BOTTOM_PLANE_DISTANCE = NDalicPINVOKE.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get();
-    public static readonly int TARGET_POSITION = NDalicPINVOKE.CameraActor_Property_TARGET_POSITION_get();
-    public static readonly int PROJECTION_MATRIX = NDalicPINVOKE.CameraActor_Property_PROJECTION_MATRIX_get();
-    public static readonly int VIEW_MATRIX = NDalicPINVOKE.CameraActor_Property_VIEW_MATRIX_get();
-    public static readonly int INVERT_Y_AXIS = NDalicPINVOKE.CameraActor_Property_INVERT_Y_AXIS_get();
-  
-  }
-
-  public CameraActor () : this (NDalicPINVOKE.CameraActor_New__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public CameraActor (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);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public CameraActor(CameraActor copy) : this(NDalicPINVOKE.new_CameraActor__SWIG_1(CameraActor.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);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetType(CameraType type) {
-    NDalicPINVOKE.CameraActor_SetType(swigCPtr, (int)type);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public CameraType GetType() {
-    CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetProjectionMode(ProjectionMode mode) {
-    NDalicPINVOKE.CameraActor_SetProjectionMode(swigCPtr, (int)mode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ProjectionMode GetProjectionMode() {
-    ProjectionMode ret = (ProjectionMode)NDalicPINVOKE.CameraActor_GetProjectionMode(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFieldOfView(float fieldOfView) {
-    NDalicPINVOKE.CameraActor_SetFieldOfView(swigCPtr, fieldOfView);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetFieldOfView() {
-    float ret = NDalicPINVOKE.CameraActor_GetFieldOfView(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetAspectRatio(float aspectRatio) {
-    NDalicPINVOKE.CameraActor_SetAspectRatio(swigCPtr, aspectRatio);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetAspectRatio() {
-    float ret = NDalicPINVOKE.CameraActor_GetAspectRatio(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetNearClippingPlane(float nearClippingPlane) {
-    NDalicPINVOKE.CameraActor_SetNearClippingPlane(swigCPtr, nearClippingPlane);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetNearClippingPlane() {
-    float ret = NDalicPINVOKE.CameraActor_GetNearClippingPlane(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFarClippingPlane(float farClippingPlane) {
-    NDalicPINVOKE.CameraActor_SetFarClippingPlane(swigCPtr, farClippingPlane);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetFarClippingPlane() {
-    float ret = NDalicPINVOKE.CameraActor_GetFarClippingPlane(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetTargetPosition(Vector3 targetPosition) {
-    NDalicPINVOKE.CameraActor_SetTargetPosition(swigCPtr, Vector3.getCPtr(targetPosition));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetTargetPosition() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.CameraActor_GetTargetPosition(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetInvertYAxis(bool invertYAxis) {
-    NDalicPINVOKE.CameraActor_SetInvertYAxis(swigCPtr, invertYAxis);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool GetInvertYAxis() {
-    bool ret = NDalicPINVOKE.CameraActor_GetInvertYAxis(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetPerspectiveProjection(Vector2 size) {
-    NDalicPINVOKE.CameraActor_SetPerspectiveProjection(swigCPtr, Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetOrthographicProjection(Vector2 size) {
-    NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_0(swigCPtr, Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetOrthographicProjection(float left, float right, float top, float bottom, float near, float far) {
-    NDalicPINVOKE.CameraActor_SetOrthographicProjection__SWIG_1(swigCPtr, left, right, top, bottom, near, far);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public string Type
-  {
-    get
-    {
-      string temp;
-      GetProperty( CameraActor.Property.TYPE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TYPE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string ProjectionMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( CameraActor.Property.PROJECTION_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.PROJECTION_MODE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float FieldOfView
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.FIELD_OF_VIEW).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.FIELD_OF_VIEW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float AspectRatio
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.ASPECT_RATIO).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.ASPECT_RATIO, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float NearPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.NEAR_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float FarPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.FAR_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.FAR_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float LeftPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.LEFT_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float RightPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.RIGHT_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float TopPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.TOP_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TOP_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float BottomPlaneDistance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.BOTTOM_PLANE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector3 TargetPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( CameraActor.Property.TARGET_POSITION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( CameraActor.Property.TARGET_POSITION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Matrix ProjectionMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.PROJECTION_MATRIX).Get(  temp );
-      return temp;
-    }
-}  public Matrix ViewMatrix
-  {
-    get
-    {
-      Matrix temp = new Matrix();
-      GetProperty( CameraActor.Property.VIEW_MATRIX).Get(  temp );
-      return temp;
     }
-}  public bool InvertYAxis
-  {
-    get
+
+    /// <summary>
+    /// Enumeration for type determination of how camera operates.
+    /// FreeLook : Camera orientation is taken from CameraActor
+    /// LookAtTarget : Camera is oriented to always look at a target
+    /// </summary>
+    public enum CameraType
     {
-      bool temp = false;
-      GetProperty( CameraActor.Property.INVERT_Y_AXIS).Get( ref temp );
-      return temp;
+        FreeLook,
+        LookAtTarget
     }
-    set
+
+    /// <summary>
+    /// Enumeration for projection modes.
+    /// PerspectiveProjection : Distance causes foreshortening; objects further from the camera appear smaller
+    /// OrthographicProjection : Relative distance from the camera does not affect the size of objects
+    /// </summary>
+    public enum ProjectionMode
     {
-      SetProperty( CameraActor.Property.INVERT_Y_AXIS, new Tizen.NUI.Property.Value( value ) );
+        PerspectiveProjection,
+        OrthographicProjection
     }
-  }
-
-}
 
 }
index 22205c8..9ea9bd4 100755 (executable)
-/** 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 />
+// 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
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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.
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class CheckBoxButton : Button {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// CheckBoxButton provides a check box button which user can check or uncheck.
+    /// By default, a CheckBoxButton emits a Button.Clicked event when the button changes its state to selected or unselected.
+    /// The button's appearance could be modified by Button.UnselectedImage, Button.BackgroundImage, Button.SelectedImage, 
+    /// Button.SelectedBackgroundImage, Button.DisabledBackgroundImage, Button.DisabledImage, and Button.DisabledSelectedImage. 
+    /// When the button is not disabled, if it's not selected it only shows the background image. 
+    /// The selected image is shown over the background image when the box is selected (background image is not replaced by \e selected image).
+    /// When the button is disabled, background image and selected image are replaced by disabled images.
+    /// /// </summary>
+    public class CheckBoxButton : Button
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal CheckBoxButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CheckBoxButton_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal CheckBoxButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CheckBoxButton_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CheckBoxButton obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(CheckBoxButton obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~CheckBoxButton() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~CheckBoxButton()
+        {
+            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_CheckBoxButton(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
+        /// <summary>
+        /// To make CheckBoxButton instance be disposed.
+        /// </summary>
+        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_CheckBoxButton(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  public CheckBoxButton () : this (NDalicPINVOKE.CheckBoxButton_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        /// <summary>
+        /// Creates an initialized CheckBoxButton
+        /// </summary>
+        public CheckBoxButton() : this(NDalicPINVOKE.CheckBoxButton_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-  }
-  public CheckBoxButton(CheckBoxButton checkBox) : this(NDalicPINVOKE.new_CheckBoxButton__SWIG_1(CheckBoxButton.getCPtr(checkBox)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        }
+        internal CheckBoxButton(CheckBoxButton checkBox) : this(NDalicPINVOKE.new_CheckBoxButton__SWIG_1(CheckBoxButton.getCPtr(checkBox)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public CheckBoxButton Assign(CheckBoxButton checkBox) {
-    CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_Assign(swigCPtr, CheckBoxButton.getCPtr(checkBox)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal CheckBoxButton Assign(CheckBoxButton checkBox)
+        {
+            CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_Assign(swigCPtr, CheckBoxButton.getCPtr(checkBox)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public new static CheckBoxButton DownCast(BaseHandle handle) {
-    CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal new static CheckBoxButton DownCast(BaseHandle handle)
+        {
+            CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+    }
 
 }
index 46c5d25..5cd6c98 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ChildPropertyRegistration : global::System.IDisposable {
+    internal class ChildPropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -46,7 +46,7 @@ public class ChildPropertyRegistration : global::System.IDisposable {
   }
 
 
-  public ChildPropertyRegistration(TypeRegistration registered, string name, int index, Property.Type type) : this(NDalicPINVOKE.new_ChildPropertyRegistration(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
+  public ChildPropertyRegistration(TypeRegistration registered, string name, int index, PropertyType type) : this(NDalicPINVOKE.new_ChildPropertyRegistration(TypeRegistration.getCPtr(registered), name, index, (int)type), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index ef4588a..0aafcc9 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum ClampState {
+    internal enum ClampState {
   NotClamped,
   ClampedToMin,
   ClampedToMax
index fb8fc53..537ef83 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ClampState2D : global::System.IDisposable {
+    internal class ClampState2D : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
diff --git a/src/Tizen.NUI/devel-src/ClippingModeType.cs b/src/Tizen.NUI/devel-src/ClippingModeType.cs
deleted file mode 100755 (executable)
index 6b6b071..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum ClippingModeType {
-  DISABLED,
-  CLIP_CHILDREN
-}
-
-}
index 0d79809..9b19875 100755 (executable)
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
 namespace Tizen.NUI
 {
-  using System;
-
-  public enum Colors
-  {
-    Red,
-    White,
-    Blue,
-    Green,
-    Black,
-    Yellow,
-    Magenta,
-    Cyan
-  }
-
-
-  public class Color
-  {
-
-    private float r;
-    private float g;
-    private float b;
-    private float a;
-
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     */
-    public Color()
-    {
-      r = 0.0f;
-      g = 0.0f;
-      b = 0.0f;
-      a = 0.0f;
-    }
 
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] red The Color r.
-     * @param [in] green The Color g.
-     * @param [in] blue The Color b.
-     * @param [in] alpha The Color a.
-     */
-    public Color(float red, float green, float blue, float alpha)
-    {
-      r = red;
-      g = green;
-      b = blue;
-      a = alpha;
-    }
+    using System;
 
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] o The Vector4 having r g b a components
-     */
-    public Color(Vector4 o)
+    /// <summary>
+    /// Color class
+    /// </summary>
+    public class Color : global::System.IDisposable
     {
-      r = o.r;
-      g = o.g;
-      b = o.b;
-      a = o.a;
-    }
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Color(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(Color obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Color()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        /// <summary>
+        /// To make Color instance be disposed.
+        /// </summary>
+        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_Vector4(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A Color containing the result of the addition</returns>
+        public static Color operator +(Color arg1, Color arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A Color containing the result of the subtraction</returns>
+        public static Color operator -(Color arg1, Color arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Target Value</param>
+        /// <returns>A Color containg the negation</returns>
+        public static Color operator -(Color arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A Color containing the result of the multiplication</returns>
+        public static Color operator *(Color arg1, Color arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A Color containing the result of the division</returns>
+        public static Color operator /(Color arg1, Color arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Array subscript operator overload.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        internal static Color GetColorFromPtr(global::System.IntPtr cPtr)
+        {
+            Color ret = new Color(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public Color() : this(NDalicPINVOKE.new_Vector4__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="r">red component</param>
+        /// <param name="g">green component</param>
+        /// <param name="b">blue component</param>
+        /// <param name="a">alpha component</param>
+        public Color(float r, float g, float b, float a) : this(NDalicPINVOKE.new_Vector4__SWIG_1(r, g, b, a), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Conversion constructor from an array of four floats.
+        /// </summary>
+        /// <param name="array">array Array of R,G,B,A</param>
+        public Color(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(array), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private Color Add(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_Add(swigCPtr, Color.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color AddAssign(Vector4 rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_AddAssign(swigCPtr, Color.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color Subtract(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_Subtract__SWIG_0(swigCPtr, Color.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color SubtractAssign(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_SubtractAssign(swigCPtr, Color.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color Multiply(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_Multiply__SWIG_0(swigCPtr, Color.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color MultiplyAssign(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Color.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color MultiplyAssign(float rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color Divide(Vector4 rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_Divide__SWIG_0(swigCPtr, Color.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        private Color DivideAssign(Color rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_DivideAssign__SWIG_0(swigCPtr, Color.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color DivideAssign(float rhs)
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_DivideAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Color Subtract()
+        {
+            Color ret = new Color(NDalicPINVOKE.Vector4_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check if two Color classes are same.
+        /// </summary>
+        /// <param name="rhs">A Color to be compared</param>
+        /// <returns>If two Colors are are same, then true.</returns>
+        public bool EqualTo(Color rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector4_EqualTo(swigCPtr, Color.getCPtr(rhs));
+
+            if (rhs == null) return false;
+
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check if two Color classes are different.
+        /// </summary>
+        /// <param name="rhs">A Color to be compared</param>
+        /// <returns>If two Colors are are different, then true.</returns>
+        public bool NotEqualTo(Color rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector4_NotEqualTo(swigCPtr, Color.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        private float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// red component
+        /// </summary>
+        public float R
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_r_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_r_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// green component
+        /// </summary>
+        public float G
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_g_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_g_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// blue component
+        /// </summary>
+        public float B
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_b_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_b_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// alpha component
+        /// </summary>
+        public float A
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_a_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_a_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get black colored Color class
+        /// </summary>
+        public static Color Black
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.BLACK_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get white colored Color class
+        /// </summary>
+        public static Color White
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.WHITE_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get red colored Color class
+        /// </summary>
+        public static Color Red
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.RED_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get green colored Color class
+        /// </summary>
+        public static Color Green
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.GREEN_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get blue colored Color class
+        /// </summary>
+        public static Color Blue
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.BLUE_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get yellow colored Color class
+        /// </summary>
+        public static Color Yellow
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.YELLOW_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get magenta colored Color class
+        /// </summary>
+        public static Color Magenta
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.MAGENTA_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get cyan colored Color class
+        /// </summary>
+        public static Color Cyan
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.CYAN_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Get transparent colored Color class
+        /// </summary>
+        public static Color Transparent
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.TRANSPARENT_get();
+                Color ret = (cPtr == global::System.IntPtr.Zero) ? null : new Color(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// convert Color class to Vector4 class implicitly.
+        /// </summary>
+        /// <param name="color">A Color to be converted to Vector4</param>
+        public static implicit operator Vector4(Color color)
+        {
+            return new Vector4(color.R, color.G, color.B, color.A);
+        }
+
+        /// <summary>
+        /// convert Vector4 class to Color class implicitly.
+        /// </summary>
+        /// <param name="vec">A Vector4 to be converted to Color</param></param>
+        public static implicit operator Color(Vector4 vec)
+        {
+            return new Color(vec.R, vec.G, vec.B, vec.A);
+        }
 
-
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] color as enum Colors.
-     */
-    public Color(Colors color)
-    {
-      switch (color)
-      {
-        case Colors.Red:
-          SetColor(1.0f, 0.0f, 0.0f, 1.0f);
-          break;
-        case Colors.White:
-          SetColor(1.0f, 1.0f, 1.0f, 1.0f);
-          break;
-        case Colors.Blue:
-          SetColor(0.0f, 0.0f, 1.0f, 1.0f);
-          break;
-        case Colors.Green:
-          SetColor(0.0f, 1.0f, 0.0f, 1.0f);
-          break;
-        case Colors.Black:
-          SetColor(0.0f, 0.0f, 0.0f, 1.0f);
-          break;
-        case Colors.Yellow:
-          SetColor(1.0f, 1.0f, 0.0f, 1.0f);
-          break;
-        case Colors.Cyan:
-          SetColor(0.0f, 1.0f, 1.0f, 1.0f);
-          break;
-        case Colors.Magenta:
-          SetColor(1.0f, 0.0f, 1.0f, 1.0f);
-          break;
-      }
     }
 
+}
 
-    /**
-     * @brief SetColor
-     *
-     * @since 1.0.0
-     * @param [in] red The Color r.
-     * @param [in] green The Color g.
-     * @param [in] blue The Color b.
-     * @param [in] alpha The Color a.
-     */
-    public void SetColor(float red, float green, float blue, float alpha)
-    {
-      r = red;
-      g = green;
-      b = blue;
-      a = alpha;
-    }
-
-    /**
-     * @brief name "R", type float (Color's Red component)
-     * @SINCE_1_0.0
-     */
-
-    public float R
-    {
-      get { return r; }
-      set { r = value; }
-    }
-
-    /**
-     * @brief name "G", type float (Color's Green component)
-     * @SINCE_1_0.0
-     */
-    public float G
-    {
-      get { return g; }
-      set { g = value; }
-    }
-
-    /**
-     * @brief name "B", type float (Color's Blue component)
-     * @SINCE_1_0.0
-     */
-    public float B
-    {
-      get { return b; }
-      set { b = value; }
-    }
-
-    /**
-     * @brief name "A", type float (Color's Alpha value)
-     * @SINCE_1_0.0
-     */
-    public float A
-    {
-      get { return a; }
-      set { a = value; }
-    }
-
-    /**
-     * @brief operator+
-     *
-     * @since 1.0.0
-     * @param [in] l The Color to add.
-     * @param [in] r The Color to add
-     * @return A reference to this
-     */
-    public static Color operator +(Color l, Color r)
-    {
-      return new Color(l.R + r.R, l.G + r.G, l.B + r.B, l.A + r.A);
-    }
-
-    /**
-     * @brief operator-
-     *
-     * @since 1.0.0
-     * @param [in] l The Color to substract.
-     * @param [in] r The Color to substract
-     * @return A reference to this
-     */
-    public static Color operator -(Color l, Color r)
-    {
-      return new Color(l.R - r.R, l.G - r.G, l.B - r.B, l.A - r.A);
-    }
-
-    /**
-     * @brief operator*
-     *
-     * @since 1.0.0
-     * @param [in] a The Color to multiply.
-     * @param [in] b The constant double to multiply.
-     * @return A reference to this
-     */
-    public static Color operator *(Color a, double b)
-    {
-      return new Color((float)(a.R * b), (float)(a.G * b), (float)(a.B * b), (float)(a.A * b));
-    }
-
-    /**
-     * @brief operator/
-     *
-     * @since 1.0.0
-     * @param [in] a The Color to divide.
-     * @param [in] b The Color to divide
-     * @return float value of division operation
-     */
-    public static float operator /(Color a, Color b)
-    {
-      return (float)System.Math.Sqrt((a.R / b.R) * (a.G / b.G) * (a.B / b.B) * (a.A / b.A));
-    }
-
-    /**
-     * @brief Operator ==
-     *
-     * @since 1.0.0
-     * @param [in] x The Color object to compare.
-     * @param [in] y The Color object to compare.
-     * @return bool, whether colors are equal or not
-     */
-    public static bool operator == (Color x, Color y)
-    {
-      return x.R == y.R && x.G == y.G && x.B == y.B && x.A == y.A;
-    }
-
-    /**
-     * @brief Operator !=
-     *
-     * @since 1.0.0
-     * @param [in] x The Color object to compare.
-     * @param [in] y The Color object to compare.
-     * @return bool, whether colors are equal or not
-     */
-    public static bool operator != (Color x, Color y)
-    {
-      return x.R != y.R || x.G != y.G || x.B != y.B || x.A != y.A;
-    }
-
-    /**
-     * @brief GetHashCode
-     *
-     * @since 1.0.0
-     * @return int, hascode of Color
-     */
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    /**
-     * @brief Clone
-     *
-     * @since 1.0.0
-     * @return Color object
-     */
-    public Color Clone()
-    {
-      Color copy = new Color(R, G, B, A);
-      return copy;
-    }
-
-    // Create a color for RGBA values ranging from 0..255, useful when dealing with HTML colors
-    static Color FromRgbaByte( byte red, byte green, byte blue, byte alpha )
-    {
-      return new Color ( red / 255,  green / 255, blue / 255, alpha / 255 );
-    }
-
-    // User-defined conversion from Color to Vector4
-    public static implicit operator Vector4(Color color)
-    {
-      return new Vector4(color.r, color.g, color.b, color.a);
-    }
-
-    public static implicit operator Color(Vector4 vec)
-    {
-      return new Color(vec.r, vec.g, vec.b, vec.a);
-    }
-
-    /**
-     * @brief name "White", type Color (White Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color White
-    {
-      get
-      {
-        return new Color(Colors.White);
-      }
-    }
-
-    /**
-     * @brief name "Black", type Color (Black Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Black
-    {
-      get
-      {
-        return new Color(Colors.Black);
-      }
-    }
-
-    /**
-     * @brief name "Red", type Color (Red Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Red
-    {
-      get
-      {
-        return new Color(Colors.Red);
-      }
-    }
-
-    /**
-     * @brief name "Green", type Color (Green Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Green
-    {
-      get
-      {
-        return new Color(Colors.Green);
-      }
-    }
-
-    /**
-     * @brief name "Blue", type Color (Blue Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Blue
-    {
-      get
-      {
-        return new Color(Colors.Blue);
-      }
-    }
-
-    /**
-     * @brief name "Yellow", type Color (Yellow Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Yellow
-    {
-      get
-      {
-        return new Color(Colors.Yellow);
-      }
-    }
-
-    /**
-     * @brief name "Magenta", type Color (Magenta Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Magenta
-    {
-      get
-      {
-        return new Color(Colors.Magenta);
-      }
-    }
 
-    /**
-     * @brief name "Cyan", type Color (Cyan Color object)
-     * @SINCE_1_0.0
-     */
-    public static Color Cyan
-    {
-      get
-      {
-        return new Color(Colors.Cyan);
-      }
-    }
-  }
-}
diff --git a/src/Tizen.NUI/devel-src/ColorMode.cs b/src/Tizen.NUI/devel-src/ColorMode.cs
deleted file mode 100755 (executable)
index 07f85b2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum ColorMode {
-  USE_OWN_COLOR,
-  USE_PARENT_COLOR,
-  USE_OWN_MULTIPLY_PARENT_COLOR,
-  USE_OWN_MULTIPLY_PARENT_ALPHA
-}
-
-}
index f7d2cd5..4473e9f 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ConnectionTracker : ConnectionTrackerInterface {
+    internal class ConnectionTracker : ConnectionTrackerInterface {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ConnectionTracker(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTracker_SWIGUpcast(cPtr), cMemoryOwn) {
index 7b2cfd8..7f651d7 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ConnectionTrackerInterface : SignalObserver {
+    internal class ConnectionTrackerInterface : SignalObserver {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ConnectionTrackerInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTrackerInterface_SWIGUpcast(cPtr), cMemoryOwn) {
index ec3f10e..32c7523 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ControlKeySignal : global::System.IDisposable {
+    internal class ControlKeySignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index f0490d3..f2c6cc0 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum ControlOrientationType {
+    internal enum ControlOrientationType {
   Up,
   Left,
   Down,
index 36b543e..2b2cfc1 100755 (executable)
@@ -35,7 +35,7 @@ public class CustomActorImpl : RefObject {
     }
   }
 
-  public CustomActor Self() {
+  internal CustomActor Self() {
     CustomActor ret = new CustomActor(NDalicPINVOKE.CustomActorImpl_Self(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -61,8 +61,8 @@ public class CustomActorImpl : RefObject {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public virtual void OnPropertySet(int index, Property.Value propertyValue) {
-    NDalicPINVOKE.CustomActorImpl_OnPropertySet(swigCPtr, index, Property.Value.getCPtr(propertyValue));
+  public virtual void OnPropertySet(int index, PropertyValue propertyValue) {
+    NDalicPINVOKE.CustomActorImpl_OnPropertySet(swigCPtr, index, PropertyValue.getCPtr(propertyValue));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -76,7 +76,7 @@ public class CustomActorImpl : RefObject {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
+  internal virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
     bool ret = NDalicPINVOKE.CustomActorImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
diff --git a/src/Tizen.NUI/devel-src/CustomAlgorithmInterface.cs b/src/Tizen.NUI/devel-src/CustomAlgorithmInterface.cs
new file mode 100755 (executable)
index 0000000..defb96b
--- /dev/null
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.12
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+#define DOT_NET_CORE
+
+#if (DOT_NET_CORE)
+using System.Reflection;
+#endif
+
+namespace Tizen.NUI {
+
+internal class CustomAlgorithmInterface : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal CustomAlgorithmInterface(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(CustomAlgorithmInterface obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~CustomAlgorithmInterface() {
+    Dispose();
+  }
+
+  public virtual void Dispose() {
+    lock(this) {
+      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
+        if (swigCMemOwn) {
+          swigCMemOwn = false;
+          NDalicPINVOKE.delete_CustomAlgorithmInterface(swigCPtr);
+        }
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+      }
+      global::System.GC.SuppressFinalize(this);
+    }
+  }
+
+  public virtual Actor GetNextFocusableActor(Actor current, Actor proposed, View.FocusDirection direction) {
+    Actor ret = new Actor(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, Actor.getCPtr(current), Actor.getCPtr(proposed), (int)direction), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public CustomAlgorithmInterface() : this(NDalicPINVOKE.new_CustomAlgorithmInterface(), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    SwigDirectorConnect();
+  }
+
+  private void SwigDirectorConnect() {
+    if (SwigDerivedClassHasMethod("GetNextFocusableActor", swigMethodTypes0))
+      swigDelegate0 = new SwigDelegateCustomAlgorithmInterface_0(SwigDirectorGetNextFocusableActor);
+    NDalicPINVOKE.CustomAlgorithmInterface_director_connect(swigCPtr, swigDelegate0);
+  }
+
+#if (DOT_NET_CORE)
+  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
+    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
+    bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(CustomAlgorithmInterface));
+    return hasDerivedMethod;
+  }
+#else
+  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
+    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
+    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(CustomAlgorithmInterface));
+    return hasDerivedMethod;
+  }
+#endif
+
+  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.FocusDirection)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.FocusDirection) };
+}
+
+}
index e38a29d..7f2acf5 100755 (executable)
  * limitations under the License.
  *
  */
-using System;
 
 namespace Tizen.NUI
 {
+    /// <summary>
+    /// CustomView provides some common functionality required by all views.
+    /// </summary>
     public class CustomView : ViewWrapper
     {
-        public CustomView(string typeName, ViewWrapperImpl.CustomViewBehaviour behaviour) : base(typeName, new ViewWrapperImpl(behaviour))
+        public CustomView(string typeName, CustomViewBehaviour behaviour) : base(typeName, new ViewWrapperImpl(behaviour))
         {
             // Registering CustomView virtual functions to viewWrapperImpl delegates.
             viewWrapperImpl.OnStageConnection = new ViewWrapperImpl.OnStageConnectionDelegate(OnStageConnection);
@@ -54,32 +56,31 @@ namespace Tizen.NUI
             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.GetNextKeyboardFocusableView = new ViewWrapperImpl.GetNextKeyboardFocusableViewDelegate(GetNextKeyboardFocusableView);
             viewWrapperImpl.OnKeyboardFocusChangeCommitted = new ViewWrapperImpl.OnKeyboardFocusChangeCommittedDelegate(OnKeyboardFocusChangeCommitted);
             viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyboardEnter);
             viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch);
             viewWrapperImpl.OnPan = new ViewWrapperImpl.OnPanDelegate(OnPan);
             viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap);
             viewWrapperImpl.OnLongPress = new ViewWrapperImpl.OnLongPressDelegate(OnLongPress);
-            viewWrapperImpl.SignalConnected = new ViewWrapperImpl.SignalConnectedDelegate(SignalConnected);
-            viewWrapperImpl.SignalDisconnected = new ViewWrapperImpl.SignalDisconnectedDelegate(SignalDisconnected);
+
+            // By default, we do not want the position to use the anchor point
+            this.PositionUsesAnchorPoint = false;
 
             // Make sure CustomView is initialized.
             OnInitialize();
 
-            // Make sure the style of actors/visuals initialized above are applied by the style manager.
-            viewWrapperImpl.ApplyThemeStyle();
-
-            //Console.WriteLine("[CustomView] CustomView()");          
-
+            // 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.
+            SetStyleName(this.GetType().Name);
         }
 
-        /**
-         * @brief Set the background with a property map.
-         *
-         * @param[in] map The background property map.
-         */
-        public void SetBackground(Tizen.NUI.Property.Map map)
+        /// <summary>
+        /// Set the background with a property map.
+        /// </summary>
+        /// <param name="map">The background property map</param>
+        public void SetBackground(Tizen.NUI.PropertyMap map)
         {
             viewWrapperImpl.SetBackground(map);
         }
@@ -105,34 +106,62 @@ namespace Tizen.NUI
          * @param[in]  type  The gesture type(s) to disable.
          * @see EnableGetureDetection
          */
-        public void DisableGestureDetection(Gesture.GestureType type)
+        internal void DisableGestureDetection(Gesture.GestureType type)
         {
             viewWrapperImpl.DisableGestureDetection(type);
         }
 
-        /**
-         * @brief Sets whether this control supports two dimensional
-         * keyboard navigation (i.e. whether it knows how to handle the
-         * keyboard focus movement between its child actors).
-         *
-         * The control doesn't support it by default.
-         * @param[in] isSupported Whether this control supports two dimensional keyboard navigation.
-         */
-        public void SetKeyboardNavigationSupport(bool isSupported)
+        /// <summary>
+        /// Sets whether this control supports two dimensional keyboard navigation
+        /// (i.e. whether it knows how to handle the keyboard focus movement between its child actors).
+        /// The control doesn't support it by default.
+        /// </summary>
+        /// <param name="isSupported">Whether this control supports two dimensional keyboard navigation.</param>
+        public bool FocusNavigationSupport
+        {
+            get
+            {
+                return IsKeyboardNavigationSupported();
+            }
+            set
+            {
+                SetKeyboardNavigationSupport(value);
+            }
+        }
+
+        internal void SetKeyboardNavigationSupport(bool isSupported)
         {
             viewWrapperImpl.SetKeyboardNavigationSupport(isSupported);
         }
 
+
         /**
          * @brief Gets whether this control supports two dimensional keyboard navigation.
          *
          * @return true if this control supports two dimensional keyboard navigation.
          */
-        public bool IsKeyboardNavigationSupported()
+        internal bool IsKeyboardNavigationSupported()
         {
             return viewWrapperImpl.IsKeyboardNavigationSupported();
         }
 
+
+        /// <summary>
+        /// Sets or Gets whether this control is a focus group for keyboard navigation.
+        /// </summary>
+        /// <returns>true if this control is set as a focus group for keyboard navigation</returns>
+        public bool FocusGroup
+        {
+            get
+            {
+                return IsKeyboardFocusGroup();
+            }
+            set
+            {
+                SetAsKeyboardFocusGroup(value);
+            }
+        }
+
         /**
          * @brief Sets whether this control is a focus group for keyboard navigation.
          *
@@ -140,7 +169,7 @@ namespace Tizen.NUI
          * can be limitied to its child actors). The control is not a focus group by default.
          * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation.
          */
-        public void SetAsKeyboardFocusGroup(bool isFocusGroup)
+        internal void SetAsKeyboardFocusGroup(bool isFocusGroup)
         {
             viewWrapperImpl.SetAsKeyboardFocusGroup(isFocusGroup);
         }
@@ -150,7 +179,7 @@ namespace Tizen.NUI
          *
          * @return true if this control is set as a focus group for keyboard navigation.
          */
-        public bool IsKeyboardFocusGroup()
+        internal bool IsKeyboardFocusGroup()
         {
             return viewWrapperImpl.IsKeyboardFocusGroup();
         }
@@ -159,26 +188,25 @@ namespace Tizen.NUI
          * @brief Called by the AccessibilityManager to activate the Control.
          * @SINCE_1_0.0
          */
-        public void AccessibilityActivate()
+        internal void AccessibilityActivate()
         {
             viewWrapperImpl.AccessibilityActivate();
         }
 
-        /**
-         * @brief Called by the KeyboardFocusManager.
-         */
-        public void KeyboardEnter()
+        /// <summary>
+        /// Called by the KeyboardFocusManager.
+        /// </summary>
+        internal void KeyboardEnter()
         {
             viewWrapperImpl.KeyboardEnter();
         }
 
-        /**
-         * @brief Called by the KeyInputFocusManager to emit key event signals.
-         *
-         * @param[in] key The key event.
-         * @return True if the event was consumed.
-         */
-        public bool EmitKeyEventSignal(Key key)
+        /// <summary>
+        /// Called by the KeyInputFocusManager to emit key event signals.
+        /// </summary>
+        /// <param name="key">The key event</param>
+        /// <returns>True if the event was consumed</returns>
+        internal bool EmitKeyEventSignal(Key key)
         {
             return viewWrapperImpl.EmitKeyEventSignal(key);
         }
@@ -205,7 +233,7 @@ namespace Tizen.NUI
          */
         protected float GetHeightForWidthBase(float width)
         {
-            return viewWrapperImpl.GetHeightForWidthBase( width );
+            return viewWrapperImpl.GetHeightForWidthBase(width);
         }
 
         /**
@@ -215,7 +243,7 @@ namespace Tizen.NUI
          */
         protected float GetWidthForHeightBase(float height)
         {
-            return viewWrapperImpl.GetWidthForHeightBase( height );
+            return viewWrapperImpl.GetWidthForHeightBase(height);
         }
 
         /**
@@ -227,7 +255,7 @@ namespace Tizen.NUI
          */
         protected float CalculateChildSizeBase(Actor child, DimensionType dimension)
         {
-            return viewWrapperImpl.CalculateChildSizeBase( child, dimension );
+            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);
         }
 
         /**
@@ -238,7 +266,7 @@ namespace Tizen.NUI
          */
         protected bool RelayoutDependentOnChildrenBase(DimensionType dimension)
         {
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase( dimension );
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);
         }
 
         /**
@@ -264,7 +292,7 @@ namespace Tizen.NUI
          */
         protected void RegisterVisual(int index, VisualBase visual)
         {
-            viewWrapperImpl.RegisterVisual( index, visual );
+            viewWrapperImpl.RegisterVisual(index, visual);
         }
 
         /**
@@ -280,7 +308,7 @@ namespace Tizen.NUI
          */
         protected void RegisterVisual(int index, VisualBase visual, bool enabled)
         {
-            viewWrapperImpl.RegisterVisual( index, visual, enabled );
+            viewWrapperImpl.RegisterVisual(index, visual, enabled);
         }
 
         /**
@@ -290,7 +318,7 @@ namespace Tizen.NUI
          */
         protected void UnregisterVisual(int index)
         {
-            viewWrapperImpl.UnregisterVisual( index );
+            viewWrapperImpl.UnregisterVisual(index);
         }
 
         /**
@@ -302,7 +330,7 @@ namespace Tizen.NUI
          */
         protected VisualBase GetVisual(int index)
         {
-            return viewWrapperImpl.GetVisual( index );
+            return viewWrapperImpl.GetVisual(index);
         }
 
         /**
@@ -313,7 +341,7 @@ namespace Tizen.NUI
          */
         protected void EnableVisual(int index, bool enable)
         {
-            viewWrapperImpl.EnableVisual( index, enable );
+            viewWrapperImpl.EnableVisual(index, enable);
         }
 
         /**
@@ -324,7 +352,7 @@ namespace Tizen.NUI
          */
         protected bool IsVisualEnabled(int index)
         {
-            return viewWrapperImpl.IsVisualEnabled( index );
+            return viewWrapperImpl.IsVisualEnabled(index);
         }
 
         /**
@@ -336,7 +364,7 @@ namespace Tizen.NUI
          */
         protected Animation CreateTransition(TransitionData transitionData)
         {
-            return viewWrapperImpl.CreateTransition( transitionData );
+            return viewWrapperImpl.CreateTransition(transitionData);
         }
 
         /**
@@ -348,7 +376,7 @@ namespace Tizen.NUI
          */
         protected void EmitKeyInputFocusSignal(bool focusGained)
         {
-            viewWrapperImpl.EmitKeyInputFocusSignal( focusGained );
+            viewWrapperImpl.EmitKeyInputFocusSignal(focusGained);
         }
 
         /**
@@ -358,7 +386,6 @@ namespace Tizen.NUI
          */
         public virtual void OnInitialize()
         {
-            //Console.WriteLine("[CustomView] OnInitialize()");                
         }
 
         /**
@@ -385,7 +412,6 @@ namespace Tizen.NUI
          */
         public virtual void OnStageConnection(int depth)
         {
-            //Console.WriteLine("[CustomView] OnStageConnection()");           
         }
 
         /**
@@ -435,7 +461,7 @@ namespace Tizen.NUI
          * @param[in] index The Property index that was set
          * @param[in] propertyValue The value to set
          */
-        public virtual void OnPropertySet(int index, Tizen.NUI.Property.Value propertyValue)
+        public virtual void OnPropertySet(int index, Tizen.NUI.PropertyValue propertyValue)
         {
         }
 
@@ -541,9 +567,9 @@ namespace Tizen.NUI
          *
          * @return The actor's natural size
          */
-        public virtual Vector3 GetNaturalSize()
+        public virtual Size GetNaturalSize()
         {
-            return new Vector3(0.0f, 0.0f, 0.0f);
+            return new Size(0.0f, 0.0f, 0.0f);
         }
 
         /**
@@ -555,7 +581,7 @@ namespace Tizen.NUI
          */
         public virtual float CalculateChildSize(Actor child, DimensionType dimension)
         {
-            return viewWrapperImpl.CalculateChildSizeBase( child, dimension );
+            return viewWrapperImpl.CalculateChildSizeBase(child, dimension);
         }
 
         /**
@@ -568,7 +594,7 @@ namespace Tizen.NUI
          */
         public virtual float GetHeightForWidth(float width)
         {
-            return viewWrapperImpl.GetHeightForWidthBase( width );
+            return viewWrapperImpl.GetHeightForWidthBase(width);
         }
 
         /**
@@ -581,7 +607,7 @@ namespace Tizen.NUI
          */
         public virtual float GetWidthForHeight(float height)
         {
-            return viewWrapperImpl.GetWidthForHeightBase( height );
+            return viewWrapperImpl.GetWidthForHeightBase(height);
         }
 
         /**
@@ -592,7 +618,7 @@ namespace Tizen.NUI
          */
         public virtual bool RelayoutDependentOnChildren(DimensionType dimension)
         {
-            return viewWrapperImpl.RelayoutDependentOnChildrenBase( dimension );
+            return viewWrapperImpl.RelayoutDependentOnChildrenBase(dimension);
         }
 
         /**
@@ -642,7 +668,7 @@ namespace Tizen.NUI
          * Derived classes should override this to perform custom accessibility activation.
          * @return true if this control can perform accessibility activation.
          */
-        public virtual bool OnAccessibilityActivated()
+        internal virtual bool OnAccessibilityActivated()
         {
             return false;
         }
@@ -654,7 +680,7 @@ namespace Tizen.NUI
          * @param[in] gesture The pan gesture.
          * @return true if the pan gesture has been consumed by this control
          */
-        public virtual bool OnAccessibilityPan(PanGesture gestures)
+        internal virtual bool OnAccessibilityPan(PanGesture gestures)
         {
             return false;
         }
@@ -666,7 +692,7 @@ namespace Tizen.NUI
          * @param[in] touch The touch event.
          * @return true if the touch event has been consumed by this control
          */
-        public virtual bool OnAccessibilityTouch(Touch touch)
+        internal virtual bool OnAccessibilityTouch(Touch touch)
         {
             return false;
         }
@@ -678,7 +704,7 @@ namespace Tizen.NUI
          * @param[in] isIncrease Whether the value should be increased or decreased
          * @return true if the value changed action has been consumed by this control
          */
-        public virtual bool OnAccessibilityValueChange(bool isIncrease)
+        internal virtual bool OnAccessibilityValueChange(bool isIncrease)
         {
             return false;
         }
@@ -689,7 +715,7 @@ namespace Tizen.NUI
          *
          * @return true if the zoom action has been consumed by this control
          */
-        public virtual bool OnAccessibilityZoom()
+        internal virtual bool OnAccessibilityZoom()
         {
             return false;
         }
@@ -722,10 +748,9 @@ namespace Tizen.NUI
          * @param[in] loopEnabled Whether the focus movement should be looped within the control.
          * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused.
          */
-        public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled)
+        public virtual View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)
         {
-            //Console.WriteLine("[CustomView] GetNextKeyboardFocusableActor()");               
-            return new Actor();
+            return new View();
         }
 
         /**
@@ -736,7 +761,7 @@ namespace Tizen.NUI
          *
          * @param[in] commitedFocusableActor The commited focusable actor.
          */
-        public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
+        public virtual void OnKeyboardFocusChangeCommitted(View commitedFocusableView)
         {
         }
 
@@ -763,7 +788,7 @@ namespace Tizen.NUI
          * @note Pinch detection should be enabled via EnableGestureDetection().
          * @see EnableGestureDetection
          */
-        public virtual void OnPinch(PinchGesture pinch)
+        internal virtual void OnPinch(PinchGesture pinch)
         {
         }
 
@@ -808,15 +833,7 @@ namespace Tizen.NUI
          * @note Long press detection should be enabled via EnableGestureDetection().
          * @see EnableGestureDetection
          */
-        public virtual void OnLongPress(LongPressGesture longPress)
-        {
-        }
-
-        private void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
-        {
-        }
-
-        private void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
+        internal virtual void OnLongPress(LongPressGesture longPress)
         {
         }
 
@@ -828,4 +845,12 @@ namespace Tizen.NUI
         {
         }
     }
+    public enum CustomViewBehaviour
+    {
+        ViewBehaviourDefault = 0,
+        DisableSizeNegotiation = 1 << 0,
+        RequiresKeyboardNavigationSupport = 1 << 5,
+        DisableStyleChangeSignals = 1 << 6,
+        LastViewBehaviourFlag
+    }
 }
diff --git a/src/Tizen.NUI/devel-src/CustomView/Spin.cs b/src/Tizen.NUI/devel-src/CustomView/Spin.cs
new file mode 100755 (executable)
index 0000000..69e9f6a
--- /dev/null
@@ -0,0 +1,377 @@
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+//\r
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
+// Some have been manually changed\r
+\r
+using System;\r
+using System.Runtime.InteropServices;\r
+using Tizen.NUI;\r
+\r
+// A spin control (for continously changing values when users can easily predict a set of values)\r
+\r
+namespace Tizen.NUI\r
+{\r
+    ///<summary>\r
+    ///Spin CustomView class\r
+    /// </summary>\r
+    public class Spin : CustomView\r
+    {\r
+        private VisualBase _arrowVisual;\r
+        private TextField _textField;\r
+        private int _arrowVisualPropertyIndex;\r
+        private string _arrowImage;\r
+        private int _currentValue;\r
+        private int _minValue;\r
+        private int _maxValue;\r
+        private int _singleStep;\r
+        private bool _wrappingEnabled;\r
+        private string _fontFamily;\r
+        private string _fontStyle;\r
+        private int _pointSize;\r
+        private Color _textColor;\r
+        private Color _textBackgroundColor;\r
+        private int _maxTextLength;\r
+\r
+        // Called by DALi Builder if it finds a Spin control in a JSON file\r
+        static CustomView CreateInstance()\r
+        {\r
+            return new Spin();\r
+        }\r
+\r
+        // static constructor registers the control type (only runs once)\r
+        static Spin()\r
+        {\r
+            // ViewRegistry registers control type with DALi type registery\r
+            // also uses introspection to find any properties that need to be registered with type registry\r
+            ViewRegistry.Instance.Register(CreateInstance, typeof(Spin));\r
+        }\r
+\r
+        public Spin() : base(typeof(Spin).Name, CustomViewBehaviour.RequiresKeyboardNavigationSupport)\r
+        {\r
+\r
+        }\r
+\r
+        /// <summary>\r
+        /// Override method of OnInitialize() for CustomView class.\r
+        /// This method is called after the Control has been initialized.\r
+        /// Derived classes should do any second phase initialization by overriding this method.\r
+        /// </summary>\r
+        public override void OnInitialize()\r
+        {\r
+            // Initialize the propertiesControl\r
+            _arrowImage = "/home/owner/apps_rw/NUISamples.TizenTV/res/images/arrow.png";\r
+            _textBackgroundColor = new Color(0.6f, 0.6f, 0.6f, 1.0f);\r
+            _currentValue = 0;\r
+            _minValue = 0;\r
+            _maxValue = 0;\r
+            _singleStep = 1;\r
+            _maxTextLength = 0;\r
+\r
+            // Create image visual for the arrow keys\r
+            _arrowVisualPropertyIndex = RegisterProperty("ArrowImage", new PropertyValue(_arrowImage), Tizen.NUI.PropertyAccessMode.ReadWrite);\r
+            _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150));\r
+            RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual);\r
+\r
+            // Create a text field\r
+            _textField = new TextField();\r
+            _textField.ParentOrigin = Tizen.NUI.ParentOrigin.Center;\r
+            _textField.AnchorPoint = Tizen.NUI.AnchorPoint.Center;\r
+            _textField.WidthResizePolicy = ResizePolicyType.SizeRelativeToParent;\r
+            _textField.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent;\r
+            _textField.SizeModeFactor = new Vector3(1.0f, 0.45f, 1.0f);\r
+            _textField.PlaceholderText = "----";\r
+            _textField.BackgroundColor = _textBackgroundColor;\r
+            _textField.HorizontalAlignment = "Center";\r
+            _textField.VerticalAlignment = "Center";\r
+            _textField.Focusable = (true);\r
+            _textField.Name = "_textField";\r
+\r
+            this.Add(_textField);\r
+\r
+            _textField.FocusGained += TextFieldKeyInputFocusGained;\r
+            _textField.FocusLost += TextFieldKeyInputFocusLost;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Override method of GetNaturalSize() for CustomView class.\r
+        /// Return the natural size of the actor.\r
+        /// </summary>\r
+        /// <returns> Natural size of this Spin itself</returns>\r
+        public override Size GetNaturalSize()\r
+        {\r
+            return new Size(150.0f, 150.0f, 0.0f);\r
+        }\r
+\r
+        /// <summary>\r
+        /// Event handler when the TextField in Spin gets the Key focus\r
+        /// Make sure when the current spin that takes input focus also takes the keyboard focus\r
+        /// For example, when you tap the spin directly\r
+        /// </summary>\r
+        /// <param name="source">Sender of this event</param>\r
+        /// <param name="e">Event arguments</param>\r
+        public void TextFieldKeyInputFocusGained(object source, EventArgs e)\r
+        {\r
+            FocusManager.Instance.SetCurrentFocusView(_textField);\r
+        }\r
+\r
+        /// <summary>\r
+        /// Event handler when the TextField in Spin looses it's Key focus\r
+        /// </summary>\r
+        /// <param name="source"></param>\r
+        /// <param name="e"></param>\r
+        public void TextFieldKeyInputFocusLost(object source, EventArgs e)\r
+        {\r
+            int previousValue = _currentValue;\r
+\r
+            // If the input value is invalid, change it back to the previous valid value\r
+            if (int.TryParse(_textField.Text, out _currentValue))\r
+            {\r
+                if (_currentValue < _minValue || _currentValue > _maxValue)\r
+                {\r
+                    _currentValue = previousValue;\r
+                }\r
+            }\r
+            else\r
+            {\r
+                _currentValue = previousValue;\r
+            }\r
+\r
+            // Otherwise take the new value\r
+            this.Value = _currentValue;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Override method of GetNextKeyboardFocusableView() for CustomView class.\r
+        /// Gets the next key focusable view in this View towards the given direction.\r
+        /// A View needs to override this function in order to support two dimensional key navigation.\r
+        /// </summary>\r
+        /// <param name="currentFocusedView">The current focused view</param>\r
+        /// <param name="direction">The direction to move the focus towards</param>\r
+        /// <param name="loopEnabled">Whether the focus movement should be looped within the control</param>\r
+        /// <returns>The next keyboard focusable view in this control or an empty handle if no view can be focused</returns>\r
+        public override View GetNextKeyboardFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)\r
+        {\r
+            // Respond to Up/Down keys to change the value while keeping the current spin focused\r
+            View nextFocusedView = currentFocusedView;\r
+            if (direction == View.FocusDirection.Up)\r
+            {\r
+                this.Value += this.Step;\r
+                nextFocusedView = _textField;\r
+            }\r
+            else if (direction == View.FocusDirection.Down)\r
+            {\r
+                this.Value -= this.Step;\r
+                nextFocusedView = _textField;\r
+            }\r
+            else\r
+            {\r
+                // Return a native empty handle as nothing can be focused in the left or right\r
+                nextFocusedView = new View();\r
+                nextFocusedView.Reset();\r
+            }\r
+\r
+            return nextFocusedView;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Value to be set in Spin\r
+        /// </summary>\r
+        [ScriptableProperty()]\r
+        public int Value\r
+        {\r
+            get\r
+            {\r
+                return _currentValue;\r
+            }\r
+            set\r
+            {\r
+\r
+                Console.WriteLine("Value set to " + value);\r
+                _currentValue = value;\r
+\r
+                // Make sure no invalid value is accepted\r
+                if (_currentValue < _minValue)\r
+                {\r
+                    _currentValue = _minValue;\r
+                }\r
+\r
+                if (_currentValue > _maxValue)\r
+                {\r
+                    _currentValue = _maxValue;\r
+                }\r
+\r
+                _textField.Text = _currentValue.ToString();\r
+            }\r
+        }\r
+        \r
+        /// <summary>\r
+        /// Minimum Value of Spin Value\r
+        /// </summary>\r
+        // MinValue property of type int:\r
+        [ScriptableProperty()]\r
+        public int MinValue\r
+        {\r
+            get\r
+            {\r
+                return _minValue;\r
+            }\r
+            set\r
+            {\r
+                _minValue = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Maximum Value of Spin Value\r
+        /// </summary>\r
+        // MaxValue property of type int:\r
+        [ScriptableProperty()]\r
+        public int MaxValue\r
+        {\r
+            get\r
+            {\r
+                return _maxValue;\r
+            }\r
+            set\r
+            {\r
+                _maxValue = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        ///  Increasing, decresing step of Spin Value when Up or Down key is pressed\r
+        /// </summary>\r
+        // Step property of type int:\r
+        [ScriptableProperty()]\r
+        public int Step\r
+        {\r
+            get\r
+            {\r
+                return _singleStep;\r
+            }\r
+            set\r
+            {\r
+                _singleStep = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Wrapping enabled status\r
+        /// </summary>\r
+        // WrappingEnabled property of type bool:\r
+        [ScriptableProperty()]\r
+        public bool WrappingEnabled\r
+        {\r
+            get\r
+            {\r
+                return _wrappingEnabled;\r
+            }\r
+            set\r
+            {\r
+                _wrappingEnabled = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        ///  Text point size of Spin Value\r
+        /// </summary>\r
+        // TextPointSize property of type int:\r
+        [ScriptableProperty()]\r
+        public int TextPointSize\r
+        {\r
+            get\r
+            {\r
+                return _pointSize;\r
+            }\r
+            set\r
+            {\r
+                _pointSize = value;\r
+                _textField.PointSize = _pointSize;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// The color of Spin Value\r
+        /// </summary>\r
+        // TextColor property of type Color:\r
+        [ScriptableProperty()]\r
+        public Color TextColor\r
+        {\r
+            get\r
+            {\r
+                return _textColor;\r
+            }\r
+            set\r
+            {\r
+                Console.WriteLine("TextColor set to " + value.R + "," + value.G + "," + value.B);\r
+\r
+                _textColor = value;\r
+                _textField.TextColor = _textColor;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Maximum text lengh of Spin Value\r
+        /// </summary>\r
+        // MaxTextLength property of type int:\r
+        [ScriptableProperty()]\r
+        public int MaxTextLength\r
+        {\r
+            get\r
+            {\r
+                return _maxTextLength;\r
+            }\r
+            set\r
+            {\r
+                _maxTextLength = value;\r
+                _textField.MaxLength = _maxTextLength;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Reference of TextField of Spin\r
+        /// </summary>\r
+        public TextField SpinText\r
+        {\r
+            get\r
+            {\r
+                return _textField;\r
+            }\r
+            set\r
+            {\r
+                _textField = value;\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Show indicator image, for example Up/Down Arrow image.\r
+        /// </summary>\r
+        // Indicator property of type string:\r
+        public string IndicatorImage\r
+        {\r
+            get\r
+            {\r
+                return _arrowImage;\r
+            }\r
+            set\r
+            {\r
+                _arrowImage = value;\r
+                _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150));\r
+                RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual);\r
+            }\r
+        }\r
+    }\r
+}\r
diff --git a/src/Tizen.NUI/devel-src/CustomView/VisualView.cs b/src/Tizen.NUI/devel-src/CustomView/VisualView.cs
new file mode 100755 (executable)
index 0000000..6665c81
--- /dev/null
@@ -0,0 +1,178 @@
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+// http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+\r
+namespace Tizen.NUI\r
+{\r
+    using System;\r
+    using System.Runtime.InteropServices;\r
+    using System.Collections.Generic;\r
+    using System.Linq;\r
+\r
+    /// <summary>\r
+    /// A visual view control for user add any visual to it.\r
+    /// Example:\r
+    /// VisualView _visualView = new VisualView();\r
+    /// ImageVisualMap imageVisualMap1 = new ImageVisualMap();\r
+    /// imageVisualMap1.URL = "./NUISample/res/images/image-1.jpg";\r
+    /// imageVisualMap1.VisualSize = new Vector2( 300.0f, 300.0f );\r
+    /// imageVisualMap1.Offset = new Vector2( 50.0f, 50.0f );\r
+    /// imageVisualMap1.OffsetSizeMode = new Vector4( 1.0f, 1.0f, 1.0f, 1.0f );\r
+    /// imageVisualMap1.Origin = AlignType.TOP_BEGIN;\r
+    /// imageVisualMap1.AnchorPoint = AlignType.TOP_BEGIN;\r
+    /// _visualView.AddVisual("imageVisual1", imageVisualMap1);\r
+    /// </summary>\r
+    public class VisualView : CustomView\r
+    {\r
+        //private LinkedList<VisualBase> _visualList = null;\r
+        private Dictionary<int, VisualBase> _visualDictionary = null;\r
+        private Dictionary<int, PropertyMap> _tranformDictionary = null;\r
+\r
+        static CustomView CreateInstance()\r
+        {\r
+            return new VisualView();\r
+        }\r
+\r
+        // static constructor registers the control type (for user can add kinds of visuals to it)\r
+        static VisualView()\r
+        {\r
+            // ViewRegistry registers control type with DALi type registery\r
+            // also uses introspection to find any properties that need to be registered with type registry\r
+            ViewRegistry.Instance.Register(CreateInstance, typeof(VisualView));\r
+        }\r
+\r
+        public VisualView() : base(typeof(VisualView).Name, CustomViewBehaviour.ViewBehaviourDefault)\r
+        {\r
+        }\r
+\r
+        /// <summary>\r
+        /// Override the parent method.\r
+        /// </summary>\r
+        public override void OnInitialize()\r
+        {\r
+            //Initialize empty\r
+            _visualDictionary = new Dictionary<int, VisualBase>();\r
+            _tranformDictionary = new Dictionary<int, PropertyMap>();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Add or update a visual to visual view.\r
+        /// </summary>\r
+        /// <param name="visualName"> The name of visual to add. If add a existed visual name, the visual will be replaced. </param>\r
+        /// <param name="visualMap"> The property map of visual to create.  </param>\r
+        public void AddVisual(string visualName, VisualMap visualMap)\r
+        {\r
+            VisualBase visual = null;\r
+            int visualIndex = -1;\r
+\r
+            /* If the visual had added, then replace it using RegisterVusal. */\r
+            //visual.Name = name;\r
+            foreach (var item in _visualDictionary)\r
+            {\r
+                if (item.Value.Name == visualName)\r
+                {\r
+                    /* Find a existed visual, its key also exited. */\r
+                    visualIndex = item.Key;\r
+                    UnregisterVisual(visualIndex);\r
+                    _visualDictionary.Remove(visualIndex);\r
+                    _tranformDictionary.Remove(visualIndex);\r
+                    break;\r
+                }\r
+            }\r
+\r
+            if (visualIndex == -1) // The visual is a new one, create index for it. */\r
+            {\r
+                visualIndex = RegisterProperty(visualName, new PropertyValue(visualName), PropertyAccessMode.ReadWrite);\r
+            }\r
+\r
+            if (visualIndex > 0)\r
+            {\r
+                visual = VisualFactory.Get().CreateVisual(visualMap.OutputVisualMap); // Create a visual for the new one.\r
+                visual.Name = visualName;\r
+                visual.DepthIndex = visualMap.DepthIndex;\r
+\r
+                RegisterVisual(visualIndex, visual);\r
+\r
+                _visualDictionary.Add(visualIndex, visual);\r
+                _tranformDictionary.Add(visualIndex, visualMap.OutputTransformMap);\r
+\r
+                RelayoutRequest();\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Remove a visual by name.\r
+        /// </summary>\r
+        /// <param name="visualName"> The name of visual to remove. </param>\r
+        public void RemoveVisual(string visualName)\r
+        {\r
+            foreach (var item in _visualDictionary)\r
+            {\r
+                if (item.Value.Name == visualName)\r
+                {\r
+                    EnableVisual(item.Key, false);\r
+                    UnregisterVisual(item.Key);\r
+                    _tranformDictionary.Remove(item.Key);\r
+                    _visualDictionary.Remove(item.Key);\r
+\r
+                    RelayoutRequest();\r
+                    break;\r
+                }\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// A visual view control for user add any visual to it.\r
+        /// </summary>\r
+        /// <returns> The number of visuals. </returns>\r
+        public int NumberOfVisuals()\r
+        {\r
+            return _visualDictionary.Count;\r
+        }\r
+\r
+        /// <summary>\r
+        /// Remove all visuals of visual view.\r
+        /// </summary>\r
+        public void RemoveAll()\r
+        {\r
+            foreach (var item in _visualDictionary)\r
+            {\r
+                EnableVisual(item.Key, false);\r
+                UnregisterVisual(item.Key);\r
+            }\r
+            _visualDictionary.Clear();\r
+            _tranformDictionary.Clear();\r
+            RelayoutRequest();\r
+        }\r
+\r
+        /// <summary>\r
+        /// Override method of OnRelayout() for CustomView class.\r
+        /// Called after the size negotiation has been finished for this control.\r
+        /// The control is expected to assign this given size to itself/its children.\r
+        /// 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.\r
+        /// Note! As this function is called from inside the size negotiation algorithm, you cannot call RequestRelayout (the call would just be ignored)\r
+        /// </summary>\r
+        /// <param name="size">The allocated size</param>\r
+        /// <param name="container">The control should add actors to this container that it is not able to allocate a size for.</param>\r
+        public override void OnRelayout(Vector2 size, RelayoutContainer container)\r
+        {\r
+            foreach (var item in _visualDictionary)\r
+            {\r
+                item.Value.SetTransformAndSize(_tranformDictionary[item.Key], size);\r
+                EnableVisual(item.Key, true);\r
+            }\r
+        }\r
+    }\r
+\r
+}\r
diff --git a/src/Tizen.NUI/devel-src/DaliApplication.cs b/src/Tizen.NUI/devel-src/DaliApplication.cs
deleted file mode 100755 (executable)
index 10815f4..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-using System;
-using Tizen.NUI;
-
-//------------------------------------------------------------------------------
-// This file can only run on Tizen target. You should compile it with hello-test.cs, and
-// add tizen c# application related library as reference.
-//------------------------------------------------------------------------------
-namespace Tizen.Applications
-{
-    /// <summary>
-    /// Represents an application that have UI screen. The DaliApplication class has a default stage.
-    /// </summary>
-    public class DaliApplication : CoreUIApplication
-    {
-        /// <summary>
-        /// The instance of the Dali Application.
-        /// </summary>
-        /// <remarks>
-        /// This application is created before OnCreate() or created event. And the DaliApplication will be terminated when this application is closed.
-        /// </remarks>
-        protected Tizen.NUI.Application application;
-
-        /// <summary>
-        /// The instance of the Dali Application extension.
-        /// </summary>
-        protected Tizen.NUI.ApplicationExtensions applicationExt;
-
-        /// <summary>
-        /// Store the stylesheet value.
-        /// </summary>
-        protected string m_stylesheet;
-
-        /// <summary>
-        /// Store the window mode value.
-        /// </summary>
-        protected Tizen.NUI.Application.WINDOW_MODE m_windowMode;
-
-        /// <summary>
-        /// Store the app mode value.
-        /// </summary>
-        protected APP_MODE appMode;
-
-        /// <summary>
-        /// The instance of the Dali Stage.
-        /// </summary>
-        public Stage stage { get; private set; }
-
-        /// <summary>
-        /// The default constructor.
-        /// </summary>
-        public DaliApplication():base()
-        {
-            appMode = APP_MODE.DEFAULT;
-        }
-
-        /// <summary>
-        /// The constructor with stylesheet.
-        /// </summary>
-        public DaliApplication(string stylesheet):base()
-        {
-            //handle the stylesheet
-            appMode = APP_MODE.STYLESHEETONLY;
-            m_stylesheet = stylesheet;
-        }
-
-        /// <summary>
-        /// The constructor with stylesheet and window mode.
-        /// </summary>
-        public DaliApplication(string stylesheet, Tizen.NUI.Application.WINDOW_MODE windowMode)
-            : base()
-        {
-            //handle the stylesheet and windowMode
-            appMode = APP_MODE.STYLESHEETWITHWINDOWMODE;
-            m_stylesheet = stylesheet;
-            m_windowMode = windowMode;
-        }
-
-        /// <summary>
-        /// Overrides this method if want to handle behavior before calling OnCreate().
-        /// stage property is initialized in this overrided method.
-        /// </summary>
-        protected override void OnPreCreate()
-        {
-            switch(appMode)
-            {
-                case APP_MODE.DEFAULT:
-                    application = Tizen.NUI.Application.NewApplication();
-                    break;
-                case APP_MODE.STYLESHEETONLY:
-                    application = Tizen.NUI.Application.NewApplication(m_stylesheet);
-                    break;
-                case APP_MODE.STYLESHEETWITHWINDOWMODE:
-                    application = Tizen.NUI.Application.NewApplication(m_stylesheet, m_windowMode);
-                    break;
-                default:
-                    break;
-            }
-
-            applicationExt = new Tizen.NUI.ApplicationExtensions(application);
-            applicationExt.Init();
-
-            stage = Stage.GetCurrent();
-            stage.SetBackgroundColor( NDalic.WHITE );
-        }
-
-        /// <summary>
-        /// Overrides this method if want to handle behavior.
-        /// </summary>
-        protected override void OnTerminate()
-        {
-            base.OnTerminate();
-            applicationExt.Terminate();
-        }
-
-        /// <summary>
-        /// Overrides this method if want to handle behavior.
-        /// </summary>
-        protected override void OnPause()
-        {
-            base.OnPause();
-            applicationExt.Pause();
-        }
-
-        /// <summary>
-        /// Overrides this method if want to handle behavior.
-        /// </summary>
-        protected override void OnResume()
-        {
-            base.OnResume();
-            applicationExt.Resume();
-        }
-
-        /// <summary>
-        /// Overrides this method if want to handle behavior.
-        /// </summary>
-        protected override void OnLocaleChanged(LocaleChangedEventArgs e)
-        {
-            base.OnLocaleChanged(e);
-            applicationExt.LanguageChange();
-        }
-
-        /// <summary>
-        /// The mode of creating Dali application.
-        /// </summary>
-        protected enum APP_MODE
-        {
-            DEFAULT = 0,
-            STYLESHEETONLY = 1,
-            STYLESHEETWITHWINDOWMODE = 2
-        }
-    }
-}
index 5d1f67c..7b56c45 100755 (executable)
@@ -19,7 +19,6 @@ namespace Tizen.NUI
 {
   namespace Constants
   {
-
     public enum TextureType
     {
       Texture2D     = Tizen.NUI.TextureType.TEXTURE_2D,   ///< One 2D image                            @SINCE_1_1.43
@@ -34,177 +33,17 @@ namespace Tizen.NUI
       StereoInterlaced  = Tizen.NUI.ViewMode.STEREO_INTERLACED  ///< @DEPRECATED_1_1.19 @brief Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames. @SINCE_1_0.0
     }
 
-    public enum MeshVisualShadingModeValue
-    {
-      TexturelessWithDiffuseLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURELESS_WITH_DIFFUSE_LIGHTING,       ///< *Simplest*. One color that is lit by ambient and diffuse lighting. @SINCE_1_1.45
-      TexturedWithSpecularLigting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_SPECULAR_LIGHTING,         ///< Uses only the visual image textures provided with specular lighting in addition to ambient and diffuse lighting. @SINCE_1_1.45
-      TexturedWithDetailedSpecularLighting = Tizen.NUI.MeshVisualShadingModeValue.TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING ///< Uses all textures provided including a gloss, normal and texture map along with specular, ambient and diffuse lighting. @SINCE_1_1.45
-    }
-
-    public enum ProjectionMode
-    {
-      PerspectiveProjection  = Tizen.NUI.ProjectionMode.PERSPECTIVE_PROJECTION,      ///< Distance causes foreshortening; objects further from the camera appear smaller @SINCE_1_0.0
-      OrthographicProjection = Tizen.NUI.ProjectionMode.ORTHOGRAPHIC_PROJECTION      ///< Relative distance from the camera does not affect the size of objects @SINCE_1_0.0
-    }
-
-    public struct ParentOrigin
-    {
-      public static readonly float Top = NDalic.ParentOriginTop;
-      public static readonly float Bottom = NDalic.ParentOriginBottom;
-      public static readonly float Left = NDalic.ParentOriginLeft;
-      public static readonly float Right = NDalic.ParentOriginRight;
-      public static readonly float Middle = NDalic.ParentOriginMiddle;
-      public static readonly Tizen.NUI.Vector3 TopLeft = NDalic.ParentOriginTopLeft;
-      public static readonly Tizen.NUI.Vector3 TopCenter = NDalic.ParentOriginTopCenter;
-      public static readonly Tizen.NUI.Vector3 TopRight = NDalic.ParentOriginTopRight;
-      public static readonly Tizen.NUI.Vector3 CenterLeft = NDalic.ParentOriginCenterLeft;
-      public static readonly Tizen.NUI.Vector3 Center = NDalic.ParentOriginCenter;
-      public static readonly Tizen.NUI.Vector3 CenterRight = NDalic.ParentOriginCenterRight;
-      public static readonly Tizen.NUI.Vector3 BottomLeft = NDalic.ParentOriginBottomLeft;
-      public static readonly Tizen.NUI.Vector3 BottomCenter = NDalic.ParentOriginBottomCenter;
-      public static readonly Tizen.NUI.Vector3 BottomRight = NDalic.ParentOriginBottomRight;
-    }
-
-    public struct AnchorPoint
-    {
-      public static readonly float Top = NDalic.AnchorPointTop;
-      public static readonly float Bottom = NDalic.AnchorPointBottom;
-      public static readonly float Left = NDalic.AnchorPointLeft;
-      public static readonly float Right = NDalic.AnchorPointRight;
-      public static readonly float Middle = NDalic.AnchorPointMiddle;
-      public static readonly Tizen.NUI.Vector3 TopLeft = NDalic.AnchorPointTopLeft;
-      public static readonly Tizen.NUI.Vector3 TopCenter = NDalic.AnchorPointTopCenter;
-      public static readonly Tizen.NUI.Vector3 TopRight = NDalic.AnchorPointTopRight;
-      public static readonly Tizen.NUI.Vector3 CenterLeft = NDalic.AnchorPointCenterLeft;
-      public static readonly Tizen.NUI.Vector3 Center = NDalic.AnchorPointCenter;
-      public static readonly Tizen.NUI.Vector3 CenterRight = NDalic.AnchorPointCenterRight;
-      public static readonly Tizen.NUI.Vector3 BottomLeft = NDalic.AnchorPointBottomLeft;
-      public static readonly Tizen.NUI.Vector3 BottomCenter = NDalic.AnchorPointBottomCenter;
-      public static readonly Tizen.NUI.Vector3 BottomRight = NDalic.AnchorPointBottomRight;
-    }
-
-    public struct Vect3
-    {
-      public static readonly Tizen.NUI.Vector3 One = Tizen.NUI.Vector3.ONE;
-      public static readonly Tizen.NUI.Vector3 Xaxis = Tizen.NUI.Vector3.XAXIS;
-      public static readonly Tizen.NUI.Vector3 Yaxis = Tizen.NUI.Vector3.YAXIS;
-      public static readonly Tizen.NUI.Vector3 Zaxis = Tizen.NUI.Vector3.ZAXIS;
-      public static readonly Tizen.NUI.Vector3 NegativeXaxis = Tizen.NUI.Vector3.NEGATIVE_XAXIS;
-      public static readonly Tizen.NUI.Vector3 NegativeYaxis = Tizen.NUI.Vector3.NEGATIVE_YAXIS;
-      public static readonly Tizen.NUI.Vector3 NegativeZaxis = Tizen.NUI.Vector3.NEGATIVE_ZAXIS;
-      public static readonly Tizen.NUI.Vector3 Zero = Tizen.NUI.Vector3.ZERO;
-    }
-
-    public struct Visual
+    public struct Direction
     {
       public enum Type
       {
-        Border = Tizen.NUI.VisualType.BORDER,
-        Color = Tizen.NUI.VisualType.COLOR,
-        Gradient = Tizen.NUI.VisualType.GRADIENT,
-        Image = Tizen.NUI.VisualType.IMAGE,
-        Mesh = Tizen.NUI.VisualType.MESH,
-        Primitive = Tizen.NUI.VisualType.PRIMITIVE,
-        WireFrame = Tizen.NUI.VisualType.WIREFRAME,
-        Text = Tizen.NUI.VisualType.TEXT
-      }
-
-      public struct Property
-      {
-        public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE;
-        public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER;
-        public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM;
-        public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA;
-        public static readonly int MixCOlor = NDalic.VISUAL_PROPERTY_MIX_COLOR;
-      }
-
-      public struct ShaderProperty
-      {
-        public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX;
-        public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT;
-        public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X;
-        public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y;
-        public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS;
+        LeftToRight = Tizen.NUI.DirectionType.LEFT_TO_RIGHT,
+        RightToLeft = Tizen.NUI.DirectionType.RIGHT_TO_LEFT
       }
     }
 
-    public struct BorderVisualProperty
-    {
-      public static readonly int Color = NDalic.BORDER_VISUAL_COLOR;
-      public static readonly int Size = NDalic.BORDER_VISUAL_SIZE;
-      public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING;
-    }
 
-    public struct ColorVisualProperty
-    {
-      public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR;
-    }
 
-    public struct GradientVisualProperty
-    {
-      public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION;
-      public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION;
-      public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER;
-      public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS;
-      public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET;
-      public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR;
-      public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS;
-      public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD;
-    }
-
-    public struct ImageVisualProperty
-    {
-      public static readonly int URL = NDalic.IMAGE_VISUAL_URL;
-      public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE;
-      public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE;
-      public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH;
-      public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT;
-      public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING;
-      public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY;
-      public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA;
-      public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U;
-      public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V;
-    }
-
-    public struct MeshVisualProperty
-    {
-      public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL;
-      public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL;
-      public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH;
-      public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE;
-      public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING;
-      public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS;
-      public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION;
-    }
-
-    public struct PrimitiveVisualProperty
-    {
-      public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE;
-      public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR;
-      public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES;
-      public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS;
-      public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS;
-      public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS;
-      public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT;
-      public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS;
-      public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS;
-      public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE;
-      public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS;
-      public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION;
-    }
-
-    public struct TextVisualProperty
-    {
-      public static readonly int Text = NDalic.TEXT_VISUAL_TEXT;
-      public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY;
-      public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE;
-      public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE;
-      public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE;
-      public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT;
-      public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT;
-      public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR;
-      public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP;
-    }
 
     public struct Tooltip
     {
@@ -234,6 +73,5 @@ namespace Tizen.NUI
         public static readonly int BelowVisual = NDalic.TOOLTIP_TAIL_BELOW_VISUAL;
       }
     }
-
   } // namespace Constants
 } // namesapce Dali
index 08bf15b..d384ed4 100755 (executable)
@@ -28,13 +28,13 @@ namespace Tizen.NUI {
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]
     internal delegate void EventCallbackDelegateType1(IntPtr arg1);
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void EventCallbackDelegateType2<T,U>(T arg1, U arg2);
-
 
     //this should be removed with EventHandler from .NET
     [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    public delegate void DaliEventHandler<T,U>(T source, U e);
+    public delegate void DaliEventHandler<T, U>(T source, U e);
+
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    public delegate R EventHandlerWithReturnType<T, U, R>(T source, U e);
 
 
 }
index d597a1c..92608d9 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class DaliException : global::System.IDisposable {
+    internal class DaliException : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 3906eaa..76e1549 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DefaultItemLayoutProperty {
+    internal enum DefaultItemLayoutProperty {
   TYPE = 0,
   ITEM_SIZE,
   ORIENTATION,
index ee0c0d9..ca47cf1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DefaultItemLayoutType {
+    internal enum DefaultItemLayoutType {
   DEPTH,
   GRID,
   LIST,
index ff9f4f0..c3654ac 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class DefaultRuler : Ruler {
+    public class DefaultRuler : Ruler {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal DefaultRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DefaultRuler_SWIGUpcast(cPtr), cMemoryOwn) {
index d82ee6f..184c062 100755 (executable)
@@ -8,68 +8,99 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Degree : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// An angle in degrees.
+    /// This reduces ambiguity when using methods which accept angles in degrees or radians.
+    /// </summary>
+    public class Degree : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Degree(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Degree(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(Degree obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Degree obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Degree() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Degree()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Degree(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Degree(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
 
-  public Degree() : this(NDalicPINVOKE.new_Degree__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public Degree() : this(NDalicPINVOKE.new_Degree__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Degree(float value) : this(NDalicPINVOKE.new_Degree__SWIG_1(value), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Creates an angle in degrees.
+        /// </summary>
+        /// <param name="value">The initial value in degrees</param>
+        public Degree(float value) : this(NDalicPINVOKE.new_Degree__SWIG_1(value), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Degree(Radian value) : this(NDalicPINVOKE.new_Degree__SWIG_2(Radian.getCPtr(value)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Creates an angle in degrees from a Radian.
+        /// </summary>
+        /// <param name="value">The initial value in Radians</param>
+        public Degree(Radian value) : this(NDalicPINVOKE.new_Degree__SWIG_2(Radian.getCPtr(value)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public float degree {
-    set {
-      NDalicPINVOKE.Degree_degree_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Degree_degree_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        public float degree
+        {
+            set
+            {
+                NDalicPINVOKE.Degree_degree_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Degree_degree_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
 
-}
+    }
 
 }
index 8bc54eb..7afd7c7 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DepthFunctionType {
+    internal enum DepthFunctionType {
   NEVER,
   ALWAYS,
   LESS,
index f66f1cf..063abd8 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DepthTestModeType {
+    internal enum DepthTestModeType {
   OFF,
   AUTO,
   ON
index 9ac3d6b..8d52864 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DepthWriteModeType {
+    internal enum DepthWriteModeType {
   OFF,
   AUTO,
   ON
index 3cead2a..67dd599 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum DirectionBias {
+    public enum DirectionBias {
   DirectionBiasLeft = -1,
   DirectionBiasNone = 0,
   DirectionBiasRight = 1
similarity index 85%
rename from src/Tizen.NUI/devel-src/HorizontalAlignmentType.cs
rename to src/Tizen.NUI/devel-src/DirectionType.cs
index bb39721..eae981f 100755 (executable)
 
 namespace Tizen.NUI {
 
-public enum HorizontalAlignmentType {
-  LEFT,
-  CENTER,
-  RIGHT
+    internal enum DirectionType {
+  LEFT_TO_RIGHT = 0,
+  RIGHT_TO_LEFT
 }
 
 }
index 2035a34..2531371 100755 (executable)
@@ -13,7 +13,7 @@ using System.Collections.Generic;
 namespace Tizen.NUI
 {
 
-    public class DisposeQueue
+    internal class DisposeQueue
     {
         private static DisposeQueue _disposableQueue = new DisposeQueue();
         private List<IDisposable> _disposables = new List<IDisposable>();
index 40fd90b..5012f6e 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class DragAndDropDetector : BaseHandle {
+    internal class DragAndDropDetector : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal DragAndDropDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DragAndDropDetector_SWIGUpcast(cPtr), cMemoryOwn) {
diff --git a/src/Tizen.NUI/devel-src/DrawModeType.cs b/src/Tizen.NUI/devel-src/DrawModeType.cs
deleted file mode 100755 (executable)
index e4eb078..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum DrawModeType {
-  NORMAL = 0,
-  OVERLAY_2D = 1,
-  STENCIL = 3
-}
-
-}
index 02e934a..4b7e084 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class EncodedBufferImage : Image {
+    internal class EncodedBufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal EncodedBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.EncodedBufferImage_SWIGUpcast(cPtr), cMemoryOwn) {
index 635547d..0829e12 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum FaceCullingModeType {
+    internal enum FaceCullingModeType {
   NONE,
   FRONT,
   BACK,
index 4f1f612..82da30c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum FilterModeType {
+    internal enum FilterModeType {
   NONE = 0,
   DEFAULT,
   NEAREST,
index 6b818d5..3f9cc75 100755 (executable)
@@ -9,12 +9,12 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
+/* moved to VisualMaps.cs
 public enum FittingModeType {
   SHRINK_TO_FIT,
   SCALE_TO_FILL,
   FIT_WIDTH,
   FIT_HEIGHT
 }
-
+*/
 }
index f1bab8e..e437e95 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class FixedRuler : Ruler {
+    public class FixedRuler : Ruler {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FixedRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FixedRuler_SWIGUpcast(cPtr), cMemoryOwn) {
index 83811df..54f451d 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class FlexContainer : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    public class FlexContainer : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~FlexContainer() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~FlexContainer()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_FlexContainer(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_FlexContainer(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
 
-  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_FlexContainer_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_FlexContainer_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();
+            internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();
+            internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();
+            internal static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();
+            internal static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();
+            internal static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();
+
         }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get();
-    public static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get();
-    public static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get();
-    public static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get();
-    public static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get();
-    public static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get();
-  
-  }
-
-  public class ChildProperty : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~ChildProperty() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+
+        /// <summary>
+        /// Enumeration for the instance of child properties belonging to the FlexContainer class.
+        /// </summary>
+        public class ChildProperty : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~ChildProperty()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();
+            internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();
+            internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();
+
         }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get();
-    public static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get();
-    public static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get();
-  
-  }
-
-  public FlexContainer () : this (NDalicPINVOKE.FlexContainer_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public FlexContainer Assign(FlexContainer handle) {
-    FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static FlexContainer DownCast(BaseHandle handle) {
-    FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum FlexDirectionType {
-    COLUMN,
-    COLUMN_REVERSE,
-    ROW,
-    ROW_REVERSE
-  }
-
-  public enum ContentDirectionType {
-    INHERIT,
-    LTR,
-    RTL
-  }
-
-  public enum Justification {
-    JUSTIFY_FLEX_START,
-    JUSTIFY_CENTER,
-    JUSTIFY_FLEX_END,
-    JUSTIFY_SPACE_BETWEEN,
-    JUSTIFY_SPACE_AROUND
-  }
-
-  public enum Alignment {
-    ALIGN_AUTO,
-    ALIGN_FLEX_START,
-    ALIGN_CENTER,
-    ALIGN_FLEX_END,
-    ALIGN_STRETCH
-  }
-
-  public enum WrapType {
-    NO_WRAP,
-    WRAP
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000,
-    CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,
-    CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000
-  }
-
-  public int ContentDirection
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.CONTENT_DIRECTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int FlexDirection
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.FLEX_DIRECTION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int FlexWrap
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.FLEX_WRAP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int JustifyContent
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.JUSTIFY_CONTENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AlignItems
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.ALIGN_ITEMS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AlignContent
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.Property.ALIGN_CONTENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
 
-}
+        /// <summary>
+        /// Creates a FlexContainer handle.
+        /// Calling member functions with an uninitialized handle is not allowed.
+        /// </summary>
+        public FlexContainer() : this(NDalicPINVOKE.FlexContainer_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal FlexContainer Assign(FlexContainer handle)
+        {
+            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal new static FlexContainer DownCast(BaseHandle handle)
+        {
+            FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Enumeration for the direction of the main axis in the flex container. This determines
+        /// the direction that flex items are laid out in the flex container.
+        /// </summary>
+        public enum FlexDirectionType
+        {
+            Column,
+            ColumnReverse,
+            Row,
+            RowReverse
+        }
+
+        /// <summary>
+        /// Enumeration for the primary direction in which content is ordered in the flex container
+        /// and on which sides the ?\9cstart??and ?\9cend??are.
+        /// </summary>
+        public enum ContentDirectionType
+        {
+            Inherit,
+            LTR,
+            RTL
+        }
+
+        /// <summary>
+        /// Enumeration for the alignment of the flex items when the items do not use all available
+        /// space on the main-axis.
+        /// </summary>
+        public enum Justification
+        {
+            JustifyFlexStart,
+            JustifyCenter,
+            JustifyFlexEnd,
+            JustifySpaceBetween,
+            JustifySpaceAround
+        }
+
+        /// <summary>
+        /// Enumeration for the alignment of the flex items or lines when the items or lines do not
+        /// use all the available space on the cross-axis.
+        /// </summary>
+        public enum Alignment
+        {
+            AlignAuto,
+            AlignFlexStart,
+            AlignCenter,
+            AlignFlexEnd,
+            AlignStretch
+        }
+
+        /// <summary>
+        /// Enumeration for the wrap type of the flex container when there is no enough room for
+        /// all the items on one flex line.
+        /// </summary>
+        public enum WrapType
+        {
+            NoWrap,
+            Wrap
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000,
+            CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,
+            CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// The primary direction in which content is ordered
+        /// </summary>
+        public ContentDirectionType ContentDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp);
+                return (ContentDirectionType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.CONTENT_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The direction of the main-axis which determines the direction that flex items are laid out
+        /// </summary>
+        public FlexDirectionType FlexDirection
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp);
+                return (FlexDirectionType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_DIRECTION, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// Whether the flex items should wrap or not if there is no enough room for them on one flex line
+        /// </summary>
+        public WrapType FlexWrap
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp);
+                return (WrapType)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.FLEX_WRAP, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the main-axis
+        /// </summary>
+        public Justification JustifyContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp);
+                return (Justification)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.JUSTIFY_CONTENT, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// The alignment of flex items when the items do not use all available space on the cross-axis
+        /// </summary>
+        public Alignment AlignItems
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp);
+                return (Alignment)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_ITEMS, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+        /// <summary>
+        /// Similar to "alignItems", but it aligns flex lines, so only works when there are multiple lines
+        /// </summary>
+        public Alignment AlignContent
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp);
+                return (Alignment)temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.Property.ALIGN_CONTENT, new Tizen.NUI.PropertyValue((int)value));
+            }
+        }
+
+    }
 
 }
index 1460cce..aecd9c5 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class FloatSignal : global::System.IDisposable {
+    internal class FloatSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index d433fe5..e0fb2f6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class FocusChangedSignal : global::System.IDisposable {
+    internal class FocusChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 96130b9..201cd21 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class FocusGroupChangedSignal : global::System.IDisposable {
+    internal class FocusGroupChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index e1718cd..2d4e4aa 100755 (executable)
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-namespace Tizen.NUI {
-
-using System;
-using System.Runtime.InteropServices;
-
-public class FocusManager : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal FocusManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.FocusManager_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FocusManager obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~FocusManager() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Provides the functionality of handling keyboard navigation and maintaining the two dimensional keyboard focus chain.
+    /// It provides functionality of setting the focus and moving the focus in four directions(i.e.Left, Right, Up and Down).
+    /// It also draws a highlight for the focused View and sends a event when the focus is changed.
+    /// </summary>
+    public class FocusManager : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        private CustomAlgorithmInterfaceWrapper _customAlgorithmInterfaceWrapper;
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicManualPINVOKE.delete_FocusManager(swigCPtr);
+        internal FocusManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.FocusManager_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(FocusManager obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-/**
-  * @brief Event arguments that passed via FocusChanged signal
-  *
-  */
-public class FocusChangedEventArgs : EventArgs
-{
-   private Actor _actorCurrent;
-   private Actor _actorNext;
-
-   /**
-     * @brief Actor - is the original focused Actor
-     *
-     */
-   public Actor ActorCurrent
-   {
-      get
-      {
-         return _actorCurrent;
-      }
-      set
-      {
-         _actorCurrent = value;
-      }
-   }
-
-   /**
-     * @brief Actor - is the current focused Actor
-     *
-     */
-   public Actor ActorNext
-   {
-      get
-      {
-         return _actorNext;
-      }
-      set
-      {
-         _actorNext = value;
-      }
-   }
-}
+        ~FocusManager()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-/**
-  * @brief Event arguments that passed via FocusGroupChanged signal
-  *
-  */
-public class FocusGroupChangedEventArgs : EventArgs
-{
-   private Actor _currentFocusedActor;
-   private bool _forwardDirection;
-
-   /**
-     * @brief Actor - is the current focused Actor
-     *
-     */
-   public Actor CurrentFocusedActor
-   {
-      get
-      {
-         return _currentFocusedActor;
-      }
-      set
-      {
-         _currentFocusedActor = value;
-      }
-   }
-
-   /**
-     * @brief ForwardDirection - is the direction (forward or backward) in which to move the focus next
-     *
-     */
-   public bool ForwardDirection
-   {
-      get
-      {
-         return _forwardDirection;
-      }
-      set
-      {
-         _forwardDirection = value;
-      }
-   }
-}
+        /// <summary>
+        /// To make FocusManager instance be disposed.
+        /// </summary>
+        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;
+                        NDalicManualPINVOKE.delete_FocusManager(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-/**
-  * @brief Event arguments that passed via FocusedActorEnterKey signal
-  *
-  */
-public class FocusedActorEnterKeyEventArgs : EventArgs
-{
-   private Actor _actor;
-
-   /**
-     * @brief Actor - is the current focused Actor which has the enter key pressed on it.
-     *
-     */
-   public Actor Actor
-   {
-      get
-      {
-         return _actor;
-      }
-      set
-      {
-         _actor = value;
-      }
-   }
-}
 
-/**
-  * @brief Event arguments that passed via PreFocusChange signal
-  *
-  */
-public class PreFocusChangeEventArgs : EventArgs
-{
-   private Actor _current;
-   private Actor _proposed;
-   private View.KeyboardFocus.Direction _direction;
-
-   /**
-    * @brief Actor - is the current focused Actor.
-    *
-    */
-   public Actor Current
-   {
-      get
-      {
-         return _current;
-      }
-      set
-      {
-          _current = value;
-      }
-   }
-
-    /**
-    * @brief Actor - is the proposed focused Actor.
-    *
-    */
-    public Actor Proposed
-    {
-        get
+        ///<summary>
+        ///Event arguments that passed via PreFocusChange signal
+        /// </summary>
+        public class PreFocusChangeEventArgs : EventArgs
         {
-            return _proposed;
+            private View _current;
+            private View _proposed;
+            private View.FocusDirection _direction;
+
+            public View CurrentView
+            {
+                get
+                {
+                    return _current;
+                }
+                set
+                {
+                    _current = value;
+                }
+            }
+
+            public View ProposedView
+            {
+                get
+                {
+                    return _proposed;
+                }
+                set
+                {
+                    _proposed = value;
+                }
+            }
+
+            public View.FocusDirection Direction
+            {
+                get
+                {
+                    return _direction;
+                }
+                set
+                {
+                    _direction = value;
+                }
+            }
         }
-        set
+
+        private EventHandlerWithReturnType<object, PreFocusChangeEventArgs, View> _preFocusChangeEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        internal delegate IntPtr PreFocusChangeEventCallback(IntPtr current, IntPtr proposed, View.FocusDirection direction);
+        private PreFocusChangeEventCallback _preFocusChangeCallback;
+
+        public event EventHandlerWithReturnType<object, PreFocusChangeEventArgs, View> PreFocusChange
         {
-            _proposed = value;
+            add
+            {
+                if (_preFocusChangeEventHandler == null)
+                {
+                    _preFocusChangeCallback = OnPreFocusChange;
+                    PreFocusChangeSignal().Connect(_preFocusChangeCallback);
+                }
+                _preFocusChangeEventHandler += value;
+            }
+            remove
+            {
+                _preFocusChangeEventHandler -= value;
+                if (_preFocusChangeEventHandler == null && _preFocusChangeCallback != null)
+                {
+                    PreFocusChangeSignal().Disconnect(_preFocusChangeCallback);
+                }
+            }
         }
-    }
 
-    /**
-    * @brief Direction - is the direction of Focus change.
-    *
-    */
-    public View.KeyboardFocus.Direction Direction
-    {
-        get
+        private IntPtr OnPreFocusChange(IntPtr current, IntPtr proposed, View.FocusDirection direction)
         {
-            return _direction;
+            View view = null;
+            PreFocusChangeEventArgs e = new PreFocusChangeEventArgs();
+
+            e.CurrentView = View.GetViewFromPtr(current);
+            e.ProposedView = View.GetViewFromPtr(proposed);
+            e.Direction = direction;
+
+            if (_preFocusChangeEventHandler != null)
+            {
+                view = _preFocusChangeEventHandler(this, e);
+            }
+
+            if (view)
+            {
+                return view.GetPtrfromActor();
+            }
+            else
+            {
+                if (e.ProposedView) return proposed;
+                else return current;
+            }
         }
-        set
+
+        ///<summary>
+        ///Event arguments that passed via FocusChanged signal
+        /// </summary>
+        public class FocusChangedEventArgs : EventArgs
         {
-            _direction = value;
+            private View _current;
+            private View _next;
+
+            public View CurrentView
+            {
+                get
+                {
+                    return _current;
+                }
+                set
+                {
+                    _current = value;
+                }
+            }
+
+            public View NextView
+            {
+                get
+                {
+                    return _next;
+                }
+                set
+                {
+                    _next = value;
+                }
+            }
         }
-    }
-}
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void FocusChangedEventHandler(object source, FocusChangedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void FocusGroupChangedEventHandler(object source, FocusGroupChangedEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate void FocusedActorEnterKeyEventHandler(object source, FocusedActorEnterKeyEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate Actor PreFocusChangeEventHandler(object source, PreFocusChangeEventArgs e);
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  public delegate IntPtr PreFocusChangeEventCallbackDelegate(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction);
-  private PreFocusChangeEventHandler _FocusManagerPreFocusChangeEventHandler;
-  private PreFocusChangeEventCallbackDelegate _FocusManagerPreFocusChangeEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void FocusChangedEventCallbackDelegate(IntPtr actorCurrent, IntPtr actorNext);
-  private FocusChangedEventHandler _FocusManagerFocusChangedEventHandler;
-  private FocusChangedEventCallbackDelegate _FocusManagerFocusChangedEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void FocusGroupChangedEventCallbackDelegate(IntPtr currentFocusedActor, bool forwardDirection);
-  private FocusGroupChangedEventHandler _FocusManagerFocusGroupChangedEventHandler;
-  private FocusGroupChangedEventCallbackDelegate _FocusManagerFocusGroupChangedEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void FocusedActorEnterKeyEventCallbackDelegate(IntPtr actor);
-  private FocusedActorEnterKeyEventHandler _FocusManagerFocusedActorEnterKeyEventHandler;
-  private FocusedActorEnterKeyEventCallbackDelegate _FocusManagerFocusedActorEnterKeyEventCallbackDelegate;
-
-  public event PreFocusChangeEventHandler PreFocusChange
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_FocusManagerPreFocusChangeEventHandler == null)
-           {
-               _FocusManagerPreFocusChangeEventHandler += value;
-
-               _FocusManagerPreFocusChangeEventCallbackDelegate = new PreFocusChangeEventCallbackDelegate(OnPreFocusChange);
-              this.PreFocusChangeSignal().Connect(_FocusManagerPreFocusChangeEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_FocusManagerPreFocusChangeEventHandler != null)
-           {
-              this.PreFocusChangeSignal().Disconnect(_FocusManagerPreFocusChangeEventCallbackDelegate);
-           }
-
-           _FocusManagerPreFocusChangeEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for FocusManager PreFocusChangeSignal
-  private IntPtr OnPreFocusChange(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction)
-  {
-      Actor actor = null;
-      PreFocusChangeEventArgs e = new PreFocusChangeEventArgs();
-
-      // Populate all members of "e" (PreFocusChangeEventArgs) with real data
-      e.Current = Actor.GetActorFromPtr(current);
-      e.Proposed = Actor.GetActorFromPtr(proposed);
-      e.Direction = direction;
-
-      if (_FocusManagerPreFocusChangeEventHandler != null)
-      {
-        //here we send all data to user event handlers
-          actor = _FocusManagerPreFocusChangeEventHandler(this, e);
-      }
-
-      return actor.GetPtrfromActor();
-  }
-
-  /**
-    * @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.
-    */
-  public event FocusChangedEventHandler FocusChanged
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_FocusManagerFocusChangedEventHandler == null)
-           {
-              _FocusManagerFocusChangedEventHandler += value;
-
-              _FocusManagerFocusChangedEventCallbackDelegate = new FocusChangedEventCallbackDelegate(OnFocusChanged);
-              this.FocusChangedSignal().Connect(_FocusManagerFocusChangedEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_FocusManagerFocusChangedEventHandler != null)
-           {
-              this.FocusChangedSignal().Disconnect(_FocusManagerFocusChangedEventCallbackDelegate);
-           }
-
-           _FocusManagerFocusChangedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for FocusManager FocusChangedSignal
-  private void OnFocusChanged(IntPtr actorCurrent, IntPtr actorNext)
-  {
-     FocusChangedEventArgs e = new FocusChangedEventArgs();
-
-     // Populate all members of "e" (FocusChangedEventArgs) with real data
-     e.ActorCurrent = Actor.GetActorFromPtr(actorCurrent);
-     e.ActorNext = Actor.GetActorFromPtr(actorNext);
-
-     if (_FocusManagerFocusChangedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _FocusManagerFocusChangedEventHandler(this, e);
-     }
-  }
-
-  /**
-    * @brief Event for FocusGroupChanged signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of FocusGroupChangedEventHandler) provided by the user.
-    * FocusGroupChanged signal is emitted when the focus group has been changed.
-    */
-  public event FocusGroupChangedEventHandler FocusGroupChanged
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_FocusManagerFocusGroupChangedEventHandler == null)
-           {
-              _FocusManagerFocusGroupChangedEventHandler += value;
-
-              _FocusManagerFocusGroupChangedEventCallbackDelegate = new FocusGroupChangedEventCallbackDelegate(OnFocusGroupChanged);
-              this.FocusGroupChangedSignal().Connect(_FocusManagerFocusGroupChangedEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_FocusManagerFocusGroupChangedEventHandler != null)
-           {
-              this.FocusGroupChangedSignal().Disconnect(_FocusManagerFocusGroupChangedEventCallbackDelegate);
-           }
-
-           _FocusManagerFocusGroupChangedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for FocusManager FocusGroupChangedSignal
-  private void OnFocusGroupChanged(IntPtr currentFocusedActor, bool forwardDirection)
-  {
-     FocusGroupChangedEventArgs e = new FocusGroupChangedEventArgs();
-
-     // Populate all members of "e" (FocusGroupChangedEventArgs) with real data
-     e.CurrentFocusedActor = Actor.GetActorFromPtr(currentFocusedActor);
-     e.ForwardDirection = forwardDirection;
-
-     if (_FocusManagerFocusGroupChangedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _FocusManagerFocusGroupChangedEventHandler(this, e);
-     }
-  }
-
-  /**
-    * @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.
-    */
-  public event FocusedActorEnterKeyEventHandler FocusedActorEnterKeyPressed
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_FocusManagerFocusedActorEnterKeyEventHandler == null)
-           {
-              _FocusManagerFocusedActorEnterKeyEventHandler += value;
-
-              _FocusManagerFocusedActorEnterKeyEventCallbackDelegate = new FocusedActorEnterKeyEventCallbackDelegate(OnFocusedActorEnterKey);
-              this.FocusedActorEnterKeySignal().Connect(_FocusManagerFocusedActorEnterKeyEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_FocusManagerFocusedActorEnterKeyEventHandler != null)
-           {
-              this.FocusedActorEnterKeySignal().Disconnect(_FocusManagerFocusedActorEnterKeyEventCallbackDelegate);
-           }
-
-           _FocusManagerFocusedActorEnterKeyEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for FocusManager FocusedActorEnterKeySignal
-  private void OnFocusedActorEnterKey(IntPtr actor)
-  {
-     FocusedActorEnterKeyEventArgs e = new FocusedActorEnterKeyEventArgs();
-
-     // Populate all members of "e" (FocusedActorEnterKeyEventArgs) with real data
-     e.Actor = Actor.GetActorFromPtr(actor);
-
-     if (_FocusManagerFocusedActorEnterKeyEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _FocusManagerFocusedActorEnterKeyEventHandler(this, e);
-     }
-  }
-
-  public FocusManager() : this(NDalicManualPINVOKE.new_FocusManager(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static FocusManager Get() {
-    FocusManager ret = new FocusManager(NDalicManualPINVOKE.FocusManager_Get(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool SetCurrentFocusActor(Actor actor) {
-    bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(actor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor GetCurrentFocusActor() {
-    Actor ret = new Actor(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool MoveFocus(View.KeyboardFocus.Direction direction) {
-    bool ret = NDalicManualPINVOKE.FocusManager_MoveFocus(swigCPtr, (int)direction);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ClearFocus() {
-    NDalicManualPINVOKE.FocusManager_ClearFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetFocusGroupLoop(bool enabled) {
-    NDalicManualPINVOKE.FocusManager_SetFocusGroupLoop(swigCPtr, enabled);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool GetFocusGroupLoop() {
-    bool ret = NDalicManualPINVOKE.FocusManager_GetFocusGroupLoop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetAsFocusGroup(Actor actor, bool isFocusGroup) {
-    NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, Actor.getCPtr(actor), isFocusGroup);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsFocusGroup(Actor actor) {
-    bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, Actor.getCPtr(actor));
-    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);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFocusIndicatorActor(Actor indicator) {
-    NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetFocusIndicatorActor() {
-    Actor ret = new Actor(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PreFocusChangeSignal PreFocusChangeSignal() {
-    PreFocusChangeSignal ret = new PreFocusChangeSignal(NDalicManualPINVOKE.FocusManager_PreFocusChangeSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public FocusChangedSignal FocusChangedSignal() {
-    FocusChangedSignal ret = new FocusChangedSignal(NDalicManualPINVOKE.FocusManager_FocusChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public FocusGroupChangedSignal FocusGroupChangedSignal() {
-    FocusGroupChangedSignal ret = new FocusGroupChangedSignal(NDalicManualPINVOKE.FocusManager_FocusGroupChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ActorSignal FocusedActorEnterKeySignal() {
-    ActorSignal ret = new ActorSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private static readonly FocusManager instance = FocusManager.Get();
-
-  public static FocusManager Instance
-  {
-      get
-      {
-          return instance;
-      }
-  }
+        private EventHandler<FocusChangedEventArgs> _focusChangedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        internal delegate void FocusChangedEventCallback(IntPtr current, IntPtr next);
+        private FocusChangedEventCallback _focusChangedEventCallback;
+
+        public event EventHandler<FocusChangedEventArgs> FocusChanged
+        {
+            add
+            {
+                if (_focusChangedEventCallback == null)
+                {
+                    _focusChangedEventCallback = OnFocusChanged;
+                    FocusChangedSignal().Connect(_focusChangedEventCallback);
+                }
+                _focusChangedEventHandler += value;
+            }
+            remove
+            {
+                _focusChangedEventHandler -= value;
+
+                if (_focusChangedEventCallback == null && _focusChangedEventCallback != null)
+                {
+                    FocusChangedSignal().Disconnect(_focusChangedEventCallback);
+                }
+            }
+        }
 
+        private void OnFocusChanged(IntPtr current, IntPtr next)
+        {
+            FocusChangedEventArgs e = new FocusChangedEventArgs();
 
-}
+            e.CurrentView = View.GetViewFromPtr(current);
+            e.NextView = View.GetViewFromPtr(next);
+
+            if (_focusChangedEventHandler != null)
+            {
+                _focusChangedEventHandler(this, e);
+            }
+        }
+
+        ///<summary>
+        ///Event arguments that passed via FocusGroupChanged signal
+        /// </summary>
+        public class FocusGroupChangedEventArgs : EventArgs
+        {
+            private View _current;
+            private bool _forwardDirection;
+
+            public View CurrentView
+            {
+                get
+                {
+                    return _current;
+                }
+                set
+                {
+                    _current = value;
+                }
+            }
+
+            public bool ForwardDirection
+            {
+                get
+                {
+                    return _forwardDirection;
+                }
+                set
+                {
+                    _forwardDirection = value;
+                }
+            }
+        }
+
+        private EventHandler<FocusGroupChangedEventArgs> _focusGroupChangedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FocusGroupChangedEventCallback(IntPtr current, bool forwardDirection);
+        private FocusGroupChangedEventCallback _focusGroupChangedEventCallback;
+
+        public event EventHandler<FocusGroupChangedEventArgs> FocusGroupChanged
+        {
+            add
+            {
+                if (_focusGroupChangedEventCallback == null)
+                {
+                    _focusGroupChangedEventCallback = OnFocusGroupChanged;
+                    FocusGroupChangedSignal().Connect(_focusGroupChangedEventCallback);
+                }
+                _focusGroupChangedEventHandler += value;
+            }
+            remove
+            {
+                _focusGroupChangedEventHandler -= value;
+
+                if (_focusGroupChangedEventCallback == null && _focusGroupChangedEventCallback != null)
+                {
+                    FocusGroupChangedSignal().Disconnect(_focusGroupChangedEventCallback);
+                }
+            }
+        }
+
+        private void OnFocusGroupChanged(IntPtr current, bool forwardDirection)
+        {
+            FocusGroupChangedEventArgs e = new FocusGroupChangedEventArgs();
+
+            e.CurrentView = View.GetViewFromPtr(current);
+            e.ForwardDirection = forwardDirection;
+
+            if (_focusGroupChangedEventHandler != null)
+            {
+                _focusGroupChangedEventHandler(this, e);
+            }
+        }
+
+        ///<summary>
+        ///Event arguments that passed via FocusedViewEnterKey signal
+        /// </summary>
+        public class FocusedViewEnterKeyEventArgs : EventArgs
+        {
+            private View _view;
+
+            public View View
+            {
+                get
+                {
+                    return _view;
+                }
+                set
+                {
+                    _view = value;
+                }
+            }
+        }
+
+        private EventHandler<FocusedViewEnterKeyEventArgs> _focusedViewEnterKeyEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FocusedViewEnterKeyEventCallback(IntPtr view);
+        private FocusedViewEnterKeyEventCallback _focusedViewEnterKeyEventCallback;
+
+        public event EventHandler<FocusedViewEnterKeyEventArgs> FocusedViewEnterKeyPressed
+        {
+            add
+            {
+                if (_focusedViewEnterKeyEventCallback == null)
+                {
+                    _focusedViewEnterKeyEventCallback = OnFocusedViewEnterKey;
+                    FocusedActorEnterKeySignal().Connect(_focusedViewEnterKeyEventCallback);
+                }
+                _focusedViewEnterKeyEventHandler += value;
+            }
+            remove
+            {
+                _focusedViewEnterKeyEventHandler -= value;
+
+                if (_focusedViewEnterKeyEventCallback == null && _focusedViewEnterKeyEventCallback != null)
+                {
+                    FocusedActorEnterKeySignal().Disconnect(_focusedViewEnterKeyEventCallback);
+                }
+            }
+        }
+
+        private void OnFocusedViewEnterKey(IntPtr view)
+        {
+            FocusedViewEnterKeyEventArgs e = new FocusedViewEnterKeyEventArgs();
+
+            e.View = View.GetViewFromPtr(view);
+
+            if (_focusedViewEnterKeyEventHandler != null)
+            {
+                _focusedViewEnterKeyEventHandler(this, e);
+            }
+        }
+
+
+        internal FocusManager() : this(NDalicManualPINVOKE.new_FocusManager(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal static FocusManager Get()
+        {
+            FocusManager ret = new FocusManager(NDalicManualPINVOKE.FocusManager_Get(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
+        /// <summary>
+        /// Moves the keyboard focus to the given View.
+        /// Only one View can be focused at the same time.
+        /// The View must be in the stage already and keyboard focusable.
+        /// </summary>
+        /// <param name="view">The View to be focused</param>
+        /// <returns>Whether the focus is successful or not</returns>
+        public bool SetCurrentFocusView(View view)
+        {
+            bool ret = NDalicManualPINVOKE.FocusManager_SetCurrentFocusActor(swigCPtr, Actor.getCPtr(view));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets the current focused actor.
+        /// </summary>
+        /// <returns>A handle to the current focused View or an empty handle if no View is focused</returns>
+        public View GetCurrentFocusView()
+        {
+            View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetCurrentFocusActor(swigCPtr), true));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Moves the focus to the next focusable View in the focus chain in the given direction(according to the focus traversal order).
+        /// </summary>
+        /// <param name="direction">The direction of focus movement</param>
+        /// <returns>true if the movement was successful</returns>
+        public bool MoveFocus(View.FocusDirection direction)
+        {
+            bool ret = NDalicManualPINVOKE.FocusManager_MoveFocus(swigCPtr, (int)direction);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Clears the focus from the current focused actor if any, so that no actor is focused in the focus chain.
+        /// It will emit FocusChanged event without current focused View.
+        /// </summary>
+        public void ClearFocus()
+        {
+            NDalicManualPINVOKE.FocusManager_ClearFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sets/Gets the status of whether the focus movement should be looped within the same focus group.
+        /// The focus movement is not looped by default.
+        /// </summary>
+        public bool FocusGroupLoop
+        {
+            set
+            {
+                SetFocusGroupLoop(value);
+            }
+            get
+            {
+                return GetFocusGroupLoop();
+            }
+        }
+
+        internal void SetFocusGroupLoop(bool enabled)
+        {
+            NDalicManualPINVOKE.FocusManager_SetFocusGroupLoop(swigCPtr, enabled);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool GetFocusGroupLoop()
+        {
+            bool ret = NDalicManualPINVOKE.FocusManager_GetFocusGroupLoop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets whether an View is a focus group that can limit the scope of focus movement to its child actors in the focus chain.
+        /// Layout controls set themselves as focus groups by default.
+        /// </summary>
+        /// <param name="view">The View to be set as a focus group</param>
+        /// <param name="isFocusGroup">Whether to set the View as a focus group or not</param>
+        public void SetAsFocusGroup(View view, bool isFocusGroup)
+        {
+            NDalicManualPINVOKE.FocusManager_SetAsFocusGroup(swigCPtr, Actor.getCPtr(view), isFocusGroup);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks whether the actor is set as a focus group or not.
+        /// </summary>
+        /// <param name="view">The View to be checked</param>
+        /// <returns>Whether the View is set as a focus group</returns>
+        public bool IsFocusGroup(View view)
+        {
+            bool ret = NDalicManualPINVOKE.FocusManager_IsFocusGroup(swigCPtr, Actor.getCPtr(view));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the closest ancestor of the given actor that is a focus group.
+        /// </summary>
+        /// <param name="view">The View to be checked for its focus group</param>
+        /// <returns>The focus group the given view belongs to or an empty handle if the given view</returns>
+        public View GetFocusGroup(View view)
+        {
+            View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusGroup(swigCPtr, Actor.getCPtr(view)), true));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets/Gets the focus indicator View.
+        /// This will replace the default focus indicator view in FocusManager and will be added to the focused view as a highlight.
+        /// </summary>
+        public View FocusIndicator
+        {
+            set
+            {
+                SetFocusIndicatorView(value);
+            }
+            get
+            {
+                return GetFocusIndicatorView();
+            }
+        }
+
+        internal void SetFocusIndicatorView(View indicator)
+        {
+            NDalicManualPINVOKE.FocusManager_SetFocusIndicatorActor(swigCPtr, Actor.getCPtr(indicator));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal View GetFocusIndicatorView()
+        {
+            View ret = View.DownCast(new Actor(NDalicManualPINVOKE.FocusManager_GetFocusIndicatorActor(swigCPtr), true));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetCustomAlgorithm(ICustomFocusAlgorithm arg0) {
+            _customAlgorithmInterfaceWrapper = new CustomAlgorithmInterfaceWrapper();
+            _customAlgorithmInterfaceWrapper.SetFocusAlgorithm(arg0);
+
+            NDalicPINVOKE.SetCustomAlgorithm(swigCPtr, CustomAlgorithmInterface.getCPtr(_customAlgorithmInterfaceWrapper));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PreFocusChangeSignal PreFocusChangeSignal()
+        {
+            PreFocusChangeSignal ret = new PreFocusChangeSignal(NDalicManualPINVOKE.FocusManager_PreFocusChangeSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal FocusChangedSignal FocusChangedSignal()
+        {
+            FocusChangedSignal ret = new FocusChangedSignal(NDalicManualPINVOKE.FocusManager_FocusChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal FocusGroupChangedSignal FocusGroupChangedSignal()
+        {
+            FocusGroupChangedSignal ret = new FocusGroupChangedSignal(NDalicManualPINVOKE.FocusManager_FocusGroupChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ActorSignal FocusedActorEnterKeySignal()
+        {
+            ActorSignal ret = new ActorSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private static readonly FocusManager instance = FocusManager.Get();
+
+        /// <summary>
+        /// Gets the singleton of FocusManager object.
+        /// </summary>
+        public static FocusManager Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        public interface ICustomFocusAlgorithm
+        {
+            View GetNextFocusableActor(View current, View proposed, View.FocusDirection direction);
+        }
+
+        private class CustomAlgorithmInterfaceWrapper : CustomAlgorithmInterface
+        {
+            private FocusManager.ICustomFocusAlgorithm _customFocusAlgorithm;
+
+            public CustomAlgorithmInterfaceWrapper()
+            {
+            }
+
+            public void SetFocusAlgorithm(FocusManager.ICustomFocusAlgorithm customFocusAlgorithm)
+            {
+                _customFocusAlgorithm = customFocusAlgorithm;
+            }
+
+            public override Actor GetNextFocusableActor(Actor current, Actor proposed, View.FocusDirection direction)
+            {
+                View currentView = View.DownCast<View>(current);
+                View proposedView = View.DownCast<View>(proposed);
+                return _customFocusAlgorithm.GetNextFocusableActor(currentView, proposedView, direction);
+            }
+        }
+    }
 }
index e58d1b1..f463971 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class FrameBuffer : BaseHandle {
+    internal class FrameBuffer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FrameBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBuffer_SWIGUpcast(cPtr), cMemoryOwn) {
index da58c67..98fa153 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class FrameBufferImage : Image {
+    internal class FrameBufferImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal FrameBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBufferImage_SWIGUpcast(cPtr), cMemoryOwn) {
diff --git a/src/Tizen.NUI/devel-src/FriendAssembly.cs b/src/Tizen.NUI/devel-src/FriendAssembly.cs
new file mode 100755 (executable)
index 0000000..015fcf8
--- /dev/null
@@ -0,0 +1,26 @@
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
+
+// friend assembly setting\r
+// compile with: /target:Tizen.NUI.ExtTEST /keyfile:FriendAssemblies.snk\r
+\r
+using System.Runtime.CompilerServices;\r
+[assembly: InternalsVisibleTo("Tizen.NUI.ExtTEST, PublicKey=00240000048000009400000006020000002400005253413100040000010001004d7c7c03a196ecb8e7cc5056750e1f40ee2bbe99f0e53a07f2538f2b0f450bd731b9dca3706503a0378baca74a09cf3af6261b330c031f44817ab6ed64189460765a402279d3e0c1fa7295ae1dccb2e3ff329705fd85b58d66ae7cb7e95ba06e0d847c3e3ba918798f579e5caeb1c6149955e6baf24236eec46227a623e494b1")]\r
+namespace Tizen.NUI
+{
+}
\ No newline at end of file
index 3aa191a..bae7b93 100755 (executable)
@@ -30,7 +30,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class GaussianBlurView : View {
+    internal class GaussianBlurView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal GaussianBlurView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GaussianBlurView_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -137,7 +137,7 @@ public class FinishedEventArgs : EventArgs
 
  public static GaussianBlurView GetGaussianBlurViewFromPtr(global::System.IntPtr cPtr) {
     GaussianBlurView ret = new GaussianBlurView(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
index 5397605..be5732d 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class GaussianBlurViewSignal : global::System.IDisposable {
+    internal class GaussianBlurViewSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 819a960..09a187f 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Geometry : BaseHandle {
+    internal class Geometry : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Geometry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Geometry_SWIGUpcast(cPtr), cMemoryOwn) {
index ffcb582..e618442 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Base structure for different gestures that an application can receive.
+    /// A gesture is an event that is produced from a combination of several touch events
+    /// in a particular order or within a certain time frame (e.g pinch).
+    /// </summary>
+    public class Gesture : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-public class Gesture : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+        internal Gesture(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal Gesture(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(Gesture obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Gesture obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~Gesture()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~Gesture() {
-    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_Gesture(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(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_Gesture(swigCPtr);
+        /// <summary>
+        /// The gesture type.
+        /// </summary>
+        public Gesture.GestureType Type
+        {
+            get
+            {
+                return type;
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// The gesture state.
+        /// </summary>
+        public Gesture.StateType State
+        {
+            get
+            {
+                return state;
+            }
+        }
 
-  public Gesture.GestureType Type
-  {
-    get
-    {
-      return type;
-    }
-  }
+        /// <summary>
+        /// The time the gesture took place.
+        /// </summary>
+        public uint Time
+        {
+            get
+            {
+                return time;
+            }
+        }
 
-  public Gesture.StateType State
-  {
-    get
-    {
-      return state;
-    }
-  }
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        public Gesture(Gesture rhs) : this(NDalicPINVOKE.new_Gesture(Gesture.getCPtr(rhs)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public uint Time
-  {
-    get
-    {
-      return time;
-    }
-  }
-
-  public Gesture(Gesture rhs) : this(NDalicPINVOKE.new_Gesture(Gesture.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Gesture Assign(Gesture rhs) {
-    Gesture ret = new Gesture(NDalicPINVOKE.Gesture_Assign(swigCPtr, Gesture.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private Gesture.GestureType type {
-    set {
-      NDalicPINVOKE.Gesture_type_set(swigCPtr, (int)value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      Gesture.GestureType ret = (Gesture.GestureType)NDalicPINVOKE.Gesture_type_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Gesture.StateType state {
-    set {
-      NDalicPINVOKE.Gesture_state_set(swigCPtr, (int)value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      Gesture.StateType ret = (Gesture.StateType)NDalicPINVOKE.Gesture_state_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint time {
-    set {
-      NDalicPINVOKE.Gesture_time_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.Gesture_time_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public enum GestureType {
-    Pinch = 1 << 0,
-    Pan = 1 << 1,
-    Tap = 1 << 2,
-    LongPress = 1 << 3
-  }
-
-  public enum StateType {
-    Clear,
-    Started,
-    Continuing,
-    Finished,
-    Cancelled,
-    Possible
-  }
+        /// <summary>
+        /// Assignment operator.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        /// <returns>A reference to this</returns>
+        public Gesture Assign(Gesture rhs)
+        {
+            Gesture ret = new Gesture(NDalicPINVOKE.Gesture_Assign(swigCPtr, Gesture.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        private Gesture.GestureType type
+        {
+            set
+            {
+                NDalicPINVOKE.Gesture_type_set(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Gesture.GestureType ret = (Gesture.GestureType)NDalicPINVOKE.Gesture_type_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Gesture.StateType state
+        {
+            set
+            {
+                NDalicPINVOKE.Gesture_state_set(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Gesture.StateType ret = (Gesture.StateType)NDalicPINVOKE.Gesture_state_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint time
+        {
+            set
+            {
+                NDalicPINVOKE.Gesture_time_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.Gesture_time_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Enumeration for type of gesture
+        /// </summary>
+        public enum GestureType
+        {
+            Pinch = 1 << 0,
+            Pan = 1 << 1,
+            Tap = 1 << 2,
+            LongPress = 1 << 3
+        }
+
+        /// <summary>
+        /// Enumeration for state of the gesture.
+        /// </summary>
+        public enum StateType
+        {
+            Clear,
+            Started,
+            Continuing,
+            Finished,
+            Cancelled,
+            Possible
+        }
+
+    }
 
 }
index 5e61b32..e359f83 100755 (executable)
@@ -9,11 +9,11 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
-public enum GradientVisualSpreadMethodType {
+/* moved to VisualMaps.cs
+    internal enum GradientVisualSpreadMethodType {
   PAD,
   REFLECT,
   REPEAT
 }
-
+*/
 }
index 98cf03e..46ae1a8 100755 (executable)
@@ -9,10 +9,10 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
-public enum GradientVisualUnitsType {
+/* moved to VisualMap.cs
+    internal enum GradientVisualUnitsType {
   OBJECT_BOUNDING_BOX,
   USER_SPACE
 }
-
+*/
 }
index 4dd7e97..7808376 100755 (executable)
@@ -123,56 +123,60 @@ public class Handle : BaseHandle {
     return ret;
   }
 
-  public Property.Type GetPropertyType(int index) {
-    Property.Type ret = (Property.Type)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index);
+  public PropertyType GetPropertyType(int index) {
+    PropertyType ret = (PropertyType)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void SetProperty(int index, Property.Value propertyValue) {
-    NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, Property.Value.getCPtr(propertyValue));
+  public void SetProperty(int index, PropertyValue propertyValue) {
+    NDalicPINVOKE.Handle_SetProperty(swigCPtr, index, PropertyValue.getCPtr(propertyValue));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public int RegisterProperty(string name, Property.Value propertyValue) {
-    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_0(swigCPtr, name, Property.Value.getCPtr(propertyValue));
+  public int RegisterProperty(string name, PropertyValue propertyValue) {
+    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_0(swigCPtr, name, PropertyValue.getCPtr(propertyValue));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public int RegisterProperty(string name, Property.Value propertyValue, Property.AccessMode accessMode) {
-    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_1(swigCPtr, name, Property.Value.getCPtr(propertyValue), (int)accessMode);
+  public int RegisterProperty(string name, PropertyValue propertyValue, PropertyAccessMode accessMode) {
+    int ret = NDalicPINVOKE.Handle_RegisterProperty__SWIG_1(swigCPtr, name, PropertyValue.getCPtr(propertyValue), (int)accessMode);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public Property.Value GetProperty(int index) {
-    Property.Value ret = new Property.Value(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true);
+  public PropertyValue GetProperty(int index) {
+    PropertyValue ret = new PropertyValue(NDalicPINVOKE.Handle_GetProperty(swigCPtr, index), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void GetPropertyIndices(VectorInteger indices) {
-    NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal void GetPropertyIndices(VectorInteger indices)
+        {
+            NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) {
-    PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal PropertyNotification AddPropertyNotification(int index, PropertyCondition condition)
+        {
+            PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) {
-    PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition)
+        {
+            PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public void RemovePropertyNotification(PropertyNotification propertyNotification) {
-    NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal void RemovePropertyNotification(PropertyNotification propertyNotification)
+        {
+            NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
   public void RemovePropertyNotifications() {
     NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr);
index f8013b8..ba47a69 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Hover events are a collection of points at a specific moment in time.
+    /// When a multi event occurs, each point represents the points that are currently being
+    /// hovered or the points where a hover has stopped.
+    /// </summary>
+    public class Hover : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-public class Hover : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+        internal Hover(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal Hover(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(Hover obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Hover obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~Hover()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~Hover() {
-    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_Hover(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(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_Hover(swigCPtr);
+        internal static Hover GetHoverFromPtr(global::System.IntPtr cPtr)
+        {
+            Hover ret = new Hover(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// The time (in ms) that the hover event occurred.
+        /// </summary>
+        public uint Time
+        {
+            get
+            {
+                return time;
+            }
+        }
 
-  public static Hover GetHoverFromPtr(global::System.IntPtr cPtr) {
-    Hover ret = new Hover(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Returns the ID of the device used for the Point specified.
+        /// Each point has a unique device ID which specifies the device used for that
+        /// point. This is returned by this method.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The Device ID of this poin</returns>
+        public int GetDeviceId(uint point)
+        {
+            if (point < points.Count)
+            {
+                return points[(int)point].deviceId;
+            }
+            return -1;
+        }
 
-  public uint Time
-  {
-    get
-    {
-      return time;
-    }
-  }
+        /// <summary>
+        /// Retrieves the State of the point specified.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The state of the point specified</returns>
+        public PointStateType GetState(uint point)
+        {
+            if (point < points.Count)
+            {
+                return (Tizen.NUI.PointStateType)(points[(int)point].state);
+            }
+            return PointStateType.Finished;
+        }
 
-  public int GetDeviceId(uint point) {
-    if( point < points.Count )
-    {
-      return points[(int)point].deviceId;
-    }
-    return -1;
-  }
+        /// <summary>
+        /// Retrieves the actor that was underneath the point specified.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The actor that was underneath the point specified</returns>
+        public Actor GetHitActor(uint point)
+        {
+            if (point < points.Count)
+            {
+                return points[(int)point].hitActor;
+            }
+            else
+            {
+                // Return a native empty handle
+                Actor actor = new Actor();
+                actor.Reset();
+                return actor;
+            }
+        }
 
-  public PointStateType GetState(uint point) {
-    if( point < points.Count )
-    {
-      return (Tizen.NUI.PointStateType)(points[(int)point].state);
-    }
-    return PointStateType.FINISHED;
-  }
+        /// <summary>
+        /// Retrieves the co-ordinates relative to the top-left of the hit-actor at the point specified.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The co-ordinates relative to the top-left of the hit-actor of the point specified</returns>
+        public Vector2 GetLocalPosition(uint point)
+        {
+            if (point < points.Count)
+            {
+                return points[(int)point].local;
+            }
+            return new Vector2(0.0f, 0.0f);
+        }
 
-  public Actor GetHitActor(uint point) {
-    if( point < points.Count )
-    {
-      return points[(int)point].hitActor;
-    }
-    else
-    {
-      // Return a native empty handle
-      Actor actor = new Actor();
-      actor.Reset();
-      return actor;
-    }
-  }
+        /// <summary>
+        /// Retrieves the co-ordinates relative to the top-left of the screen of the point specified.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The co-ordinates relative to the top-left of the screen of the point specified</returns>
+        public Vector2 GetScreenPosition(uint point)
+        {
+            if (point < points.Count)
+            {
+                return points[(int)point].screen;
+            }
+            return new Vector2(0.0f, 0.0f);
+        }
 
-  public Vector2 GetLocalPosition(uint point) {
-    if( point < points.Count )
-    {
-      return points[(int)point].local;
-    }
-    return new Vector2(0.0f, 0.0f);
-  }
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public Hover() : this(NDalicPINVOKE.new_Hover__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Vector2 GetScreenPosition(uint point) {
-    if( point < points.Count )
-    {
-      return points[(int)point].screen;
-    }
-    return new Vector2(0.0f, 0.0f);
-  }
-
-  public Hover() : this(NDalicPINVOKE.new_Hover__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  private TouchPointContainer points {
-    set {
-      NDalicPINVOKE.Hover_points_set(swigCPtr, TouchPointContainer.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Hover_points_get(swigCPtr);
-      TouchPointContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new TouchPointContainer(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint time {
-    set {
-      NDalicPINVOKE.Hover_time_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.Hover_time_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public uint GetPointCount() {
-    uint ret = NDalicPINVOKE.Hover_GetPointCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TouchPoint GetPoint(uint point) {
-    TouchPoint ret = new TouchPoint(NDalicPINVOKE.Hover_GetPoint(swigCPtr, point), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="time">The time the event occurred</param>
+        public Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        private TouchPointContainer points
+        {
+            set
+            {
+                NDalicPINVOKE.Hover_points_set(swigCPtr, TouchPointContainer.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Hover_points_get(swigCPtr);
+                TouchPointContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new TouchPointContainer(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint time
+        {
+            set
+            {
+                NDalicPINVOKE.Hover_time_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.Hover_time_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Returns the total number of points.
+        /// </summary>
+        /// <returns>Total number of Points</returns>
+        public uint GetPointCount()
+        {
+            uint ret = NDalicPINVOKE.Hover_GetPointCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal TouchPoint GetPoint(uint point)
+        {
+            TouchPoint ret = new TouchPoint(NDalicPINVOKE.Hover_GetPoint(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
 
 }
index 46ad000..a9c9121 100755 (executable)
@@ -14,7 +14,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class Image : BaseHandle {
+    internal class Image : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Image(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Image_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -134,7 +134,7 @@ public class UploadedEventArgs : EventArgs
 
 public static Image GetImageFromPtr(global::System.IntPtr cPtr) {
     Image ret = new Image(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
index 5414e1e..57228d4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ImageSignal : global::System.IDisposable {
+    internal class ImageSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 568f6fd..64c5aaa 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class ImageView : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// ImageView is a class for displaying an image resource.
+    /// An instance of ImageView can be created using a URL or an Image instance.
+    /// </summary>
+    public class ImageView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal ImageView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ImageView_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal ImageView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ImageView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ImageView obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ImageView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~ImageView() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~ImageView()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_ImageView(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_ImageView(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();
-    }
-  }
 
 
-  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_ImageView_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_ImageView_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int RESOURCE_URL = NDalicPINVOKE.ImageView_Property_RESOURCE_URL_get();
-    public static readonly int IMAGE = NDalicPINVOKE.ImageView_Property_IMAGE_get();
-    public static readonly int PRE_MULTIPLIED_ALPHA = NDalicPINVOKE.ImageView_Property_PRE_MULTIPLIED_ALPHA_get();
-    public static readonly int PIXEL_AREA = NDalicPINVOKE.ImageView_Property_PIXEL_AREA_get();
-  
-  }
-
-  public ImageView () : this (NDalicPINVOKE.ImageView_New__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ImageView (Image image) : this (NDalicPINVOKE.ImageView_New__SWIG_1(Image.getCPtr(image)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ImageView (string url) : this (NDalicPINVOKE.ImageView_New__SWIG_2(url), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ImageView (string url, Uint16Pair size) : this (NDalicPINVOKE.ImageView_New__SWIG_3(url, Uint16Pair.getCPtr(size)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ImageView(ImageView imageView) : this(NDalicPINVOKE.new_ImageView__SWIG_1(ImageView.getCPtr(imageView)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ImageView Assign(ImageView imageView) {
-    ImageView ret = new ImageView(NDalicPINVOKE.ImageView_Assign(swigCPtr, ImageView.getCPtr(imageView)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static ImageView DownCast(BaseHandle handle) {
-    ImageView ret = new ImageView(NDalicPINVOKE.ImageView_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetImage(Image image) {
-    NDalicPINVOKE.ImageView_SetImage__SWIG_0(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetImage(string url) {
-    NDalicPINVOKE.ImageView_SetImage__SWIG_1(swigCPtr, url);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetImage(string url, Uint16Pair size) {
-    NDalicPINVOKE.ImageView_SetImage__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Image GetImage() {
-    Image ret = new Image(NDalicPINVOKE.ImageView_GetImage(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000,
-    ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
-    ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000
-  }
-
-  public string ResourceUrl
-  {
-    get
-    {
-      string temp;
-      GetProperty( ImageView.Property.RESOURCE_URL).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.RESOURCE_URL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map ImageMap
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ImageView.Property.IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool PreMultipliedAlpha
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 PixelArea
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( ImageView.Property.PIXEL_AREA).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ImageView.Property.PIXEL_AREA, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
 
-}
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_ImageView_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_ImageView_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int RESOURCE_URL = NDalicPINVOKE.ImageView_Property_RESOURCE_URL_get();
+            internal static readonly int IMAGE = NDalicPINVOKE.ImageView_Property_IMAGE_get();
+            internal static readonly int PRE_MULTIPLIED_ALPHA = NDalicPINVOKE.ImageView_Property_PRE_MULTIPLIED_ALPHA_get();
+            internal static readonly int PIXEL_AREA = NDalicPINVOKE.ImageView_Property_PIXEL_AREA_get();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized ImageView.
+        /// </summary>
+        public ImageView() : this(NDalicPINVOKE.ImageView_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        /// <summary>
+        /// Creates an initialized ImageView from an URL to an image resource.
+        /// If the string is empty, ImageView will not display anything.
+        /// </summary>
+        /// <param name="url">The url of the image resource to display</param>
+        public ImageView(string url) : this(NDalicPINVOKE.ImageView_New__SWIG_2(url), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal ImageView(string url, Uint16Pair size) : this(NDalicPINVOKE.ImageView_New__SWIG_3(url, Uint16Pair.getCPtr(size)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal ImageView(ImageView imageView) : this(NDalicPINVOKE.new_ImageView__SWIG_1(ImageView.getCPtr(imageView)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+        internal ImageView Assign(ImageView imageView)
+        {
+            ImageView ret = new ImageView(NDalicPINVOKE.ImageView_Assign(swigCPtr, ImageView.getCPtr(imageView)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+        /// <summary>
+        /// Downcasts a handle to ImageView handle.
+        /// If handle points to a ImageView, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a ImageView or an uninitialized handle</returns>
+        public new static ImageView DownCast(BaseHandle handle)
+        {
+            ImageView ret = new ImageView(NDalicPINVOKE.ImageView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+        /// <summary>
+        /// Sets this ImageView from the given URL.
+        /// If the URL is empty, ImageView will not display anything.
+        /// </summary>
+        /// <param name="url">The URL to the image resource to display</param>
+        public void SetImage(string url)
+        {
+            NDalicPINVOKE.ImageView_SetImage__SWIG_1(swigCPtr, url);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+        internal void SetImage(string url, Uint16Pair size)
+        {
+            NDalicPINVOKE.ImageView_SetImage__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000,
+            ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
+            ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// ImageView ResourceUrl, type string
+        /// </summary>
+        public string ResourceUrl
+        {
+            get
+            {
+                string temp;
+                GetProperty(ImageView.Property.RESOURCE_URL).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ImageView.Property.RESOURCE_URL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// ImageView ImageMap, type PropertyMap : string if it is a url, map otherwise
+        /// </summary>
+        public PropertyMap ImageMap
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(ImageView.Property.IMAGE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ImageView.Property.IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// ImageView PreMultipliedAlpha, type Boolean
+        /// Image must be initialized.
+        /// </summary>
+        public bool PreMultipliedAlpha
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(ImageView.Property.PRE_MULTIPLIED_ALPHA).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ImageView.Property.PRE_MULTIPLIED_ALPHA, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// ImageView PixelArea, type Vector4 (Animatable property)
+        /// Pixel area is a relative value with the whole image area as [0.0, 0.0, 1.0, 1.0].
+        /// </summary>
+        public Vector4 PixelArea
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(ImageView.Property.PIXEL_AREA).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ImageView.Property.PIXEL_AREA, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 88ca512..416d033 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Item : global::System.IDisposable {
+    internal class Item : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 1a2b5ba..0cbbc0d 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+    internal class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<Item>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
index df50257..eac55d0 100755 (executable)
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
-using System;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
 
-#if true
+#define DOT_NET_CORE
+#if (DOT_NET_CORE)
 using System.Reflection;
 #endif
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class ItemFactory : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    internal class ItemFactory : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal ItemFactory(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal ItemFactory(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ItemFactory obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ItemFactory obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~ItemFactory() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~ItemFactory()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_ItemFactory(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ItemFactory(swigCPtr);
+        public virtual uint GetNumberOfItems()
+        {
+            uint ret = NDalicPINVOKE.ItemFactory_GetNumberOfItems(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual Actor NewItem(uint itemId)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual void ItemReleased(uint itemId, Actor actor)
+        {
+            if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, Actor.getCPtr(actor)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, Actor.getCPtr(actor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public ItemFactory() : this(NDalicPINVOKE.new_ItemFactory(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            SwigDirectorConnect();
+        }
+
+        private void SwigDirectorConnect()
+        {
+            if (SwigDerivedClassHasMethod("GetNumberOfItems", swigMethodTypes0))
+                swigDelegate0 = new SwigDelegateItemFactory_0(SwigDirectorGetNumberOfItems);
+            if (SwigDerivedClassHasMethod("NewItem", swigMethodTypes1))
+                swigDelegate1 = new SwigDelegateItemFactory_1(SwigDirectorNewItem);
+            if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2))
+                swigDelegate2 = new SwigDelegateItemFactory_2(SwigDirectorItemReleased);
+            NDalicPINVOKE.ItemFactory_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2);
+        }
+
+#if (DOT_NET_CORE)
+        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
+        {
+            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
+            bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ItemFactory));
+            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);
+            return hasDerivedMethod;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public virtual uint GetNumberOfItems() {
-    uint ret = NDalicPINVOKE.ItemFactory_GetNumberOfItems(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual Actor NewItem(uint itemId) {
-    Actor ret = new Actor(NDalicPINVOKE.ItemFactory_NewItem(swigCPtr, itemId), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void ItemReleased(uint itemId, Actor actor) {
-    if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2)) NDalicPINVOKE.ItemFactory_ItemReleasedSwigExplicitItemFactory(swigCPtr, itemId, Actor.getCPtr(actor)); else NDalicPINVOKE.ItemFactory_ItemReleased(swigCPtr, itemId, Actor.getCPtr(actor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ItemFactory() : this(NDalicPINVOKE.new_ItemFactory(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    SwigDirectorConnect();
-  }
-
-  private void SwigDirectorConnect() {
-    if (SwigDerivedClassHasMethod("GetNumberOfItems", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateItemFactory_0(SwigDirectorGetNumberOfItems);
-    if (SwigDerivedClassHasMethod("NewItem", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateItemFactory_1(SwigDirectorNewItem);
-    if (SwigDerivedClassHasMethod("ItemReleased", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateItemFactory_2(SwigDirectorItemReleased);
-    NDalicPINVOKE.ItemFactory_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2);
-  }\r
-\r
-\r
-#if true
-        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)\r
-        {\r
-            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);\r
-            bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ItemFactory));\r
-            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);\r
-            return hasDerivedMethod;\r
-        }\r
 #else
-//original
-  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
-    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ItemFactory));
-    //Console.WriteLine("ItemFactory.cs hasDerivedMethod=" + hasDerivedMethod);                
-    return hasDerivedMethod;
-  }
+        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
+        {
+            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
+            bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ItemFactory));
+            return hasDerivedMethod;
+        }
 #endif
-\r
-\r
-        private uint SwigDirectorGetNumberOfItems() {
-    return GetNumberOfItems();
-  }
-
-  private global::System.IntPtr SwigDirectorNewItem(uint itemId) {
-    return Actor.getCPtr(NewItem(itemId)).Handle;
-  }
-
-  private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor) {
-    ItemReleased(itemId, new Actor(actor, true));
-  }
-
-  public delegate uint SwigDelegateItemFactory_0();
-  public delegate global::System.IntPtr SwigDelegateItemFactory_1(uint itemId);
-  public delegate void SwigDelegateItemFactory_2(uint itemId, global::System.IntPtr actor);
-
-  private SwigDelegateItemFactory_0 swigDelegate0;
-  private SwigDelegateItemFactory_1 swigDelegate1;
-  private SwigDelegateItemFactory_2 swigDelegate2;
-
-  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { typeof(uint) };
-  private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(Actor) };
-}
+
+        private uint SwigDirectorGetNumberOfItems()
+        {
+            return GetNumberOfItems();
+        }
+
+        private global::System.IntPtr SwigDirectorNewItem(uint itemId)
+        {
+            return Actor.getCPtr(NewItem(itemId)).Handle;
+        }
+
+        private void SwigDirectorItemReleased(uint itemId, global::System.IntPtr actor)
+        {
+            ItemReleased(itemId, new Actor(actor, true));
+        }
+
+        public delegate uint SwigDelegateItemFactory_0();
+        public delegate global::System.IntPtr SwigDelegateItemFactory_1(uint itemId);
+        public delegate void SwigDelegateItemFactory_2(uint itemId, global::System.IntPtr actor);
+
+        private SwigDelegateItemFactory_0 swigDelegate0;
+        private SwigDelegateItemFactory_1 swigDelegate1;
+        private SwigDelegateItemFactory_2 swigDelegate2;
+
+        private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { typeof(uint) };
+        private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(uint), typeof(Actor) };
+    }
 
 }
index 8c13d4c..37267b4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+    internal class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IList<uint>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
index 8341636..45b231c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ItemLayout : RefObject {
+    internal class ItemLayout : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ItemLayout(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemLayout_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -56,13 +56,13 @@ public class ItemLayout : RefObject {
     return ret;
   }
 
-  public void SetLayoutProperties(Property.Map properties) {
-    NDalicPINVOKE.ItemLayout_SetLayoutProperties(swigCPtr, Property.Map.getCPtr(properties));
+  public void SetLayoutProperties(PropertyMap properties) {
+    NDalicPINVOKE.ItemLayout_SetLayoutProperties(swigCPtr, PropertyMap.getCPtr(properties));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Property.Map GetLayoutProperties() {
-    Property.Map ret = new Property.Map(NDalicPINVOKE.ItemLayout_GetLayoutProperties(swigCPtr), true);
+  public PropertyMap GetLayoutProperties() {
+    PropertyMap ret = new PropertyMap(NDalicPINVOKE.ItemLayout_GetLayoutProperties(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
@@ -142,7 +142,7 @@ public class ItemLayout : RefObject {
     return ret;
   }
 
-  public virtual int GetNextFocusItemID(int itemID, int maxItems, View.KeyboardFocus.Direction direction, bool loopEnabled) {
+  public virtual int GetNextFocusItemID(int itemID, int maxItems, View.FocusDirection direction, bool loopEnabled) {
     int ret = NDalicPINVOKE.ItemLayout_GetNextFocusItemID(swigCPtr, itemID, maxItems, (int)direction, loopEnabled);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 1c46776..4b95501 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ItemRange : global::System.IDisposable {
+    internal class ItemRange : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5f101ac..7f7d950 100755 (executable)
@@ -30,7 +30,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class ItemView : Scrollable {
+    internal class ItemView : Scrollable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ItemView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemView_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -65,17 +65,17 @@ public class ItemView : Scrollable {
   }
 
 
-  public Tizen.NUI.Property.Array Layout
+  public Tizen.NUI.PropertyArray Layout
   {
     get
     {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
+      Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
       GetProperty( ItemView.Property.LAYOUT).Get( temp );
       return temp;
     }
     set
     {
-      SetProperty( ItemView.Property.LAYOUT, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.LAYOUT, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
@@ -361,7 +361,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float MinimumSwipeDistance
@@ -374,7 +374,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float WheelScrollDistanceStep
@@ -387,7 +387,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool SnapToItemEnabled
@@ -400,7 +400,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float RefreshInterval
@@ -413,7 +413,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.REFRESH_INTERVAL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.REFRESH_INTERVAL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float LayoutPosition
@@ -426,7 +426,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.LAYOUT_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.LAYOUT_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float ScrollSpeed
@@ -439,7 +439,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.SCROLL_SPEED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.SCROLL_SPEED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float Overshoot
@@ -452,7 +452,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.OVERSHOOT, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.OVERSHOOT, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollDirection
@@ -465,7 +465,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.SCROLL_DIRECTION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.SCROLL_DIRECTION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int LayoutOrientation
@@ -478,7 +478,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.LAYOUT_ORIENTATION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.LAYOUT_ORIENTATION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float ScrollContentSize
@@ -491,7 +491,7 @@ public class ItemView : Scrollable {
     }
     set
     {
-      SetProperty( ItemView.Property.SCROLL_CONTENT_SIZE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ItemView.Property.SCROLL_CONTENT_SIZE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 74a46c5..9e71aeb 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Key : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// The key structure is used to store a key press.
+    /// </summary> 
+    public class Key : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Key(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Key(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(Key obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Key obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Key() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Key()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Key(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Key(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
 
-  public static Key GetKeyFromPtr(global::System.IntPtr cPtr) {
-    Key ret = new Key(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal static Key GetKeyFromPtr(global::System.IntPtr cPtr)
+        {
+            Key ret = new Key(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public string KeyPressedName
-  {
-    get
-    {
-      return keyPressedName;
-    }
-  }
+        /// <summary>
+        /// Name given to the key pressed
+        /// </summary> 
+        public string KeyPressedName
+        {
+            get
+            {
+                return keyPressedName;
+            }
+        }
 
-  public string KeyPressed
-  {
-    get
-    {
-      return keyPressed;
-    }
-  }
+        /* duplicated with KeyPressedName : removed
+        public string KeyPressed
+        {
+            get
+            {
+                return keyPressed;
+            }
+        }
+        */
 
-  public int KeyCode
-  {
-    get
-    {
-      return keyCode;
-    }
-  }
+        /// <summary>
+        /// Keycode for the key pressed.
+        /// </summary> 
+        public int KeyCode
+        {
+            get
+            {
+                return keyCode;
+            }
+        }
 
-  public int KeyModifier
-  {
-    get
-    {
-      return keyModifier;
-    }
-  }
+        /// <summary>
+        /// Special keys like shift, alt and control which modify the next key pressed.
+        /// </summary> 
+        public int KeyModifier
+        {
+            get
+            {
+                return keyModifier;
+            }
+        }
 
-  public uint Time
-  {
-    get
-    {
-      return time;
-    }
-  }
+        /// <summary>
+        /// The time (in ms) that the key event occurred.
+        /// </summary> 
+        public uint Time
+        {
+            get
+            {
+                return time;
+            }
+        }
 
-  public Key.StateType State
-  {
-    get
-    {
-      return state;
-    }
-  }
-
-  public Key() : this(NDalicPINVOKE.new_Key__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsShiftModifier() {
-    bool ret = NDalicPINVOKE.Key_IsShiftModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsCtrlModifier() {
-    bool ret = NDalicPINVOKE.Key_IsCtrlModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsAltModifier() {
-    bool ret = NDalicPINVOKE.Key_IsAltModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private string keyPressedName {
-    set {
-      NDalicPINVOKE.Key_keyPressedName_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      string ret = NDalicPINVOKE.Key_keyPressedName_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private string keyPressed {
-    set {
-      NDalicPINVOKE.Key_keyPressed_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      string ret = NDalicPINVOKE.Key_keyPressed_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int keyCode {
-    set {
-      NDalicPINVOKE.Key_keyCode_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Key_keyCode_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int keyModifier {
-    set {
-      NDalicPINVOKE.Key_keyModifier_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Key_keyModifier_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint time {
-    set {
-      NDalicPINVOKE.Key_time_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.Key_time_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Key.StateType state {
-    set {
-      NDalicPINVOKE.Key_state_set(swigCPtr, (int)value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      Key.StateType ret = (Key.StateType)NDalicPINVOKE.Key_state_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public enum StateType {
-    Down,
-    Up,
-    Last
-  }
+        /// <summary>
+        /// State of the key event.
+        /// </summary> 
+        public Key.StateType State
+        {
+            get
+            {
+                return state;
+            }
+        }
 
-}
+        /// <summary>
+        /// Default Constructor.
+        /// </summary> 
+        public Key() : this(NDalicPINVOKE.new_Key__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="keyName">The name of the key pressed or command from the IMF, if later then the some following parameters will be needed</param>
+        /// <param name="keyString">A string of input characters or key pressed</param>
+        /// <param name="keyCode">The unique key code for the key pressed</param>
+        /// <param name="keyModifier">The key modifier for special keys like shift and alt</param>
+        /// <param name="timeStamp">The time (in ms) that the key event occurred</param>
+        /// <param name="keyState">The state of the key event</param>
+        public Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks to see if Shift key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if shift modifier</returns>
+        public bool IsShiftModifier()
+        {
+            bool ret = NDalicPINVOKE.Key_IsShiftModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Checks to see if Ctrl (control) key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if ctrl modifier</returns>
+        public bool IsCtrlModifier()
+        {
+            bool ret = NDalicPINVOKE.Key_IsCtrlModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Checks to see if Alt key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if alt modifier</returns>
+        public bool IsAltModifier()
+        {
+            bool ret = NDalicPINVOKE.Key_IsAltModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private string keyPressedName
+        {
+            set
+            {
+                NDalicPINVOKE.Key_keyPressedName_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                string ret = NDalicPINVOKE.Key_keyPressedName_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private string keyPressed
+        {
+            set
+            {
+                NDalicPINVOKE.Key_keyPressed_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                string ret = NDalicPINVOKE.Key_keyPressed_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int keyCode
+        {
+            set
+            {
+                NDalicPINVOKE.Key_keyCode_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Key_keyCode_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int keyModifier
+        {
+            set
+            {
+                NDalicPINVOKE.Key_keyModifier_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Key_keyModifier_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint time
+        {
+            set
+            {
+                NDalicPINVOKE.Key_time_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.Key_time_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Key.StateType state
+        {
+            set
+            {
+                NDalicPINVOKE.Key_state_set(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Key.StateType ret = (Key.StateType)NDalicPINVOKE.Key_state_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Enumeration for specifying the state of the key event.
+        /// </summary>
+        public enum StateType
+        {
+            Down,
+            Up,
+            Last
+        }
+
+    }
 
 }
index 742c69b..c37b3be 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class KeyEventSignal : global::System.IDisposable {
+    internal class KeyEventSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index ccd4297..0c1d63a 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class KeyFrames : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal KeyFrames(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.KeyFrames_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(KeyFrames obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~KeyFrames() {
-    DisposeQueue.Instance.Add(this);
-  }
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// A set of key frames for a property that can be animated using Dali Animation.
+    /// This allows the generation of key frame objects from individual Property::Values.
+    /// </summary>
+    public class KeyFrames : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal KeyFrames(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.KeyFrames_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(KeyFrames obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_KeyFrames(swigCPtr);
+        ~KeyFrames()
+        {
+            DisposeQueue.Instance.Add(this);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        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_KeyFrames(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
 
-  public void Add(float progress, object value)
-  {
-    dynamic obj = value;
-    Add(progress, new Property.Value(obj));
-  }
 
-  public void Add(float progress, object value, AlphaFunction alpha)
-  {
-    dynamic obj = value;
-    Add(progress, new Property.Value(obj), alpha);
-  }
+        /// <summary>
+        /// Adds a key frame.
+        /// </summary>
+        /// <param name="progress">A progress value between 0.0 and 1.0</param>
+        /// <param name="value">A value</param>
+        public void Add(float progress, object value)
+        {
+            dynamic obj = value;
+            Add(progress, new PropertyValue(obj));
+        }
 
+        /// <summary>
+        /// Adds a key frame.
+        /// </summary>
+        /// <param name="progress">A progress value between 0.0 and 1.0</param>
+        /// <param name="value">A value</param>
+        /// <param name="alpha">The alpha function used to blend to the next keyframe</param>
+        public void Add(float progress, object value, AlphaFunction alpha)
+        {
+            dynamic obj = value;
+            Add(progress, new PropertyValue(obj), alpha);
+        }
 
-  public KeyFrames () : this (NDalicPINVOKE.KeyFrames_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        /// <summary>
+        /// Creates an initialized KeyFrames handle.
+        /// </summary>
+        public KeyFrames() : this(NDalicPINVOKE.KeyFrames_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-  }
-  public static KeyFrames DownCast(BaseHandle handle) {
-    KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        }
+        /// <summary>
+        /// Downcasts a handle to KeyFrames handle.
+        /// If handle points to a KeyFrames object, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a KeyFrames object or an uninitialized handle</returns>
+        public static KeyFrames DownCast(BaseHandle handle)
+        {
+            KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public KeyFrames(KeyFrames handle) : this(NDalicPINVOKE.new_KeyFrames__SWIG_1(KeyFrames.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal KeyFrames(KeyFrames handle) : this(NDalicPINVOKE.new_KeyFrames__SWIG_1(KeyFrames.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public KeyFrames Assign(KeyFrames rhs) {
-    KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_Assign(swigCPtr, KeyFrames.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal KeyFrames Assign(KeyFrames rhs)
+        {
+            KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_Assign(swigCPtr, KeyFrames.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public Property.Type GetType() {
-    Property.Type ret = (Property.Type)NDalicPINVOKE.KeyFrames_GetType(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Gets the type of the key frame.
+        /// </summary>
+        /// <returns>The key frame property type</returns>
+        public PropertyType GetType()
+        {
+            PropertyType ret = (PropertyType)NDalicPINVOKE.KeyFrames_GetType(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public void Add(float progress, Property.Value value) {
-    NDalicPINVOKE.KeyFrames_Add__SWIG_0(swigCPtr, progress, Property.Value.getCPtr(value));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Adds a key frame.
+        /// </summary>
+        /// <param name="progress">A progress value between 0.0 and 1.0</param>
+        /// <param name="value">A value</param>
+        public void Add(float progress, PropertyValue value)
+        {
+            NDalicPINVOKE.KeyFrames_Add__SWIG_0(swigCPtr, progress, PropertyValue.getCPtr(value));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public void Add(float progress, Property.Value value, AlphaFunction alpha) {
-    NDalicPINVOKE.KeyFrames_Add__SWIG_1(swigCPtr, progress, Property.Value.getCPtr(value), AlphaFunction.getCPtr(alpha));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        /// <summary>
+        /// Adds a key frame.
+        /// </summary>
+        /// <param name="progress">A progress value between 0.0 and 1.0</param>
+        /// <param name="value">A value</param>
+        /// <param name="alpha">The alpha function used to blend to the next keyframe</param>
+        public void Add(float progress, PropertyValue value, AlphaFunction alpha)
+        {
+            NDalicPINVOKE.KeyFrames_Add__SWIG_1(swigCPtr, progress, PropertyValue.getCPtr(value), AlphaFunction.getCPtr(alpha));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+    }
 
 }
index 14cca34..29e6d69 100755 (executable)
@@ -71,13 +71,13 @@ public class KeyInputFocusManager : BaseHandle {
     return ret;
   }
 
-  public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() {
+  internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() {
     SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(NDalicPINVOKE.KeyInputFocusManager_KeyInputFocusChangedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public KeyEventSignal UnhandledKeyEventSignal() {
+  internal KeyEventSignal UnhandledKeyEventSignal() {
     KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.KeyInputFocusManager_UnhandledKeyEventSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index e2da4b2..e8406de 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class KeyInputFocusSignal : global::System.IDisposable {
+    internal class KeyInputFocusSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index d88d808..0e2ea77 100755 (executable)
@@ -19,9 +19,9 @@ using System;
 
 namespace Tizen.NUI {
 
-public delegate IntPtr SwigDelegatePreFocusChangeSignal(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction);
+internal delegate IntPtr SwigDelegatePreFocusChangeSignal(IntPtr current, IntPtr proposed, View.FocusDirection direction);
 
-public class PreFocusChangeSignal : global::System.IDisposable {
+internal class PreFocusChangeSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -68,7 +68,7 @@ public class PreFocusChangeSignal : global::System.IDisposable {
     return ret;
   }
 
-  public void Connect(FocusManager.PreFocusChangeEventCallbackDelegate func) {
+  public void Connect(FocusManager.PreFocusChangeEventCallback func) {
      NDalicManualPINVOKE.PreFocusChangeSignal_Connect(swigCPtr, func);
      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
  }
@@ -81,7 +81,7 @@ public class PreFocusChangeSignal : global::System.IDisposable {
     }
   }
 
-  public Actor Emit(Actor arg1, Actor arg2, View.KeyboardFocus.Direction arg3) {
+  public Actor Emit(Actor arg1, Actor arg2, View.FocusDirection arg3) {
     Actor ret = new Actor(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, Actor.getCPtr(arg1), Actor.getCPtr(arg2), (int)arg3), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 56d7c55..f5a323a 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Layer : Actor {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// Layers provide a mechanism for overlaying groups of actors on top of each other.
+    /// </summary>
+    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 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;
-  }
+        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);
-  }
+        ~Layer()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Layer_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_Layer_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int CLIPPING_ENABLE = NDalicPINVOKE.Layer_Property_CLIPPING_ENABLE_get();
+            internal static readonly int CLIPPING_BOX = NDalicPINVOKE.Layer_Property_CLIPPING_BOX_get();
+            internal static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get();
 
-    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);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Creates a Layer object.
+        /// </summary>
+        public Layer() : this(NDalicPINVOKE.Layer_New(), true)
+        {
+            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_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 Tizen.NUI.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 Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Layer.LayerBehavior Behavior 
-  { 
-    get 
-    {
-      return GetBehavior();
-    }
-    set 
-    { 
-      SetBehavior( value );
-    }
-  }
+        }
+        /// <summary>
+        /// Downcasts a handle to Layer handle.
+        /// If handle points to a Layer, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a Layer or an uninitialized handle</returns>
+        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;
+        }
 
-}
+        internal Layer(Layer copy) : this(NDalicPINVOKE.new_Layer__SWIG_1(Layer.getCPtr(copy)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal 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;
+        }
+
+        /// <summary>
+        /// Queries the depth of the layer.
+        /// 0 is the bottom most layer, higher number is on top.
+        /// </summary>
+        public uint Depth
+        {
+            get
+            {
+                return GetDepth();
+            }
+        }
+
+        internal uint GetDepth()
+        {
+            uint ret = NDalicPINVOKE.Layer_GetDepth(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Increments the depth of the layer.
+        /// </summary>
+        public void Raise()
+        {
+            NDalicPINVOKE.Layer_Raise(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Decrements the depth of the layer.
+        /// </summary>
+        public void Lower()
+        {
+            NDalicPINVOKE.Layer_Lower(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void RaiseAbove(Layer target)
+        {
+            NDalicPINVOKE.Layer_RaiseAbove(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void LowerBelow(Layer target)
+        {
+            NDalicPINVOKE.Layer_LowerBelow(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Raises the layer to the top.
+        /// </summary>
+        public void RaiseToTop()
+        {
+            NDalicPINVOKE.Layer_RaiseToTop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Lowers the layer to the bottom.
+        /// </summary>
+        public void LowerToBottom()
+        {
+            NDalicPINVOKE.Layer_LowerToBottom(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Moves the layer directly above the given layer.
+        /// After the call, this layers depth will be immediately above target.
+        /// </summary>
+        /// <param name="target">Layer to get on top of</param>
+        public void MoveAbove(Layer target)
+        {
+            NDalicPINVOKE.Layer_MoveAbove(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Moves the layer directly below the given layer
+        /// After the call, this layers depth will be immediately below target.
+        /// </summary>
+        /// <param name="target">Layer to get below of</param>
+        public void MoveBelow(Layer target)
+        {
+            NDalicPINVOKE.Layer_MoveBelow(swigCPtr, Layer.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetBehavior(LayerBehavior behavior)
+        {
+            NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal LayerBehavior GetBehavior()
+        {
+            Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetClipping(bool enabled)
+        {
+            NDalicPINVOKE.Layer_SetClipping(swigCPtr, enabled);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsClipping()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsClipping(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal 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();
+        }
+
+        /// <summary>
+        /// Sets the clipping box of a layer, in window coordinates.
+        /// The contents of the layer will not be visible outside this box, when clipping is
+        /// enabled. The default clipping box is empty (0,0,0,0) which means everything is clipped.
+        /// </summary>
+        /// <param name="box">The clipping box</param>
+        public void SetClippingBox(Rectangle box)
+        {
+            NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the clipping box of a layer in window coordinates.
+        /// </summary>
+        /// <returns>The clipping box</returns>
+        public Rectangle GetClippingBox()
+        {
+            Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetDepthTestDisabled(bool disable)
+        {
+            NDalicPINVOKE.Layer_SetDepthTestDisabled(swigCPtr, disable);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsDepthTestDisabled()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsDepthTestDisabled(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal 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();
+        }
+
+        internal void SetTouchConsumed(bool consume)
+        {
+            NDalicPINVOKE.Layer_SetTouchConsumed(swigCPtr, consume);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsTouchConsumed()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsTouchConsumed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetHoverConsumed(bool consume)
+        {
+            NDalicPINVOKE.Layer_SetHoverConsumed(swigCPtr, consume);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal bool IsHoverConsumed()
+        {
+            bool ret = NDalicPINVOKE.Layer_IsHoverConsumed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Enumeration for the behavior of the layer.
+        /// </summary>
+        public enum LayerBehavior
+        {
+            Layer2D,
+            LayerUI = Layer2D,
+            Layer3D
+        }
+
+        internal enum TreeDepthMultiplier
+        {
+            TREE_DEPTH_MULTIPLIER = 10000
+        }
+
+        /// <summary>
+        /// Layer ClippingEnable, type bool
+        /// </summary>
+        public bool ClippingEnable
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Layer.Property.CLIPPING_ENABLE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Layer.Property.CLIPPING_ENABLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Layer ClippingBox, type Rectangle
+        /// </summary>
+        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 Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Layer Behavior, type String(Layer.LayerBehavior)
+        /// </summary>
+        public Layer.LayerBehavior Behavior
+        {
+            get
+            {
+                return GetBehavior();
+            }
+            set
+            {
+                SetBehavior(value);
+            }
+        }
+
+    }
 
 }
index 4fe3330..019b617 100755 (executable)
@@ -26,8 +26,9 @@
 
 namespace Tizen.NUI {
 
-public class LinearConstrainer : Handle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    internal class LinearConstrainer : Handle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal LinearConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LinearConstrainer_SWIGUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
@@ -91,12 +92,12 @@ public class LinearConstrainer : Handle {
       }
     }
   
-    public Property() : this(NDalicPINVOKE.new_LinearConstrainer_Property(), true) {
+    internal Property() : this(NDalicPINVOKE.new_LinearConstrainer_Property(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
   
-    public static readonly int VALUE = NDalicPINVOKE.LinearConstrainer_Property_VALUE_get();
-    public static readonly int PROGRESS = NDalicPINVOKE.LinearConstrainer_Property_PROGRESS_get();
+    internal static readonly int VALUE = NDalicPINVOKE.LinearConstrainer_Property_VALUE_get();
+    internal static readonly int PROGRESS = NDalicPINVOKE.LinearConstrainer_Property_PROGRESS_get();
   
   }
 
@@ -110,15 +111,17 @@ public class LinearConstrainer : Handle {
     return ret;
   }
 
-  public LinearConstrainer(LinearConstrainer handle) : this(NDalicPINVOKE.new_LinearConstrainer__SWIG_1(LinearConstrainer.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal LinearConstrainer(LinearConstrainer handle) : this(NDalicPINVOKE.new_LinearConstrainer__SWIG_1(LinearConstrainer.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public LinearConstrainer Assign(LinearConstrainer rhs) {
-    LinearConstrainer ret = new LinearConstrainer(NDalicPINVOKE.LinearConstrainer_Assign(swigCPtr, LinearConstrainer.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal LinearConstrainer Assign(LinearConstrainer rhs)
+        {
+            LinearConstrainer ret = new LinearConstrainer(NDalicPINVOKE.LinearConstrainer_Assign(swigCPtr, LinearConstrainer.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
   public void Apply(Property target, Property source, Vector2 range, Vector2 wrap) {
     NDalicPINVOKE.LinearConstrainer_Apply__SWIG_0(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap));
@@ -130,37 +133,38 @@ public class LinearConstrainer : Handle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Remove(Handle target) {
-    NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal void Remove(Handle target)
+        {
+            NDalicPINVOKE.LinearConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Tizen.NUI.Property.Array Value
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( LinearConstrainer.Property.VALUE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( LinearConstrainer.Property.VALUE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array Progress
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( LinearConstrainer.Property.PROGRESS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( LinearConstrainer.Property.PROGRESS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        public PropertyArray Value
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(LinearConstrainer.Property.VALUE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(LinearConstrainer.Property.VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        public PropertyArray Progress
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(LinearConstrainer.Property.PROGRESS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(LinearConstrainer.Property.PROGRESS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
 }
 
index 959d97f..8287828 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum LoadingState {
+    internal enum LoadingState {
   ResourceLoading,
   ResourceLoadingSucceeded,
   ResourceLoadingFailed
index 959e820..b69a996 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// A LongPressGesture is emitted when the user holds the screen with the stated number of fingers.
+    /// Long press gesture finishes when all touches have been released.
+    /// </summary>
+    public class LongPressGesture : Gesture
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class LongPressGesture : Gesture {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal LongPressGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LongPressGesture_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal LongPressGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LongPressGesture_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(LongPressGesture obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(LongPressGesture obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~LongPressGesture()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~LongPressGesture() {
-    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_LongPressGesture(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_LongPressGesture(swigCPtr);
+        internal static LongPressGesture GetLongPressGestureFromPtr(global::System.IntPtr cPtr)
+        {
+            LongPressGesture ret = new LongPressGesture(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// The number of touch points in this long press gesture, i.e. the number of fingers the user had
+        /// on the screen to generate the long press gesture.
+        /// </summary>
+        public uint NumberOfTouches
+        {
+            get
+            {
+                return numberOfTouches;
+            }
+        }
 
-  public static LongPressGesture GetLongPressGestureFromPtr(global::System.IntPtr cPtr) {
-    LongPressGesture ret = new LongPressGesture(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// This is the point, in screen coordinates, where the long press occurred.
+        /// If a multi-touch long press, then this is the centroid of all the touch points.
+        /// </summary>
+        public Vector2 ScreenPoint
+        {
+            get
+            {
+                return screenPoint;
+            }
+        }
 
-  public uint NumberOfTouches
-  {
-    get
-    {
-      return numberOfTouches;
-    }
-  }
+        /// <summary>
+        /// This is the point, in local actor coordinates, where the long press occurred.
+        /// If a multi-touch long press, then this is the centroid of all the touch points.
+        /// </summary>
+        public Vector2 LocalPoint
+        {
+            get
+            {
+                return localPoint;
+            }
+        }
 
-  public Vector2 ScreenPoint
-  {
-    get
-    {
-      return screenPoint;
-    }
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="state">The state of the gesture</param>
+        public LongPressGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_0((int)state), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Vector2 LocalPoint
-  {
-    get
-    {
-      return localPoint;
-    }
-  }
-
-  public LongPressGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_0((int)state), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public LongPressGesture(LongPressGesture rhs) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_1(LongPressGesture.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public LongPressGesture Assign(LongPressGesture rhs) {
-    LongPressGesture ret = new LongPressGesture(NDalicPINVOKE.LongPressGesture_Assign(swigCPtr, LongPressGesture.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private uint numberOfTouches {
-    set {
-      NDalicPINVOKE.LongPressGesture_numberOfTouches_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.LongPressGesture_numberOfTouches_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenPoint {
-    set {
-      NDalicPINVOKE.LongPressGesture_screenPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.LongPressGesture_screenPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 localPoint {
-    set {
-      NDalicPINVOKE.LongPressGesture_localPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.LongPressGesture_localPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        public LongPressGesture(LongPressGesture rhs) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_1(LongPressGesture.getCPtr(rhs)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Assignment operator.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        /// <returns>A reference to this</returns>
+        public LongPressGesture Assign(LongPressGesture rhs)
+        {
+            LongPressGesture ret = new LongPressGesture(NDalicPINVOKE.LongPressGesture_Assign(swigCPtr, LongPressGesture.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private uint numberOfTouches
+        {
+            set
+            {
+                NDalicPINVOKE.LongPressGesture_numberOfTouches_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.LongPressGesture_numberOfTouches_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenPoint
+        {
+            set
+            {
+                NDalicPINVOKE.LongPressGesture_screenPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.LongPressGesture_screenPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 localPoint
+        {
+            set
+            {
+                NDalicPINVOKE.LongPressGesture_localPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.LongPressGesture_localPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index cedbc97..0739d70 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class LongPressGestureDetectedSignal : global::System.IDisposable {
+    internal class LongPressGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 68adf64..b019312 100755 (executable)
@@ -152,7 +152,7 @@ public class DetectedEventArgs : EventArgs
 
 public static LongPressGestureDetector GetLongPressGestureDetectorFromPtr(global::System.IntPtr cPtr) {
     LongPressGestureDetector ret = new LongPressGestureDetector(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -207,7 +207,7 @@ public static LongPressGestureDetector GetLongPressGestureDetectorFromPtr(global
     return ret;
   }
 
-  public LongPressGestureDetectedSignal DetectedSignal() {
+  internal LongPressGestureDetectedSignal DetectedSignal() {
     LongPressGestureDetectedSignal ret = new LongPressGestureDetectedSignal(NDalicPINVOKE.LongPressGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 6d23135..8a4a2d9 100755 (executable)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,7 +80,7 @@ namespace Tizen.NUI
         public static extern uint PreFocusChangeSignal_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_KeyboardPreFocusChangeSignal_Connect")]
-        public static extern void PreFocusChangeSignal_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, FocusManager.PreFocusChangeEventCallbackDelegate delegate1);
+        public static extern void PreFocusChangeSignal_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, FocusManager.PreFocusChangeEventCallback delegate1);
 
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_KeyboardPreFocusChangeSignal_Disconnect")]
         public static extern void PreFocusChangeSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
@@ -190,6 +190,15 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_SIBLING_ORDER_get")]
         public static extern int Actor_Property_SIBLING_ORDER_get();
 
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_OPACITY_get")]
+        public static extern int Actor_Property_OPACITY_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_SCREEN_POSITION_get")]
+        public static extern int Actor_Property_SCREEN_POSITION_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Actor_Property_POSITION_USES_ANCHOR_POINT_get")]
+        public static extern int Actor_Property_POSITION_USES_ANCHOR_POINT_get();
+
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_TOOLTIP_get")]
         public static extern int View_Property_TOOLTIP_get();
 
@@ -199,6 +208,18 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_SUB_STATE_get")]
         public static extern int View_Property_SUB_STATE_get();
 
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_LEFT_FOCUSABLE_ACTOR_ID_get")]
+        public static extern int View_Property_LEFT_FOCUSABLE_ACTOR_ID_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get")]
+        public static extern int View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_UP_FOCUSABLE_ACTOR_ID_get")]
+        public static extern int View_Property_UP_FOCUSABLE_ACTOR_ID_get();
+
+        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_View_Property_DOWN_FOCUSABLE_ACTOR_ID_get")]
+        public static extern int View_Property_DOWN_FOCUSABLE_ACTOR_ID_get();
+
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_ItemView_Property_LAYOUT_get")]
         public static extern int ItemView_Property_LAYOUT_get();
 
index 41c8f7c..8ca964e 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Matrix : global::System.IDisposable {
+    internal class Matrix : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -62,7 +62,7 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Matrix(Quaternion rotation) : this(NDalicPINVOKE.new_Matrix__SWIG_3(Quaternion.getCPtr(rotation)), true) {
+  public Matrix(Rotation rotation) : this(NDalicPINVOKE.new_Matrix__SWIG_3(Rotation.getCPtr(rotation)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -183,8 +183,8 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public static void Multiply(Matrix result, Matrix lhs, Quaternion rhs) {
-    NDalicPINVOKE.Matrix_Multiply__SWIG_1(Matrix.getCPtr(result), Matrix.getCPtr(lhs), Quaternion.getCPtr(rhs));
+  public static void Multiply(Matrix result, Matrix lhs, Rotation rhs) {
+    NDalicPINVOKE.Matrix_Multiply__SWIG_1(Matrix.getCPtr(result), Matrix.getCPtr(lhs), Rotation.getCPtr(rhs));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -206,13 +206,13 @@ public class Matrix : global::System.IDisposable {
     return ret;
   }
 
-  public void SetTransformComponents(Vector3 scale, Quaternion rotation, Vector3 translation) {
-    NDalicPINVOKE.Matrix_SetTransformComponents(swigCPtr, Vector3.getCPtr(scale), Quaternion.getCPtr(rotation), Vector3.getCPtr(translation));
+  public void SetTransformComponents(Vector3 scale, Rotation rotation, Vector3 translation) {
+    NDalicPINVOKE.Matrix_SetTransformComponents(swigCPtr, Vector3.getCPtr(scale), Rotation.getCPtr(rotation), Vector3.getCPtr(translation));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetInverseTransformComponents(Vector3 scale, Quaternion rotation, Vector3 translation) {
-    NDalicPINVOKE.Matrix_SetInverseTransformComponents__SWIG_0(swigCPtr, Vector3.getCPtr(scale), Quaternion.getCPtr(rotation), Vector3.getCPtr(translation));
+  public void SetInverseTransformComponents(Vector3 scale, Rotation rotation, Vector3 translation) {
+    NDalicPINVOKE.Matrix_SetInverseTransformComponents__SWIG_0(swigCPtr, Vector3.getCPtr(scale), Rotation.getCPtr(rotation), Vector3.getCPtr(translation));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -221,8 +221,8 @@ public class Matrix : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void GetTransformComponents(Vector3 position, Quaternion rotation, Vector3 scale) {
-    NDalicPINVOKE.Matrix_GetTransformComponents(swigCPtr, Vector3.getCPtr(position), Quaternion.getCPtr(rotation), Vector3.getCPtr(scale));
+  public void GetTransformComponents(Vector3 position, Rotation rotation, Vector3 scale) {
+    NDalicPINVOKE.Matrix_GetTransformComponents(swigCPtr, Vector3.getCPtr(position), Rotation.getCPtr(rotation), Vector3.getCPtr(scale));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 84d2111..c8eae49 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Matrix3 : global::System.IDisposable {
+    internal class Matrix3 : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 9150d64..137d81a 100755 (executable)
@@ -9,11 +9,11 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
-public enum MeshVisualShadingModeValue {
+/* moved to VisualMaps.cs
+    internal enum MeshVisualShadingModeValue {
   TEXTURELESS_WITH_DIFFUSE_LIGHTING,
   TEXTURED_WITH_SPECULAR_LIGHTING,
   TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING
 }
-
+*/
 }
index ecacfd5..860d90c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum Meta {
+    internal enum Meta {
   DIMENSION_COUNT = 2
 }
 
index b50a3f2..a428cdc 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Model3dView : View {
+    internal class Model3dView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Model3dView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Model3dView_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -153,7 +153,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.GEOMETRY_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.GEOMETRY_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public string MaterialUrl
@@ -166,7 +166,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.MATERIAL_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.MATERIAL_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public string ImagesUrl
@@ -179,7 +179,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.IMAGES_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.IMAGES_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int IlluminationType
@@ -192,7 +192,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.ILLUMINATION_TYPE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.ILLUMINATION_TYPE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public string Texture0Url
@@ -205,7 +205,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.TEXTURE0_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.TEXTURE0_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public string Texture1Url
@@ -218,7 +218,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.TEXTURE1_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.TEXTURE1_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public string Texture2Url
@@ -231,7 +231,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.TEXTURE2_URL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.TEXTURE2_URL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector3 LightPosition
@@ -244,7 +244,7 @@ public class Model3dView : View {
     }
     set
     {
-      SetProperty( Model3dView.Property.LIGHT_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Model3dView.Property.LIGHT_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 7843166..8168d23 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class NDalic {
+    internal class NDalic {
   public static uint int_to_uint(int x) {
     uint ret = NDalicPINVOKE.int_to_uint(x);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -369,7 +369,7 @@ public class NDalic {
     return ret;
   }
 
-  public static string GetName(Property.Type type) {
+  public static string GetName(PropertyType type) {
     string ret = NDalicPINVOKE.GetName((int)type);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -452,7 +452,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public static bool RegisterProperty(string objectName, string name, int index, Property.Type type, System.Delegate setFunc, System.Delegate getFunc) {
+  public static bool RegisterProperty(string objectName, string name, int index, PropertyType type, System.Delegate setFunc, System.Delegate getFunc) {
 System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(setFunc); 
 System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(getFunc); 
     {
@@ -967,6 +967,36 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
+  public static void Raise(Actor actor) {
+    NDalicPINVOKE.Raise(Actor.getCPtr(actor));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public static void Lower(Actor actor) {
+    NDalicPINVOKE.Lower(Actor.getCPtr(actor));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public static void RaiseToTop(Actor actor) {
+    NDalicPINVOKE.RaiseToTop(Actor.getCPtr(actor));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public static void LowerToBottom(Actor actor) {
+    NDalicPINVOKE.LowerToBottom(Actor.getCPtr(actor));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public static void RaiseAbove(Actor actor, Actor target) {
+    NDalicPINVOKE.RaiseAbove(Actor.getCPtr(actor), Actor.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));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
   public static FittingModeType FittingModeDefault {
     get {
       FittingModeType ret = (FittingModeType)NDalicPINVOKE.FittingModeDefault_get();
@@ -983,6 +1013,39 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     } 
   }
 
+  public static SWIGTYPE_p_Dali__SignalT_void_fboolF_t FocusChangedSignal(Window window) {
+    SWIGTYPE_p_Dali__SignalT_void_fboolF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fboolF_t(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();
@@ -1043,6 +1106,11 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor
     return ret;
   }
 
+  public static void SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface arg1) {
+    NDalicPINVOKE.SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager.getCPtr(keyboardFocusManager), CustomAlgorithmInterface.getCPtr(arg1));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
   public static readonly int VISUAL_PROPERTY_TYPE = NDalicPINVOKE.VISUAL_PROPERTY_TYPE_get();
   public static readonly int VISUAL_PROPERTY_SHADER = NDalicPINVOKE.VISUAL_PROPERTY_SHADER_get();
 
index ce29534..ba9dc18 100755 (executable)
@@ -1079,149 +1079,110 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Clamp__SWIG_4")]
   public static extern global::System.IntPtr Clamp__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_0")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_0();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rotation__SWIG_0")]
+  public static extern global::System.IntPtr new_Rotation__SWIG_0();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_1")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Rotation__SWIG_1")]
+  public static extern global::System.IntPtr new_Rotation__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_2")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_Rotation")]
+  public static extern void delete_Rotation(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_3")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_IDENTITY_get")]
+  public static extern global::System.IntPtr Rotation_IDENTITY_get();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_4")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_IsIdentity")]
+  public static extern bool Rotation_IsIdentity(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_5")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_5(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_GetAxisAngle")]
+  public static extern bool Rotation_GetAxisAngle(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_6")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_6(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Add")]
+  public static extern global::System.IntPtr Rotation_Add(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Quaternion__SWIG_7")]
-  public static extern global::System.IntPtr new_Quaternion__SWIG_7(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Subtract__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Subtract__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_Quaternion")]
-  public static extern void delete_Quaternion(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_IDENTITY_get")]
-  public static extern global::System.IntPtr Quaternion_IDENTITY_get();
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_IsIdentity")]
-  public static extern bool Quaternion_IsIdentity(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Divide__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_Divide__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_ToAxisAngle")]
-  public static extern bool Quaternion_ToAxisAngle(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Multiply__SWIG_2")]
+  public static extern global::System.IntPtr Rotation_Multiply__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AsVector")]
-  public static extern global::System.IntPtr Quaternion_AsVector(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Divide__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Divide__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SetEuler")]
-  public static extern void Quaternion_SetEuler(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Subtract__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_Subtract__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_EulerAngles")]
-  public static extern global::System.IntPtr Quaternion_EulerAngles(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_AddAssign")]
+  public static extern global::System.IntPtr Rotation_AddAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Add")]
-  public static extern global::System.IntPtr Quaternion_Add(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_SubtractAssign")]
+  public static extern global::System.IntPtr Rotation_SubtractAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Subtract__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Subtract__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_MultiplyAssign__SWIG_0")]
+  public static extern global::System.IntPtr Rotation_MultiplyAssign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_MultiplyAssign__SWIG_1")]
+  public static extern global::System.IntPtr Rotation_MultiplyAssign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_DivideAssign")]
+  public static extern global::System.IntPtr Rotation_DivideAssign(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Divide__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Divide__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_EqualTo")]
+  public static extern bool Rotation_EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Multiply__SWIG_2")]
-  public static extern global::System.IntPtr Quaternion_Multiply__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_NotEqualTo")]
+  public static extern bool Rotation_NotEqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Divide__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Divide__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Length")]
+  public static extern float Rotation_Length(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Subtract__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Subtract__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_LengthSquared")]
+  public static extern float Rotation_LengthSquared(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AddAssign")]
-  public static extern global::System.IntPtr Quaternion_AddAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Normalize")]
+  public static extern void Rotation_Normalize(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SubtractAssign")]
-  public static extern global::System.IntPtr Quaternion_SubtractAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Normalized")]
+  public static extern global::System.IntPtr Rotation_Normalized(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_MultiplyAssign__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_MultiplyAssign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Conjugate")]
+  public static extern void Rotation_Conjugate(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_MultiplyAssign__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_MultiplyAssign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Invert")]
+  public static extern void Rotation_Invert(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_DivideAssign")]
-  public static extern global::System.IntPtr Quaternion_DivideAssign(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Log")]
+  public static extern global::System.IntPtr Rotation_Log(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_EqualTo")]
-  public static extern bool Quaternion_EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Exp")]
+  public static extern global::System.IntPtr Rotation_Exp(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_NotEqualTo")]
-  public static extern bool Quaternion_NotEqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Dot")]
+  public static extern float Rotation_Dot(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Length")]
-  public static extern float Quaternion_Length(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Lerp")]
+  public static extern global::System.IntPtr Rotation_Lerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_LengthSquared")]
-  public static extern float Quaternion_LengthSquared(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Slerp")]
+  public static extern global::System.IntPtr Rotation_Slerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Normalize")]
-  public static extern void Quaternion_Normalize(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_SlerpNoInvert")]
+  public static extern global::System.IntPtr Rotation_SlerpNoInvert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Normalized")]
-  public static extern global::System.IntPtr Quaternion_Normalized(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_Squad")]
+  public static extern global::System.IntPtr Rotation_Squad(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, float jarg5);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Conjugate")]
-  public static extern void Quaternion_Conjugate(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Invert")]
-  public static extern void Quaternion_Invert(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Log")]
-  public static extern global::System.IntPtr Quaternion_Log(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Exp")]
-  public static extern global::System.IntPtr Quaternion_Exp(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Dot")]
-  public static extern float Quaternion_Dot(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Lerp")]
-  public static extern global::System.IntPtr Quaternion_Lerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Slerp")]
-  public static extern global::System.IntPtr Quaternion_Slerp(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_SlerpNoInvert")]
-  public static extern global::System.IntPtr Quaternion_SlerpNoInvert(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Squad")]
-  public static extern global::System.IntPtr Quaternion_Squad(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, float jarg5);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_AngleBetween")]
-  public static extern float Quaternion_AngleBetween(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Rotate__SWIG_0")]
-  public static extern global::System.IntPtr Quaternion_Rotate__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_Rotate__SWIG_1")]
-  public static extern global::System.IntPtr Quaternion_Rotate__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_mVector_set")]
-  public static extern void Quaternion_mVector_set(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Quaternion_mVector_get")]
-  public static extern global::System.IntPtr Quaternion_mVector_get(global::System.Runtime.InteropServices.HandleRef jarg1);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Rotation_AngleBetween")]
+  public static extern float Rotation_AngleBetween(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Matrix__SWIG_0")]
   public static extern global::System.IntPtr new_Matrix__SWIG_0();
@@ -2435,6 +2396,9 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Texture_GetHeight")]
   public static extern uint Texture_GetHeight(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_Texture__SWIG_2")]
+  public static extern global::System.IntPtr new_Texture__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Sampler_New")]
   public static extern global::System.IntPtr Sampler_New();
 
@@ -3767,6 +3731,24 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_UnparentAndReset")]
   public static extern void UnparentAndReset(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Raise")]
+  public static extern void Raise(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Lower")]
+  public static extern void Lower(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RaiseToTop")]
+  public static extern void RaiseToTop(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LowerToBottom")]
+  public static extern void LowerToBottom(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_RaiseAbove")]
+  public static extern void RaiseAbove(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LowerBelow")]
+  public static extern void LowerBelow(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Layer_Property_CLIPPING_ENABLE_get")]
   public static extern int Layer_Property_CLIPPING_ENABLE_get();
 
@@ -5618,30 +5600,6 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VoidSignal_Emit")]
   public static extern void VoidSignal_Emit(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_BoolSignal")]
-  public static extern global::System.IntPtr new_BoolSignal();
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_BoolSignal")]
-  public static extern void delete_BoolSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_Empty")]
-  public static extern bool BoolSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_GetConnectionCount")]
-  public static extern uint BoolSignal_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_Connect__SWIG_0")]
-  public static extern void BoolSignal_Connect__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_Disconnect")]
-  public static extern void BoolSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_Connect__SWIG_4")]
-  public static extern void BoolSignal_Connect__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_BoolSignal_Emit")]
-  public static extern bool BoolSignal_Emit(global::System.Runtime.InteropServices.HandleRef jarg1);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_FloatSignal_Empty")]
   public static extern bool FloatSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
 
@@ -6200,6 +6158,24 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Window_IndicatorVisibilityChangedSignal")]
   public static extern global::System.IntPtr Window_IndicatorVisibilityChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_FocusChangedSignal")]
+  public static extern global::System.IntPtr FocusChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_SetAcceptFocus")]
+  public static extern void SetAcceptFocus(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_IsFocusAcceptable")]
+  public static extern bool IsFocusAcceptable(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Show")]
+  public static extern void Show(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Hide")]
+  public static extern void Hide(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_IsVisible")]
+  public static extern bool IsVisible(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_New__SWIG_0")]
   public static extern global::System.IntPtr Application_New__SWIG_0();
 
@@ -6242,6 +6218,12 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_GetWindow")]
   public static extern global::System.IntPtr Application_GetWindow(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+
+  //window handle test
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_GetWindowHandleFromNUI")]
+  public static extern global::System.IntPtr Application_GetWindowHandleFromNUI(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Application_ReplaceWindow")]
   public static extern void Application_ReplaceWindow(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, string jarg3);
 
@@ -6335,30 +6317,27 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ApplicationControlSignal")]
   public static extern void delete_ApplicationControlSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_TimerSignalType")]
-  public static extern global::System.IntPtr new_TimerSignalType();
-
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_TimerSignalType")]
-  public static extern void delete_TimerSignalType(global::System.Runtime.InteropServices.HandleRef jarg1);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Empty")]
   public static extern bool TimerSignalType_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_GetConnectionCount")]
   public static extern uint TimerSignalType_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Connect__SWIG_0")]
-  public static extern void TimerSignalType_Connect__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Connect")]
+  public static extern void TimerSignalType_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Disconnect")]
   public static extern void TimerSignalType_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Connect__SWIG_4")]
-  public static extern void TimerSignalType_Connect__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TimerSignalType_Emit")]
   public static extern bool TimerSignalType_Emit(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_TimerSignalType")]
+  public static extern global::System.IntPtr new_TimerSignalType();
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_TimerSignalType")]
+  public static extern void delete_TimerSignalType(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VISUAL_PROPERTY_TYPE_get")]
   public static extern int VISUAL_PROPERTY_TYPE_get();
 
@@ -10025,6 +10004,21 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_LoadImageSynchronously__SWIG_2")]
   public static extern global::System.IntPtr LoadImageSynchronously__SWIG_2(string jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3, int jarg4, bool jarg5);
 
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_delete_CustomAlgorithmInterface")]
+  public static extern void delete_CustomAlgorithmInterface(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_CustomAlgorithmInterface_GetNextFocusableActor")]
+  public static extern global::System.IntPtr CustomAlgorithmInterface_GetNextFocusableActor(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, int jarg4);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_new_CustomAlgorithmInterface")]
+  public static extern global::System.IntPtr new_CustomAlgorithmInterface();
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_CustomAlgorithmInterface_director_connect")]
+  public static extern void CustomAlgorithmInterface_director_connect(global::System.Runtime.InteropServices.HandleRef jarg1, CustomAlgorithmInterface.SwigDelegateCustomAlgorithmInterface_0 delegate0);
+
+  [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_SetCustomAlgorithm")]
+  public static extern void SetCustomAlgorithm(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ItemIdContainer_Clear")]
   public static extern void ItemIdContainer_Clear(global::System.Runtime.InteropServices.HandleRef jarg1);
 
@@ -10448,6 +10442,27 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_PagePanSignal")]
   public static extern void delete_PagePanSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ProgressBarValueChangedSignal_Empty")]
+  public static extern bool ProgressBarValueChangedSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ProgressBarValueChangedSignal_GetConnectionCount")]
+  public static extern uint ProgressBarValueChangedSignal_GetConnectionCount(global::System.Runtime.InteropServices.HandleRef jarg1);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ProgressBarValueChangedSignal_Connect")]
+  public static extern void ProgressBarValueChangedSignal_Connect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ProgressBarValueChangedSignal_Disconnect")]
+  public static extern void ProgressBarValueChangedSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ProgressBarValueChangedSignal_Emit")]
+  public static extern void ProgressBarValueChangedSignal_Emit(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, float jarg3, float jarg4);
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_new_ProgressBarValueChangedSignal")]
+  public static extern global::System.IntPtr new_ProgressBarValueChangedSignal();
+
+  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_delete_ProgressBarValueChangedSignal")]
+  public static extern void delete_ProgressBarValueChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
+
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_ScrollViewSnapStartedSignal_Empty")]
   public static extern bool ScrollViewSnapStartedSignal_Empty(global::System.Runtime.InteropServices.HandleRef jarg1);
 
diff --git a/src/Tizen.NUI/devel-src/NUIApplication.cs b/src/Tizen.NUI/devel-src/NUIApplication.cs
new file mode 100755 (executable)
index 0000000..f54a0ca
--- /dev/null
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+using System;
+using Tizen.Applications;
+using Tizen.NUI;
+
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Represents an application that have UI screen. The NUIApplication class has a default stage.
+    /// </summary>
+    public class NUIApplication : CoreUIApplication
+    {
+        private void LOG(string _str)
+        {
+            //Tizen.Log.Debug("NUI", _str);
+            //Console.WriteLine("[NUI]" + _str);
+        }
+
+        /// <summary>
+        /// The instance of the Application.
+        /// </summary>
+        /// <remarks>
+        /// This application is created before OnCreate() or created event. And the NUIApplication will be terminated when this application is closed.
+        /// </remarks>
+        private Application _application;
+
+        /// <summary>
+        /// The instance of the Dali Application extension.
+        /// </summary>
+        private ApplicationExtensions _applicationExt;
+
+        /// <summary>
+        /// Store the stylesheet value.
+        /// </summary>
+        private string _stylesheet;
+
+        /// <summary>
+        /// Store the window mode value.
+        /// </summary>
+        private Application.WindowMode _windowMode;
+
+        /// <summary>
+        /// Store the app mode value.
+        /// </summary>
+        private AppMode _appMode;
+
+        /// <summary>
+        /// The instance of the Dali Stage.
+        /// </summary>
+        private Stage _stage;
+
+        /// <summary>
+        /// The default constructor.
+        /// </summary>
+        public NUIApplication() : base()
+        {
+            _appMode = AppMode.Default;
+        }
+
+        /// <summary>
+        /// The constructor with stylesheet.
+        /// </summary>
+        public NUIApplication(string stylesheet) : base()
+        {
+            //handle the stylesheet
+            _appMode = AppMode.StyleSheetOnly;
+            _stylesheet = stylesheet;
+        }
+
+        /// <summary>
+        /// The constructor with stylesheet and window mode.
+        /// </summary>
+        public NUIApplication(string stylesheet, WindowMode windowMode) : base()
+        {
+            //handle the stylesheet and windowMode
+            _appMode = AppMode.StyleSheetWithWindowMode;
+            _stylesheet = stylesheet;
+            _windowMode = (Application.WindowMode)windowMode;
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnPause()
+        {
+            base.OnPause();
+            _applicationExt.Pause();
+            LOG("OnPause() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior before calling OnCreate().
+        /// stage property is initialized in this overrided method.
+        /// </summary>
+        protected override void OnPreCreate()
+        {
+            switch (_appMode)
+            {
+                case AppMode.Default:
+                    _application = Tizen.NUI.Application.NewApplication();
+                    break;
+                case AppMode.StyleSheetOnly:
+                    _application = Tizen.NUI.Application.NewApplication(_stylesheet);
+                    break;
+                case AppMode.StyleSheetWithWindowMode:
+                    _application = Tizen.NUI.Application.NewApplication(_stylesheet, _windowMode);
+                    break;
+                default:
+                    break;
+            }
+            _applicationExt = new ApplicationExtensions(_application);
+            _applicationExt.Init();
+
+            _stage = Stage.Instance;
+            _stage.SetBackgroundColor(Color.White);
+            LOG("OnPreCreate() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnResume()
+        {
+            base.OnResume();
+            _applicationExt.Resume();
+            LOG("OnResume() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
+        {
+            base.OnAppControlReceived(e);
+            LOG("OnAppControlReceived() is called!");
+            if (e != null)
+            {
+                LOG("OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
+                LOG("CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);
+            }
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            LOG("OnCreate() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnLocaleChanged(LocaleChangedEventArgs e)
+        {
+            base.OnLocaleChanged(e);
+            _applicationExt.LanguageChange();
+            LOG("OnLocaleChanged() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnLowBattery(LowBatteryEventArgs e)
+        {
+            base.OnLowBattery(e);
+            LOG("OnLowBattery() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnLowMemory(LowMemoryEventArgs e)
+        {
+            base.OnLowMemory(e);
+            LOG("OnLowMemory() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnRegionFormatChanged(RegionFormatChangedEventArgs e)
+        {
+            base.OnRegionFormatChanged(e);
+            LOG("OnRegionFormatChanged() is called!");
+        }
+
+        /// <summary>
+        /// Overrides this method if want to handle behavior.
+        /// </summary>
+        protected override void OnTerminate()
+        {
+            base.OnTerminate();
+            _applicationExt.Terminate();
+            LOG("OnTerminate() is called!");
+        }
+
+        /// <summary>
+        /// The mode of creating NUI application.
+        /// </summary>
+        private enum AppMode
+        {
+            Default = 0,
+            StyleSheetOnly = 1,
+            StyleSheetWithWindowMode = 2
+        }
+
+        /// <summary>
+        /// Enumeration for deciding whether a NUI application window is opaque or transparent.
+        /// </summary>
+        public enum WindowMode
+        {
+            Opaque = 0,
+            Transparent = 1
+        }
+
+    }
+}
\ No newline at end of file
index 04988c3..9c0d2fe 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class NativeImage : Image {
+    internal class NativeImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NativeImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImage_SWIGUpcast(cPtr), cMemoryOwn) {
index 3ea6bcd..9d5c582 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class NativeImageInterface : RefObject {
+    internal class NativeImageInterface : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NativeImageInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImageInterface_SWIGUpcast(cPtr), cMemoryOwn) {
index 6813f6d..bf29fca 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class NinePatchImage : ResourceImage {
+    internal class NinePatchImage : ResourceImage {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal NinePatchImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NinePatchImage_SWIGUpcast(cPtr), cMemoryOwn) {
index 3fc10bf..8cf3966 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ObjectCreatedSignal : global::System.IDisposable {
+    internal class ObjectCreatedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5f35afb..6f59b7c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ObjectDestroyedSignal : global::System.IDisposable {
+    internal class ObjectDestroyedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 408dcb0..05cb113 100755 (executable)
@@ -14,7 +14,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class ObjectRegistry : BaseHandle {
+    internal class ObjectRegistry : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ObjectRegistry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ObjectRegistry_SWIGUpcast(cPtr), cMemoryOwn) {
index 5c7fb59..120b776 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PageFactory : global::System.IDisposable {
+    internal class PageFactory : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index d568003..e679654 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PagePanSignal : global::System.IDisposable {
+    internal class PagePanSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 38bcc8b..59ecd39 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class PageTurnLandscapeView : PageTurnView {
+    internal class PageTurnLandscapeView : PageTurnView {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnLandscapeView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnLandscapeView_SWIGUpcast(cPtr), cMemoryOwn) {
index e345a53..d1ce422 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class PageTurnPortraitView : PageTurnView {
+    internal class PageTurnPortraitView : PageTurnView {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnPortraitView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnPortraitView_SWIGUpcast(cPtr), cMemoryOwn) {
index fb7a368..9debeaa 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PageTurnSignal : global::System.IDisposable {
+    internal class PageTurnSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 8540caa..bdad3f6 100755 (executable)
@@ -14,7 +14,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class PageTurnView : View {
+    internal class PageTurnView : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PageTurnView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnView_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -386,7 +386,7 @@ public class PageTurnFinishedEventArgs : EventArgs
 
   public static PageTurnView GetPageTurnViewFromPtr(global::System.IntPtr cPtr) {
     PageTurnView ret = new PageTurnView(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -490,7 +490,7 @@ public class PageTurnFinishedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( PageTurnView.Property.PAGE_SIZE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( PageTurnView.Property.PAGE_SIZE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int CurrentPageId
@@ -503,7 +503,7 @@ public class PageTurnFinishedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( PageTurnView.Property.CURRENT_PAGE_ID, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( PageTurnView.Property.CURRENT_PAGE_ID, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 SpineShadow
@@ -516,7 +516,7 @@ public class PageTurnFinishedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( PageTurnView.Property.SPINE_SHADOW, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( PageTurnView.Property.SPINE_SHADOW, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 007f0e1..97ea9cd 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// A PanGesture is emitted when the user moves one or more fingers in a particular direction.
+    /// A pan gesture will end in the following ways:
+    /// - User releases the primary finger (the first touch).
+    /// - User has more fingers on the screen than the maximum specified.
+    /// - User has less fingers on the screen than the minimum specified.
+    /// - Cancelled by the system.
+    /// A pan gesture will continue to be sent to the actor under than initial pan until it ends.
+    /// </summary>
+    public class PanGesture : Gesture
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class PanGesture : Gesture {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal PanGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PanGesture_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal PanGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PanGesture_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PanGesture obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PanGesture obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~PanGesture()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~PanGesture() {
-    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_PanGesture(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_PanGesture(swigCPtr);
+        internal static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr)
+        {
+            PanGesture ret = new PanGesture(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// The velocity at which the user is moving their fingers.
+        /// This is represented as a Vector2 and is the pixel movement per millisecond.
+        /// A positive x value shows that the user is panning to the right, a negative x value means the opposite.
+        /// A positive y value shows that the user is panning downwards, a negative y values means upwards.
+        /// </summary>
+        public Vector2 Velocity
+        {
+            get
+            {
+                return velocity;
+            }
+        }
 
-  public static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr) {
-    PanGesture ret = new PanGesture(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// This is a Vector2 showing how much the user has panned (dragged) since the last pan gesture or,
+        /// if the gesture has just started, then the amount panned since the user touched the screen.
+        /// A positive x value shows that the user is panning to the right, a negative x value means the opposite.
+        /// A positive y value shows that the user is panning downwards, a negative y value means upwards.
+        /// </summary>
+        public Vector2 Displacement
+        {
+            get
+            {
+                return displacement;
+            }
+        }
 
-  public Vector2 Velocity
-  {
-    get
-    {
-      return velocity;
-    }
-  }
+        /// <summary>
+        /// This current touch position of the primary touch point in local actor coordinates.
+        /// </summary>
+        public Vector2 Position
+        {
+            get
+            {
+                return position;
+            }
+        }
 
-  public Vector2 Displacement
-  {
-    get
-    {
-      return displacement;
-    }
-  }
+        /// <summary>
+        /// The velocity at which the user is moving their fingers.
+        /// This is represented as a Vector2 and is the pixel movement per millisecond.
+        /// A positive x value shows that the user is panning to the right, a negative x value means the opposite.
+        /// A positive y value shows that the user is panning downwards, a negative y values means upwards.
+        /// This value represents the screen coordinates.
+        /// </summary>
+        public Vector2 ScreenVelocity
+        {
+            get
+            {
+                return screenVelocity;
+            }
+        }
 
-  public Vector2 Position
-  {
-    get
-    {
-      return position;
-    }
-  }
+        /// <summary>
+        /// This is a Vector2 showing how much the user has panned (dragged) since the last pan gesture or,
+        /// if the gesture has just started, then the amount panned since the user touched the screen.
+        /// A positive x value shows that the user is panning to the right, a negative x value means the opposite.
+        /// A positive y value shows that the user is panning downwards, a negative y value means upwards.
+        /// This value is in screen coordinates.
+        /// </summary>
+        public Vector2 ScreenDisplacement
+        {
+            get
+            {
+                return screenDisplacement;
+            }
+        }
 
-  public Vector2 ScreenVelocity
-  {
-    get
-    {
-      return screenVelocity;
-    }
-  }
+        /// <summary>
+        /// This current touch position of the primary touch point in screen coordinates.
+        /// </summary>
+        public Vector2 ScreenPosition
+        {
+            get
+            {
+                return screenPosition;
+            }
+        }
 
-  public Vector2 ScreenDisplacement
-  {
-    get
-    {
-      return screenDisplacement;
-    }
-  }
+        /// <summary>
+        /// The total number of fingers touching the screen in a pan gesture.
+        /// </summary>
+        public uint NumberOfTouches
+        {
+            get
+            {
+                return numberOfTouches;
+            }
+        }
 
-  public Vector2 ScreenPosition
-  {
-    get
-    {
-      return screenPosition;
-    }
-  }
+        /// <summary>
+        /// Default Constructor.
+        /// </summary>
+        public PanGesture() : this(NDalicPINVOKE.new_PanGesture__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public uint NumberOfTouches
-  {
-    get
-    {
-      return numberOfTouches;
-    }
-  }
-
-  public PanGesture() : this(NDalicPINVOKE.new_PanGesture__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PanGesture(PanGesture rhs) : this(NDalicPINVOKE.new_PanGesture__SWIG_2(PanGesture.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PanGesture Assign(PanGesture rhs) {
-    PanGesture ret = new PanGesture(NDalicPINVOKE.PanGesture_Assign(swigCPtr, PanGesture.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private Vector2 velocity {
-    set {
-      NDalicPINVOKE.PanGesture_velocity_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_velocity_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 displacement {
-    set {
-      NDalicPINVOKE.PanGesture_displacement_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_displacement_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 position {
-    set {
-      NDalicPINVOKE.PanGesture_position_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_position_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenVelocity {
-    set {
-      NDalicPINVOKE.PanGesture_screenVelocity_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenVelocity_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenDisplacement {
-    set {
-      NDalicPINVOKE.PanGesture_screenDisplacement_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenDisplacement_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenPosition {
-    set {
-      NDalicPINVOKE.PanGesture_screenPosition_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenPosition_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint numberOfTouches {
-    set {
-      NDalicPINVOKE.PanGesture_numberOfTouches_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.PanGesture_numberOfTouches_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float GetSpeed() {
-    float ret = NDalicPINVOKE.PanGesture_GetSpeed(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetDistance() {
-    float ret = NDalicPINVOKE.PanGesture_GetDistance(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetScreenSpeed() {
-    float ret = NDalicPINVOKE.PanGesture_GetScreenSpeed(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetScreenDistance() {
-    float ret = NDalicPINVOKE.PanGesture_GetScreenDistance(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="state">The state of the gesture</param>
+        public PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        public PanGesture(PanGesture rhs) : this(NDalicPINVOKE.new_PanGesture__SWIG_2(PanGesture.getCPtr(rhs)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Assignment operator.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        /// <returns>A reference to this</returns>
+        public PanGesture Assign(PanGesture rhs)
+        {
+            PanGesture ret = new PanGesture(NDalicPINVOKE.PanGesture_Assign(swigCPtr, PanGesture.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Vector2 velocity
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_velocity_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_velocity_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 displacement
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_displacement_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_displacement_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 position
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_position_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_position_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenVelocity
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_screenVelocity_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenVelocity_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenDisplacement
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_screenDisplacement_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenDisplacement_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenPosition
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_screenPosition_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PanGesture_screenPosition_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint numberOfTouches
+        {
+            set
+            {
+                NDalicPINVOKE.PanGesture_numberOfTouches_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.PanGesture_numberOfTouches_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Returns the speed at which the user is moving their fingers.
+        /// This is the pixel movement per millisecond.
+        /// </summary>
+        /// <returns>The speed of the pan (in pixels per millisecond)</returns>
+        public float GetSpeed()
+        {
+            float ret = NDalicPINVOKE.PanGesture_GetSpeed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// This returns the distance the user has panned (dragged) since the last pan gesture or,
+        /// if the gesture has just started, then the distance moved since the user touched the screen.
+        /// This is always a positive value.
+        /// </summary>
+        /// <returns>The distance, as a float, a user's finger has panned</returns>
+        public float GetDistance()
+        {
+            float ret = NDalicPINVOKE.PanGesture_GetDistance(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the speed at which the user is moving their fingers relative to screen coordinates.
+        /// This is the pixel movement per millisecond.
+        /// </summary>
+        /// <returns>The speed of the pan (in pixels per millisecond)</returns>
+        public float GetScreenSpeed()
+        {
+            float ret = NDalicPINVOKE.PanGesture_GetScreenSpeed(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// This returns the distance the user has panned (dragged) since the last pan gesture in screen
+        /// coordinates or, if the gesture has just started, then the distance in screen coordinates moved
+        /// since the user touched the screen.
+        /// This is always a positive value.
+        /// </summary>
+        /// <returns>The distance, as a float, a user's finger has panned</returns>
+        public float GetScreenDistance()
+        {
+            float ret = NDalicPINVOKE.PanGesture_GetScreenDistance(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
 
 }
index f773337..8777c5d 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PanGestureDetectedSignal : global::System.IDisposable {
+    internal class PanGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index c678919..458c954 100755 (executable)
@@ -153,7 +153,7 @@ public class DetectedEventArgs : EventArgs
 
 public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.IntPtr cPtr) {
     PanGestureDetector ret = new PanGestureDetector(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -333,11 +333,12 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     return ret;
   }
 
-  public AngleThresholdPair GetAngle(uint index) {
-    AngleThresholdPair ret = new AngleThresholdPair(NDalicPINVOKE.PanGestureDetector_GetAngle(swigCPtr, index), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal AngleThresholdPair GetAngle(uint index)
+        {
+            AngleThresholdPair ret = new AngleThresholdPair(NDalicPINVOKE.PanGestureDetector_GetAngle(swigCPtr, index), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
   public void ClearAngles() {
     NDalicPINVOKE.PanGestureDetector_ClearAngles(swigCPtr);
@@ -354,11 +355,12 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public PanGestureDetectedSignal DetectedSignal() {
-    PanGestureDetectedSignal ret = new PanGestureDetectedSignal(NDalicPINVOKE.PanGestureDetector_DetectedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal PanGestureDetectedSignal DetectedSignal()
+        {
+            PanGestureDetectedSignal ret = new PanGestureDetectedSignal(NDalicPINVOKE.PanGestureDetector_DetectedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
   public static void SetPanGestureProperties(PanGesture pan) {
     NDalicPINVOKE.PanGestureDetector_SetPanGestureProperties(PanGesture.getCPtr(pan));
index 8ba1051..04aa017 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Path : Handle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// A 3D parametric curve.
+    /// Paths can be used to animate position and orientation of actors.
+    /// </summary> 
+    public class Path : Handle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal Path(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Path_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Path(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Path_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Path obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Path obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Path() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Path()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Path(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Path(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();
-    }
-  }
 
 
-  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_Path_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_Path_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int POINTS = NDalicPINVOKE.Path_Property_POINTS_get();
-    public static readonly int CONTROL_POINTS = NDalicPINVOKE.Path_Property_CONTROL_POINTS_get();
-  
-  }
-
-  public Path () : this (NDalicPINVOKE.Path_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public new static Path DownCast(BaseHandle handle) {
-    Path ret = new Path(NDalicPINVOKE.Path_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Path(Path handle) : this(NDalicPINVOKE.new_Path__SWIG_1(Path.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Path Assign(Path rhs) {
-    Path ret = new Path(NDalicPINVOKE.Path_Assign(swigCPtr, Path.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void AddPoint(Vector3 point) {
-    NDalicPINVOKE.Path_AddPoint(swigCPtr, Vector3.getCPtr(point));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AddControlPoint(Vector3 point) {
-    NDalicPINVOKE.Path_AddControlPoint(swigCPtr, Vector3.getCPtr(point));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void GenerateControlPoints(float curvature) {
-    NDalicPINVOKE.Path_GenerateControlPoints(swigCPtr, curvature);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Sample(float progress, Vector3 position, Vector3 tangent) {
-    NDalicPINVOKE.Path_Sample(swigCPtr, progress, Vector3.getCPtr(position), Vector3.getCPtr(tangent));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3 GetPoint(uint index) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Path_GetPoint(swigCPtr, index), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 GetControlPoint(uint index) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Path_GetControlPoint(swigCPtr, index), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetPointCount() {
-    uint ret = NDalicPINVOKE.Path_GetPointCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Tizen.NUI.Property.Array Points
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( Path.Property.POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Path.Property.POINTS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array ControlPoints
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( Path.Property.CONTROL_POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Path.Property.CONTROL_POINTS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
 
-}
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Path_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_Path_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int POINTS = NDalicPINVOKE.Path_Property_POINTS_get();
+            internal static readonly int CONTROL_POINTS = NDalicPINVOKE.Path_Property_CONTROL_POINTS_get();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized Path handle.
+        /// </summary>
+        public Path() : this(NDalicPINVOKE.Path_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        /// <summary>
+        /// Downcasts a handle to Path handle.
+        /// If handle points to a Path object, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        public new static Path DownCast(BaseHandle handle)
+        {
+            Path ret = new Path(NDalicPINVOKE.Path_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Path(Path handle) : this(NDalicPINVOKE.new_Path__SWIG_1(Path.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Path Assign(Path rhs)
+        {
+            Path ret = new Path(NDalicPINVOKE.Path_Assign(swigCPtr, Path.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Adds an interpolation point.
+        /// </summary>
+        /// <param name="point">The new interpolation point to be added</param>
+        public void AddPoint(Position point)
+        {
+            NDalicPINVOKE.Path_AddPoint(swigCPtr, Position.getCPtr(point));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Adds a control point.
+        /// </summary>
+        /// <param name="point">The new control point to be added</param>
+        public void AddControlPoint(Vector3 point)
+        {
+            NDalicPINVOKE.Path_AddControlPoint(swigCPtr, Vector3.getCPtr(point));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Automatic generation of control points. Generated control points which result in a smooth join between the splines of each segment.
+        /// The generating algorithm is as follows:
+        /// For a given knot point K[N], find the vector that bisects K[N-1],[N] and [N],[N+1].
+        /// Calculate the tangent vector by taking the normal of this bisector.
+        /// The in control point is the length of the preceding segment back along this bisector multiplied by the curvature.
+        /// The out control point is the length of the succeeding segment forward along this bisector multiplied by the curvature.
+        /// </summary>
+        /// <param name="curvature">The curvature of the spline. 0 gives straight lines between the knots, negative values means the spline contains loops, positive values up to  0.5 result in a smooth curve, positive values between 0.5 and 1 result  in looped curves where the loops are not distinct (i.e. the curve appears to be non-continuous), positive values higher than 1 result in looped curves</param>
+        public void GenerateControlPoints(float curvature)
+        {
+            NDalicPINVOKE.Path_GenerateControlPoints(swigCPtr, curvature);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sample path at a given progress. Calculates position and tangent at that point of the curve.
+        /// </summary>
+        /// <param name="progress">A floating point value between 0.0 and 1.0</param>
+        /// <param name="position">The interpolated position at that progress</param>
+        /// <param name="tangent">The interpolated tangent at that progress</param>
+        public void Sample(float progress, Vector3 position, Vector3 tangent)
+        {
+            NDalicPINVOKE.Path_Sample(swigCPtr, progress, Vector3.getCPtr(position), Vector3.getCPtr(tangent));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Accessor for the interpolation points.
+        /// </summary>
+        /// <param name="index">The index of the interpolation point</param>
+        public Vector3 GetPoint(uint index)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Path_GetPoint(swigCPtr, index), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Accessor for the control points.
+        /// </summary>
+        /// <param name="index">The index of the control point</param> 
+        public Vector3 GetControlPoint(uint index)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Path_GetControlPoint(swigCPtr, index), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets the number of interpolation points in the path.
+        /// </summary>
+        /// <returns>The number of interpolation points in the path</returns>
+        public uint GetPointCount()
+        {
+            uint ret = NDalicPINVOKE.Path_GetPointCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Enumeration for Points
+        /// </summary>
+        public PropertyArray Points
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(Path.Property.POINTS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Path.Property.POINTS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Enumeration for ControlPoints
+        /// </summary>
+        public PropertyArray ControlPoints
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(Path.Property.CONTROL_POINTS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Path.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 0390470..62255bd 100755 (executable)
@@ -26,8 +26,9 @@
 
 namespace Tizen.NUI {
 
-public class PathConstrainer : Handle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    internal class PathConstrainer : Handle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PathConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PathConstrainer_SWIGUpcast(cPtr), cMemoryOwn) {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
@@ -95,9 +96,9 @@ public class PathConstrainer : Handle {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
   
-    public static readonly int FORWARD = NDalicPINVOKE.PathConstrainer_Property_FORWARD_get();
-    public static readonly int POINTS = NDalicPINVOKE.PathConstrainer_Property_POINTS_get();
-    public static readonly int CONTROL_POINTS = NDalicPINVOKE.PathConstrainer_Property_CONTROL_POINTS_get();
+            internal static readonly int FORWARD = NDalicPINVOKE.PathConstrainer_Property_FORWARD_get();
+            internal static readonly int POINTS = NDalicPINVOKE.PathConstrainer_Property_POINTS_get();
+            internal static readonly int CONTROL_POINTS = NDalicPINVOKE.PathConstrainer_Property_CONTROL_POINTS_get();
   
   }
 
@@ -111,15 +112,17 @@ public class PathConstrainer : Handle {
     return ret;
   }
 
-  public PathConstrainer(PathConstrainer handle) : this(NDalicPINVOKE.new_PathConstrainer__SWIG_1(PathConstrainer.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal PathConstrainer(PathConstrainer handle) : this(NDalicPINVOKE.new_PathConstrainer__SWIG_1(PathConstrainer.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public PathConstrainer Assign(PathConstrainer rhs) {
-    PathConstrainer ret = new PathConstrainer(NDalicPINVOKE.PathConstrainer_Assign(swigCPtr, PathConstrainer.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal PathConstrainer Assign(PathConstrainer rhs)
+        {
+            PathConstrainer ret = new PathConstrainer(NDalicPINVOKE.PathConstrainer_Assign(swigCPtr, PathConstrainer.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
   public void Apply(Property target, Property source, Vector2 range, Vector2 wrap) {
     NDalicPINVOKE.PathConstrainer_Apply__SWIG_0(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap));
@@ -131,50 +134,53 @@ public class PathConstrainer : Handle {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void Remove(Handle target) {
-    NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        internal void Remove(Handle target)
+        {
+            NDalicPINVOKE.PathConstrainer_Remove(swigCPtr, Handle.getCPtr(target));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Vector3 Forward
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( PathConstrainer.Property.FORWARD).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.FORWARD, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array Points
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( PathConstrainer.Property.POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.POINTS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array ControlPoints
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( PathConstrainer.Property.CONTROL_POINTS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PathConstrainer.Property.CONTROL_POINTS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        public Vector3 Forward
+        {
+            get
+            {
+                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
+                GetProperty(PathConstrainer.Property.FORWARD).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PathConstrainer.Property.FORWARD, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        public PropertyArray Points
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(PathConstrainer.Property.POINTS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PathConstrainer.Property.POINTS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        public PropertyArray ControlPoints
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(PathConstrainer.Property.CONTROL_POINTS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PathConstrainer.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
 }
 
index 0516290..b0b361c 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// A PinchGesture is emitted when the user moves two fingers towards or away from each other.
+    /// A pinch gesture will continue to be sent to the actor under the center point of the pinch until the pinch ends.
+    /// </summary>
+    public class PinchGesture : Gesture
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class PinchGesture : Gesture {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal PinchGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PinchGesture_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal PinchGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PinchGesture_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PinchGesture obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PinchGesture obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~PinchGesture()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~PinchGesture() {
-    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_PinchGesture(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_PinchGesture(swigCPtr);
+        internal static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr)
+        {
+            PinchGesture ret = new PinchGesture(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// The scale factor from the start of the pinch gesture till the latest pinch gesture.
+        /// If the user is moving their fingers away from each other, then
+        /// this value increases.  Conversely, if the user is moving their
+        /// fingers towards each other, this value will decrease.
+        /// </summary>
+        public float Scale
+        {
+            get
+            {
+                return scale;
+            }
+        }
 
-  public static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr) {
-    PinchGesture ret = new PinchGesture(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// The speed at which the user is moving their fingers.
+        /// This is the pixel movement per second.
+        /// </summary>
+        public float Speed
+        {
+            get
+            {
+                return speed;
+            }
+        }
 
-  public float Scale
-  {
-    get
-    {
-      return scale;
-    }
-  }
+        /// <summary>
+        /// The center point of the two points that caused the pinch gesture in screen coordinates.
+        /// </summary>
+        public Vector2 ScreenCenterPoint
+        {
+            get
+            {
+                return screenCenterPoint;
+            }
+        }
 
-  public float Speed
-  {
-    get
-    {
-      return speed;
-    }
-  }
+        /// <summary>
+        /// The center point of the two points that caused the pinch gesture in local actor coordinates.
+        /// </summary>
+        public Vector2 LocalCenterPoint
+        {
+            get
+            {
+                return localCenterPoint;
+            }
+        }
 
-  public Vector2 ScreenCenterPoint
-  {
-    get
-    {
-      return screenCenterPoint;
-    }
-  }
+        /// <summary>
+        /// Default Constructor.
+        /// </summary>
+        /// <param name="state">The state of the gesture</param>
+        public PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Vector2 LocalCenterPoint
-  {
-    get
-    {
-      return localCenterPoint;
-    }
-  }
-
-  public PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PinchGesture(PinchGesture rhs) : this(NDalicPINVOKE.new_PinchGesture__SWIG_1(PinchGesture.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PinchGesture Assign(PinchGesture rhs) {
-    PinchGesture ret = new PinchGesture(NDalicPINVOKE.PinchGesture_Assign(swigCPtr, PinchGesture.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private float scale {
-    set {
-      NDalicPINVOKE.PinchGesture_scale_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.PinchGesture_scale_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private float speed {
-    set {
-      NDalicPINVOKE.PinchGesture_speed_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.PinchGesture_speed_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenCenterPoint {
-    set {
-      NDalicPINVOKE.PinchGesture_screenCenterPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PinchGesture_screenCenterPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 localCenterPoint {
-    set {
-      NDalicPINVOKE.PinchGesture_localCenterPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.PinchGesture_localCenterPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        public PinchGesture(PinchGesture rhs) : this(NDalicPINVOKE.new_PinchGesture__SWIG_1(PinchGesture.getCPtr(rhs)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Assignment operator.
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        /// <returns>A reference to this</returns>
+        public PinchGesture Assign(PinchGesture rhs)
+        {
+            PinchGesture ret = new PinchGesture(NDalicPINVOKE.PinchGesture_Assign(swigCPtr, PinchGesture.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private float scale
+        {
+            set
+            {
+                NDalicPINVOKE.PinchGesture_scale_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.PinchGesture_scale_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private float speed
+        {
+            set
+            {
+                NDalicPINVOKE.PinchGesture_speed_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.PinchGesture_speed_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenCenterPoint
+        {
+            set
+            {
+                NDalicPINVOKE.PinchGesture_screenCenterPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PinchGesture_screenCenterPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 localCenterPoint
+        {
+            set
+            {
+                NDalicPINVOKE.PinchGesture_localCenterPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.PinchGesture_localCenterPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 83ee9cf..f0b5ca0 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PinchGestureDetectedSignal : global::System.IDisposable {
+    internal class PinchGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5a84c75..2b2c619 100755 (executable)
@@ -152,7 +152,7 @@ public class DetectedEventArgs : EventArgs
 
 public static PinchGestureDetector GetPinchGestureDetectorFromPtr(global::System.IntPtr cPtr) {
     PinchGestureDetector ret = new PinchGestureDetector(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -177,7 +177,7 @@ public static PinchGestureDetector GetPinchGestureDetectorFromPtr(global::System
     return ret;
   }
 
-  public PinchGestureDetectedSignal DetectedSignal() {
+  internal PinchGestureDetectedSignal DetectedSignal() {
     PinchGestureDetectedSignal ret = new PinchGestureDetectedSignal(NDalicPINVOKE.PinchGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 547e40c..3082819 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class PixelData : BaseHandle {
+    internal class PixelData : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PixelData(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PixelData_SWIGUpcast(cPtr), cMemoryOwn) {
index 9a889a8..f829e40 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum PixelFormat {
+    internal enum PixelFormat {
   INVALID = 0,
   A8 = 1,
   L8,
diff --git a/src/Tizen.NUI/devel-src/PointStateType.cs b/src/Tizen.NUI/devel-src/PointStateType.cs
deleted file mode 100755 (executable)
index c55284a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum PointStateType {
-  STARTED,
-  FINISHED,
-  DOWN = STARTED,
-  UP = FINISHED,
-  MOTION,
-  LEAVE,
-  STATIONARY,
-  INTERRUPTED
-}
-
-}
index f3929d3..78953e5 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
 
-public class Popup : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// The Popup widget provides a configurable pop-up dialog with built-in layout of three main fields.
+    /// </summary>
+    public class Popup : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal Popup(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Popup_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Popup(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Popup_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Popup obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Popup obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Popup()
+        {
+            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_Popup(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~Popup() {
-    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_Popup(swigCPtr);
+        /// <summary>
+        /// Event arguments that passed via OutsideTouchedEvent
+        /// </summary>
+        public class OutsideTouchedEventArgs : EventArgs
+        {
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
 
+        /// <summary>
+        /// Event arguments that passed via ShowingEventArgs
+        /// </summary>
+        public class ShowingEventArgs : EventArgs
+        {
+        }
 
-  public class OutsideTouchedEventArgs : EventArgs
-  {
-  }
-
-  public class ShowingEventArgs : EventArgs
-  {
-  }
-
-  public class ShownEventArgs : EventArgs
-  {
-  }
-
-  public class HidingEventArgs : EventArgs
-  {
-  }
-
-  public class HiddenEventArgs : EventArgs
-  {
-  }
+        /// <summary>
+        /// Event arguments that passed via ShownEventArgs
+        /// </summary>
+        public class ShownEventArgs : EventArgs
+        {
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void OutsideTouchedEventCallbackDelegate();
-  private DaliEventHandler<object,OutsideTouchedEventArgs> _popUpOutsideTouchedEventHandler;
-  private OutsideTouchedEventCallbackDelegate _popUpOutsideTouchedEventCallbackDelegate;
+        /// <summary>
+        /// Event arguments that passed via HidingEventArgs
+        /// </summary>
+        public class HidingEventArgs : EventArgs
+        {
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void ShowingEventCallbackDelegate();
-  private DaliEventHandler<object,ShowingEventArgs> _popUpShowingEventHandler;
-  private ShowingEventCallbackDelegate _popUpShowingEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void ShownEventCallbackDelegate();
-  private DaliEventHandler<object,ShownEventArgs> _popUpShownEventHandler;
-  private ShownEventCallbackDelegate _popUpShownEventCallbackDelegate;
+        /// <summary>
+        /// Event arguments that passed via HiddenEventArgs
+        /// </summary>
+        public class HiddenEventArgs : EventArgs
+        {
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void HidingEventCallbackDelegate();
-  private DaliEventHandler<object,HidingEventArgs> _popUpHidingEventHandler;
-  private HidingEventCallbackDelegate _popUpHidingEventCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void HiddenEventCallbackDelegate();
-  private DaliEventHandler<object,HiddenEventArgs> _popUpHiddenEventHandler;
-  private HiddenEventCallbackDelegate _popUpHiddenEventCallbackDelegate;
-
-  public event DaliEventHandler<object,OutsideTouchedEventArgs> OutsideTouched
-  {
-     add
-     {
-        lock(this)
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void OutsideTouchedEventCallbackDelegate();
+        private EventHandler<OutsideTouchedEventArgs> _popUpOutsideTouchedEventHandler;
+        private OutsideTouchedEventCallbackDelegate _popUpOutsideTouchedEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void ShowingEventCallbackDelegate();
+        private EventHandler<ShowingEventArgs> _popUpShowingEventHandler;
+        private ShowingEventCallbackDelegate _popUpShowingEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void ShownEventCallbackDelegate();
+        private EventHandler<ShownEventArgs> _popUpShownEventHandler;
+        private ShownEventCallbackDelegate _popUpShownEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void HidingEventCallbackDelegate();
+        private EventHandler<HidingEventArgs> _popUpHidingEventHandler;
+        private HidingEventCallbackDelegate _popUpHidingEventCallbackDelegate;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void HiddenEventCallbackDelegate();
+        private EventHandler<HiddenEventArgs> _popUpHiddenEventHandler;
+        private HiddenEventCallbackDelegate _popUpHiddenEventCallbackDelegate;
+
+        /// <summary>
+        /// Event is sent when user has touched outside of the Dialog.
+        /// </summary>
+        public event EventHandler<OutsideTouchedEventArgs> OutsideTouched
         {
-           // Restricted to only one listener
-           if (_popUpOutsideTouchedEventHandler == null)
-           {
-              _popUpOutsideTouchedEventHandler += value;
-
-              _popUpOutsideTouchedEventCallbackDelegate = new OutsideTouchedEventCallbackDelegate(OnOutsideTouched);
-              this.OutsideTouchedSignal().Connect(_popUpOutsideTouchedEventCallbackDelegate);
-           }
+            add
+            {
+                if (_popUpOutsideTouchedEventHandler == null)
+                {
+                    _popUpOutsideTouchedEventCallbackDelegate = (OnOutsideTouched);
+                    OutsideTouchedSignal().Connect(_popUpOutsideTouchedEventCallbackDelegate);
+                }
+                _popUpOutsideTouchedEventHandler += value;
+            }
+            remove
+            {
+                _popUpOutsideTouchedEventHandler -= value;
+                if (_popUpOutsideTouchedEventHandler == null && _popUpOutsideTouchedEventCallbackDelegate != null)
+                {
+                    this.OutsideTouchedSignal().Disconnect(_popUpOutsideTouchedEventCallbackDelegate);
+                }
+            }
         }
-     }
 
-     remove
-     {
-        lock(this)
+        // Callback for Popup OutsideTouchedSignal
+        private void OnOutsideTouched()
         {
-           if (_popUpOutsideTouchedEventHandler != null)
-           {
-              this.OutsideTouchedSignal().Disconnect(_popUpOutsideTouchedEventCallbackDelegate);
-           }
+            OutsideTouchedEventArgs e = new OutsideTouchedEventArgs();
 
-           _popUpOutsideTouchedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Popup OutsideTouchedSignal
-  private void OnOutsideTouched()
-  {
-     OutsideTouchedEventArgs e = new OutsideTouchedEventArgs();
-
-     if (_popUpOutsideTouchedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _popUpOutsideTouchedEventHandler(this, e);
-     }
-  }
-
-  public event DaliEventHandler<object,ShowingEventArgs> Showing
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_popUpShowingEventHandler == null)
-           {
-              _popUpShowingEventHandler += value;
-
-              _popUpShowingEventCallbackDelegate = new ShowingEventCallbackDelegate(OnShowing);
-              this.ShowingSignal().Connect(_popUpShowingEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_popUpShowingEventHandler != null)
-           {
-              this.ShowingSignal().Disconnect(_popUpShowingEventCallbackDelegate);
-           }
-
-           _popUpShowingEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for ShowingSignal
-  private void OnShowing()
-  {
-     ShowingEventArgs e = new ShowingEventArgs();
-
-     if (_popUpShowingEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _popUpShowingEventHandler(this, e);
-     }
-  }
-
-
-  public event DaliEventHandler<object,ShownEventArgs> Shown
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_popUpShownEventHandler == null)
-           {
-              _popUpShownEventHandler += value;
-
-              _popUpShownEventCallbackDelegate = new ShownEventCallbackDelegate(OnShown);
-              this.ShownSignal().Connect(_popUpShownEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_popUpShownEventHandler != null)
-           {
-              this.ShownSignal().Disconnect(_popUpShownEventCallbackDelegate);
-           }
-
-           _popUpShownEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for ShownSignal
-  private void OnShown()
-  {
-     ShownEventArgs e = new ShownEventArgs();
-
-     if (_popUpShownEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _popUpShownEventHandler(this, e);
-     }
-  }
-
-  public event DaliEventHandler<object,HidingEventArgs> Hiding
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_popUpHidingEventHandler == null)
-           {
-              _popUpHidingEventHandler += value;
-
-              _popUpHidingEventCallbackDelegate = new HidingEventCallbackDelegate(OnHiding);
-              this.HidingSignal().Connect(_popUpHidingEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_popUpHidingEventHandler != null)
-           {
-              this.HidingSignal().Disconnect(_popUpHidingEventCallbackDelegate);
-           }
-
-           _popUpHidingEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for HidingSignal
-  private void OnHiding()
-  {
-     HidingEventArgs e = new HidingEventArgs();
-
-     if (_popUpHidingEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _popUpHidingEventHandler(this, e);
-     }
-  }
-
-  public event DaliEventHandler<object,HiddenEventArgs> Hidden
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_popUpHiddenEventHandler == null)
-           {
-              _popUpHiddenEventHandler += value;
-
-              _popUpHiddenEventCallbackDelegate = new HiddenEventCallbackDelegate(OnHidden);
-              this.HiddenSignal().Connect(_popUpHiddenEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_popUpHiddenEventHandler != null)
-           {
-              this.HiddenSignal().Disconnect(_popUpHiddenEventCallbackDelegate);
-           }
-
-           _popUpHiddenEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for HiddenSignal
-  private void OnHidden()
-  {
-     HiddenEventArgs e = new HiddenEventArgs();
-
-     if (_popUpHiddenEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _popUpHiddenEventHandler(this, e);
-     }
-  }
-
-  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_Popup_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_Popup_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int TITLE = NDalicPINVOKE.Popup_Property_TITLE_get();
-    public static readonly int CONTENT = NDalicPINVOKE.Popup_Property_CONTENT_get();
-    public static readonly int FOOTER = NDalicPINVOKE.Popup_Property_FOOTER_get();
-    public static readonly int DISPLAY_STATE = NDalicPINVOKE.Popup_Property_DISPLAY_STATE_get();
-    public static readonly int TOUCH_TRANSPARENT = NDalicPINVOKE.Popup_Property_TOUCH_TRANSPARENT_get();
-    public static readonly int TAIL_VISIBILITY = NDalicPINVOKE.Popup_Property_TAIL_VISIBILITY_get();
-    public static readonly int TAIL_POSITION = NDalicPINVOKE.Popup_Property_TAIL_POSITION_get();
-    public static readonly int CONTEXTUAL_MODE = NDalicPINVOKE.Popup_Property_CONTEXTUAL_MODE_get();
-    public static readonly int ANIMATION_DURATION = NDalicPINVOKE.Popup_Property_ANIMATION_DURATION_get();
-    public static readonly int ANIMATION_MODE = NDalicPINVOKE.Popup_Property_ANIMATION_MODE_get();
-    public static readonly int ENTRY_ANIMATION = NDalicPINVOKE.Popup_Property_ENTRY_ANIMATION_get();
-    public static readonly int EXIT_ANIMATION = NDalicPINVOKE.Popup_Property_EXIT_ANIMATION_get();
-    public static readonly int AUTO_HIDE_DELAY = NDalicPINVOKE.Popup_Property_AUTO_HIDE_DELAY_get();
-    public static readonly int BACKING_ENABLED = NDalicPINVOKE.Popup_Property_BACKING_ENABLED_get();
-    public static readonly int BACKING_COLOR = NDalicPINVOKE.Popup_Property_BACKING_COLOR_get();
-    public static readonly int POPUP_BACKGROUND_IMAGE = NDalicPINVOKE.Popup_Property_POPUP_BACKGROUND_IMAGE_get();
-    public static readonly int POPUP_BACKGROUND_BORDER = NDalicPINVOKE.Popup_Property_POPUP_BACKGROUND_BORDER_get();
-    public static readonly int TAIL_UP_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_UP_IMAGE_get();
-    public static readonly int TAIL_DOWN_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_DOWN_IMAGE_get();
-    public static readonly int TAIL_LEFT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_LEFT_IMAGE_get();
-    public static readonly int TAIL_RIGHT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_RIGHT_IMAGE_get();
-  
-  }
-
-  public Popup () : this (NDalicPINVOKE.Popup_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Popup(Popup handle) : this(NDalicPINVOKE.new_Popup__SWIG_1(Popup.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Popup Assign(Popup handle) {
-    Popup ret = new Popup(NDalicPINVOKE.Popup_Assign(swigCPtr, Popup.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static Popup DownCast(BaseHandle handle) {
-    Popup ret = new Popup(NDalicPINVOKE.Popup_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetTitle(Actor titleActor) {
-    NDalicPINVOKE.Popup_SetTitle(swigCPtr, Actor.getCPtr(titleActor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetTitle() {
-    Actor ret = new Actor(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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetContent() {
-    Actor ret = new Actor(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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetFooter() {
-    Actor ret = new Actor(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetDisplayState(Popup.DisplayStateType displayState) {
-    NDalicPINVOKE.Popup_SetDisplayState(swigCPtr, (int)displayState);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Popup.DisplayStateType GetDisplayState() {
-    Popup.DisplayStateType ret = (Popup.DisplayStateType)NDalicPINVOKE.Popup_GetDisplayState(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal OutsideTouchedSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_OutsideTouchedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal ShowingSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShowingSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal ShownSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShownSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal HidingSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HidingSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal HiddenSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HiddenSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public enum DisplayStateType {
-    SHOWING,
-    SHOWN,
-    HIDING,
-    HIDDEN
-  }
-
-  public enum AnimationModeType {
-    NONE,
-    ZOOM,
-    FADE,
-    CUSTOM
-  }
-
-  public enum ContextualModeType {
-    NON_CONTEXTUAL,
-    ABOVE,
-    RIGHT,
-    BELOW,
-    LEFT
-  }
-
-  public Tizen.NUI.Property.Map Title
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Popup.Property.TITLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TITLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Content
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Popup.Property.CONTENT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.CONTENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Footer
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Popup.Property.FOOTER).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.FOOTER, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string DisplayState
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.DISPLAY_STATE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.DISPLAY_STATE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool TouchTransparent
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.TOUCH_TRANSPARENT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TOUCH_TRANSPARENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool TailVisibility
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.TAIL_VISIBILITY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_VISIBILITY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector3 TailPosition
-  {
-    get
-    {
-      Vector3 temp = new Vector3(0.0f,0.0f,0.0f);
-      GetProperty( Popup.Property.TAIL_POSITION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_POSITION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string ContextualMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.CONTEXTUAL_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.CONTEXTUAL_MODE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float AnimationDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Popup.Property.ANIMATION_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ANIMATION_DURATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string AnimationMode
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.ANIMATION_MODE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ANIMATION_MODE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map EntryAnimation
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Popup.Property.ENTRY_ANIMATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.ENTRY_ANIMATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map ExitAnimation
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Popup.Property.EXIT_ANIMATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.EXIT_ANIMATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AutoHideDelay
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Popup.Property.AUTO_HIDE_DELAY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.AUTO_HIDE_DELAY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool BackingEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Popup.Property.BACKING_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.BACKING_ENABLED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 BackingColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Popup.Property.BACKING_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.BACKING_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string PopupBackgroundImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.POPUP_BACKGROUND_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.POPUP_BACKGROUND_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Rectangle PopupBackgroundBorder
-  {
-    get
-    {
-      Rectangle temp = new Rectangle(0,0,0,0);
-      GetProperty( Popup.Property.POPUP_BACKGROUND_BORDER).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.POPUP_BACKGROUND_BORDER, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string TailUpImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_UP_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_UP_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string TailDownImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_DOWN_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_DOWN_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string TailLeftImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_LEFT_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_LEFT_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string TailRightImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( Popup.Property.TAIL_RIGHT_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Popup.Property.TAIL_RIGHT_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+            if (_popUpOutsideTouchedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _popUpOutsideTouchedEventHandler(this, e);
+            }
+        }
 
-}
+        /// <summary>
+        /// Event is sent when the Popup is starting to be shown.
+        /// </summary>
+        public event EventHandler<ShowingEventArgs> Showing
+        {
+            add
+            {
+                if (_popUpShowingEventHandler == null)
+                {
+                    _popUpShowingEventCallbackDelegate = (OnShowing);
+                    ShowingSignal().Connect(_popUpShowingEventCallbackDelegate);
+                }
+                _popUpShowingEventHandler += value;
+            }
+            remove
+            {
+                _popUpShowingEventHandler -= value;
+                if (_popUpShowingEventHandler == null && _popUpShowingEventCallbackDelegate != null)
+                {
+                    ShowingSignal().Disconnect(_popUpShowingEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for ShowingSignal
+        private void OnShowing()
+        {
+            ShowingEventArgs e = new ShowingEventArgs();
+
+            if (_popUpShowingEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _popUpShowingEventHandler(this, e);
+            }
+        }
+
+
+        /// <summary>
+        /// Event is sent when the Popup has been fully displayed.
+        /// </summary>
+        public event EventHandler<ShownEventArgs> Shown
+        {
+            add
+            {
+                if (_popUpShownEventHandler == null)
+                {
+                    _popUpShownEventCallbackDelegate = (OnShown);
+                    ShownSignal().Connect(_popUpShownEventCallbackDelegate);
+                }
+                _popUpShownEventHandler += value;
+            }
+            remove
+            {
+                _popUpShownEventHandler -= value;
+                if (_popUpShownEventHandler == null && _popUpShownEventCallbackDelegate != null)
+                {
+                    ShownSignal().Disconnect(_popUpShownEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for ShownSignal
+        private void OnShown()
+        {
+            ShownEventArgs e = new ShownEventArgs();
+
+            if (_popUpShownEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _popUpShownEventHandler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Event is sent when the Popup is starting to be hidden.
+        /// </summary>
+        public event EventHandler<HidingEventArgs> Hiding
+        {
+            add
+            {
+                if (_popUpHidingEventHandler == null)
+                {
+                    _popUpHidingEventCallbackDelegate = (OnHiding);
+                    HidingSignal().Connect(_popUpHidingEventCallbackDelegate);
+                }
+                _popUpHidingEventHandler += value;
+            }
+            remove
+            {
+                _popUpHidingEventHandler -= value;
+                if (_popUpHidingEventHandler == null && _popUpHidingEventCallbackDelegate != null)
+                {
+                    HidingSignal().Disconnect(_popUpHidingEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for HidingSignal
+        private void OnHiding()
+        {
+            HidingEventArgs e = new HidingEventArgs();
+
+            if (_popUpHidingEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _popUpHidingEventHandler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Event is sent when the Popup has been completely hidden.
+        /// </summary>
+        public event EventHandler<HiddenEventArgs> Hidden
+        {
+            add
+            {
+                if (_popUpHiddenEventHandler == null)
+                {
+                    _popUpHiddenEventCallbackDelegate = (OnHidden);
+                    HiddenSignal().Connect(_popUpHiddenEventCallbackDelegate);
+                }
+                _popUpHiddenEventHandler += value;
+            }
+            remove
+            {
+                _popUpHiddenEventHandler -= value;
+                if (_popUpHiddenEventHandler == null && _popUpHiddenEventCallbackDelegate != null)
+                {
+                    HiddenSignal().Disconnect(_popUpHiddenEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for HiddenSignal
+        private void OnHidden()
+        {
+            HiddenEventArgs e = new HiddenEventArgs();
+
+            if (_popUpHiddenEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _popUpHiddenEventHandler(this, e);
+            }
+        }
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Popup_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_Popup_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int TITLE = NDalicPINVOKE.Popup_Property_TITLE_get();
+            internal static readonly int CONTENT = NDalicPINVOKE.Popup_Property_CONTENT_get();
+            internal static readonly int FOOTER = NDalicPINVOKE.Popup_Property_FOOTER_get();
+            internal static readonly int DISPLAY_STATE = NDalicPINVOKE.Popup_Property_DISPLAY_STATE_get();
+            internal static readonly int TOUCH_TRANSPARENT = NDalicPINVOKE.Popup_Property_TOUCH_TRANSPARENT_get();
+            internal static readonly int TAIL_VISIBILITY = NDalicPINVOKE.Popup_Property_TAIL_VISIBILITY_get();
+            internal static readonly int TAIL_POSITION = NDalicPINVOKE.Popup_Property_TAIL_POSITION_get();
+            internal static readonly int CONTEXTUAL_MODE = NDalicPINVOKE.Popup_Property_CONTEXTUAL_MODE_get();
+            internal static readonly int ANIMATION_DURATION = NDalicPINVOKE.Popup_Property_ANIMATION_DURATION_get();
+            internal static readonly int ANIMATION_MODE = NDalicPINVOKE.Popup_Property_ANIMATION_MODE_get();
+            internal static readonly int ENTRY_ANIMATION = NDalicPINVOKE.Popup_Property_ENTRY_ANIMATION_get();
+            internal static readonly int EXIT_ANIMATION = NDalicPINVOKE.Popup_Property_EXIT_ANIMATION_get();
+            internal static readonly int AUTO_HIDE_DELAY = NDalicPINVOKE.Popup_Property_AUTO_HIDE_DELAY_get();
+            internal static readonly int BACKING_ENABLED = NDalicPINVOKE.Popup_Property_BACKING_ENABLED_get();
+            internal static readonly int BACKING_COLOR = NDalicPINVOKE.Popup_Property_BACKING_COLOR_get();
+            internal static readonly int POPUP_BACKGROUND_IMAGE = NDalicPINVOKE.Popup_Property_POPUP_BACKGROUND_IMAGE_get();
+            internal static readonly int POPUP_BACKGROUND_BORDER = NDalicPINVOKE.Popup_Property_POPUP_BACKGROUND_BORDER_get();
+            internal static readonly int TAIL_UP_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_UP_IMAGE_get();
+            internal static readonly int TAIL_DOWN_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_DOWN_IMAGE_get();
+            internal static readonly int TAIL_LEFT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_LEFT_IMAGE_get();
+            internal static readonly int TAIL_RIGHT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_RIGHT_IMAGE_get();
+
+        }
+
+        /// <summary>
+        /// Create the Popup.
+        /// </summary>
+        public Popup() : this(NDalicPINVOKE.Popup_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal Popup(Popup handle) : this(NDalicPINVOKE.new_Popup__SWIG_1(Popup.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Popup Assign(Popup handle)
+        {
+            Popup ret = new Popup(NDalicPINVOKE.Popup_Assign(swigCPtr, Popup.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to Popup handle.
+        /// If handle points to a Popup, the downcast produces valid handle.
+        /// If not the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>handle to a Popup or an uninitialized handle</returns>
+        public new static Popup DownCast(BaseHandle handle)
+        {
+            Popup ret = new Popup(NDalicPINVOKE.Popup_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a title for this Popup.
+        /// </summary>
+        /// <param name="titleActor">The actor to set a title</param>
+        public void SetTitle(Actor titleActor)
+        {
+            NDalicPINVOKE.Popup_SetTitle(swigCPtr, Actor.getCPtr(titleActor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Actor GetTitle()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Popup_GetTitle(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the content actor.
+        /// </summary>
+        /// <param name="content">The actor to use</param>
+        public void SetContent(Actor content)
+        {
+            NDalicPINVOKE.Popup_SetContent(swigCPtr, Actor.getCPtr(content));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Actor GetContent()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Popup_GetContent(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the actor to use for a footer in this Popup.
+        /// </summary>
+        /// <param name="footer">The footer actor to be added to this Popup</param>
+        public void SetFooter(Actor footer)
+        {
+            NDalicPINVOKE.Popup_SetFooter(swigCPtr, Actor.getCPtr(footer));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Actor GetFooter()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Popup_GetFooter(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the display state of Popup.
+        /// There are 4 total display states.
+        /// Only 2 can be set, but all four can be read for better inspection of the current popup state.
+        ///
+        /// The other two states are getable, but not setable and are there for consistency.
+        ///
+        /// | Value    | Setting the state              | Getting the state              |
+        /// |----------|--------------------------------|--------------------------------|
+        /// | SHOWN    | Show the popup                 | The popup is fully shown       |
+        /// | HIDDEN   | Hide the popup                 | The popup is fully hidden      |
+        /// | SHOWING  |                                | The popup is transitioning in  |
+        /// | HIDING   |                                | The popup is transitioning out |
+        ///
+        /// All 4 state changes cause notifications via 4 respective signals that can be connected to.
+        /// </summary>
+        /// <param name="displayState">The desired display state to change to</param>
+        public void SetDisplayState(Popup.DisplayStateType displayState)
+        {
+            NDalicPINVOKE.Popup_SetDisplayState(swigCPtr, (int)displayState);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Popup.DisplayStateType GetDisplayState()
+        {
+            Popup.DisplayStateType ret = (Popup.DisplayStateType)NDalicPINVOKE.Popup_GetDisplayState(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal OutsideTouchedSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_OutsideTouchedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal ShowingSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShowingSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal ShownSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShownSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal HidingSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HidingSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal HiddenSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HiddenSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// The display states of the Popup.
+        /// </summary>
+        public enum DisplayStateType
+        {
+            Showing,
+            Shown,
+            Hiding,
+            Hidden
+        }
+
+        /// <summary>
+        /// The animation mode within popup.
+        /// Choose from a predefined mode or "CUSTOM" to use the ANIMATION_IN and ANIMATION_OUT properties.
+        /// </summary>
+        public enum AnimationModeType
+        {
+            None,
+            Zoom,
+            Fade,
+            Custom
+        }
+
+        /// <summary>
+        /// Types of contextual layout.
+        /// The Popup is positioned adjacent to it's parent in the direction specified by this mode.
+        /// NON_CONTEXTUAL disables any contextual positioning.
+        /// </summary>
+        public enum ContextualModeType
+        {
+            NonContextual,
+            Above,
+            Rright,
+            Below,
+            Left
+        }
+
+        /// <summary>
+        /// Popup title
+        /// </summary>
+        public PropertyMap Title
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Popup.Property.TITLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TITLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Popup content
+        /// </summary>
+        public PropertyMap Content
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Popup.Property.CONTENT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.CONTENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Popup footer
+        /// </summary>
+        public PropertyMap Footer
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Popup.Property.FOOTER).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.FOOTER, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Popup display state
+        /// </summary>
+        public string DisplayState
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.DISPLAY_STATE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.DISPLAY_STATE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Touch transparent
+        /// </summary>
+        public bool TouchTransparent
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Popup.Property.TOUCH_TRANSPARENT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TOUCH_TRANSPARENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Popup tail visibility
+        /// </summary>
+        public bool TailVisibility
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Popup.Property.TAIL_VISIBILITY).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_VISIBILITY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Popup tail position
+        /// </summary>
+        public Vector3 TailPosition
+        {
+            get
+            {
+                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
+                GetProperty(Popup.Property.TAIL_POSITION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_POSITION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Contextual mode
+        /// </summary>
+        public string ContextualMode
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.CONTEXTUAL_MODE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.CONTEXTUAL_MODE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Animation duration
+        /// </summary>
+        public float AnimationDuration
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Popup.Property.ANIMATION_DURATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.ANIMATION_DURATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Animation mode
+        /// </summary>
+        public string AnimationMode
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.ANIMATION_MODE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.ANIMATION_MODE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Entry animation
+        /// </summary>
+        public PropertyMap EntryAnimation
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Popup.Property.ENTRY_ANIMATION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.ENTRY_ANIMATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Exit animation
+        /// </summary>
+        public PropertyMap ExitAnimation
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Popup.Property.EXIT_ANIMATION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.EXIT_ANIMATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Auto hide delay
+        /// </summary>
+        public int AutoHideDelay
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(Popup.Property.AUTO_HIDE_DELAY).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.AUTO_HIDE_DELAY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Backing enabled
+        /// </summary>
+        public bool BackingEnabled
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Popup.Property.BACKING_ENABLED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.BACKING_ENABLED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Backing color
+        /// </summary>
+        public Vector4 BackingColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Popup.Property.BACKING_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.BACKING_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Background image
+        /// </summary>
+        public string PopupBackgroundImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.POPUP_BACKGROUND_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.POPUP_BACKGROUND_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Background border
+        /// </summary>
+        public Rectangle PopupBackgroundBorder
+        {
+            get
+            {
+                Rectangle temp = new Rectangle(0, 0, 0, 0);
+                GetProperty(Popup.Property.POPUP_BACKGROUND_BORDER).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.POPUP_BACKGROUND_BORDER, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Tail up image
+        /// </summary>
+        public string TailUpImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.TAIL_UP_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_UP_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Tail down image
+        /// </summary>
+        public string TailDownImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.TAIL_DOWN_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_DOWN_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Tail left image
+        /// </summary>
+        public string TailLeftImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.TAIL_LEFT_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_LEFT_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Tail right image
+        /// </summary>
+        public string TailRightImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(Popup.Property.TAIL_RIGHT_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Popup.Property.TAIL_RIGHT_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 18b78e6..3aa8a4e 100755 (executable)
+/*
+ * 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.
+ *
+ */
+
 namespace Tizen.NUI
 {
-  using System;
 
-  public class Position
-  {
+    /// <summary>
+    /// Position is a three dimensional vector.
+    /// </summary>
+    public class Position : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-    private float x;
-    private float y;
-    private float z;
+        internal Position(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     */
-    public Position()
-    {
-      x = 0.0f;
-      y = 0.0f;
-      z = 0.0f;
-    }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Position obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] a The Position X.
-     * @param [in] b The Position Y.
-     * @param [in] c The Position Z.
-     */
-    public Position(float a, float b, float c)
-    {
-      x = a;
-      y = b;
-      z = c;
-    }
+        ~Position()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] o The Vector Position X, Y, Z.
-     */
-    public Position(Vector3 o)
-    {
-      x = o.X;
-      y = o.Y;
-      z = o.Z;
-    }
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-    ///< name "X", type float (Position X value)
-    //@since 1.0.0
-    public float X
-    {
-      get { return x; }
-      set { x = value; }
-    }
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Vector3(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    ///< name "Y", type float (Position Y value)
-    //@since 1.0.0
-    public float Y
-    {
-      get { return y; }
-      set { y = value; }
-    }
 
-    ///< name "Z", type float (Position Z value)
-    //@since 1.0.0
-    public float Z
-    {
-      get { return z; }
-      set { z = value; }
-    }
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">Vector to add</param>
+        /// <param name="arg2">Vector to add</param>
+        /// <returns>A vector containing the result of the addition</returns>
+        public static Position operator +(Position arg1, Position arg2)
+        {
+            return arg1.Add(arg2);
+        }
 
-    /**
-     * @brief operator+
-     *
-     * @since 1.0.0
-     * @param [in] l The Position to add.
-     * @param [in] r The Position to add
-     * @return A reference to this
-     */
-    public static Position operator +(Position l, Position r)
-    {
-      return new Position(l.X + r.X, l.Y + r.Y, l.Z + r.Z);
-    }
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">Vector to subtract</param>
+        /// <param name="arg2">Vector to subtract</param>
+        /// <returns>A vector containing the result of the subtraction</returns>
+        public static Position operator -(Position arg1, Position arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
 
-    /**
-     * @brief operator-
-     *
-     * @since 1.0.0
-     * @param [in] l The Position to substract.
-     * @param [in] r The Position to substract
-     * @return A reference to this
-     */
-    public static Position operator -(Position l, Position r)
-    {
-      return new Position(l.X - r.X, l.Y - r.Y, l.Z - r.Z);
-    }
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Vector to netate</param>
+        /// <returns>A vector containg the negation</returns>
+        public static Position operator -(Position arg1)
+        {
+            return arg1.Subtract();
+        }
 
-    /**
-     * @brief operator*
-     *
-     * @since 1.0.0
-     * @param [in] a The Position to multiply.
-     * @param [in] b The constant to multiply of type double.
-     * @return A reference to this
-     */
-    public static Position operator *(Position a, double b)
-    {
-      return new Position((int)(a.X * b), (int)(a.Y * b), (int)(a.Z * b));
-    }
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">The vector to multiply</param>
+        /// <param name="arg2">The vector to multiply</param>
+        /// <returns>A vector containing the result of the multiplication</returns>
+        public static Position operator *(Position arg1, Position arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
 
-    /**
-     * @brief operator/
-     *
-     * @since 1.0.0
-     * @param [in] a The Position to divide.
-     * @param [in] b The Position to divide
-     * @return float value of division operation
-     */
-    public static float operator /(Position a, Position b)
-    {
-      return (float)System.Math.Sqrt((a.X / b.X) * (a.Y / b.Y) * (a.Z / b.Z));
-    }
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">The vector to multiply</param>
+        /// <param name="arg2">The float value to scale the vector</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Position operator *(Position arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
 
-    /**
-     * @brief Operator ==
-     *
-     * @since 1.0.0
-     * @param [in] a The Position object to compare.
-     * @param [in] b The Position object to compare.
-     * @return bool, whether Position are equal or not
-     */
-    public static bool operator == (Position a, Position b)
-    {
-      return a.X == b.X && a.Y == b.Y && a.Z == b.Z;
-    }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">The vector to divide</param>
+        /// <param name="arg2">The vector to divide</param>
+        /// <returns>A vector containing the result of the division</returns>
+        public static Position operator /(Position arg1, Position arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-    /**
-     * @brief Operator !=
-     *
-     * @since 1.0.0
-     * @param [in] a The Position object to compare.
-     * @param [in] b The Position object to compare.
-     * @return bool, whether Position are equal or not
-     */
-    public static bool operator != (Position a, Position b)
-    {
-      return a.X != b.X || a.Y != b.Y || a.Z == b.Z;
-    }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">The vector to divide</param>
+        /// <param name="arg2">The float value to scale the vector by</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Position operator /(Position arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+
+        /// <summary>
+        /// Const array subscript operator overload. Should be 0, 1 or 2.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        internal static Position GetPositionFromPtr(global::System.IntPtr cPtr)
+        {
+            Position ret = new Position(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public Position() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="x">x component</param>
+        /// <param name="y">y component</param>
+        /// <param name="z">z component</param>
+        public Position(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="position2d">Position2D to create this vector from</param>
+        public Position(Position2D position2d) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Position2D.getCPtr(position2d)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+
+
+        private Position Add(Position rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Add(swigCPtr, Position.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Subtract(Position rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Multiply(Position rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Multiply(float rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Divide(Position rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Divide(float rhs)
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Position Subtract()
+        {
+            Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is equal to
+        /// </summary>
+        /// <param name="rhs">The vector to compare</param>
+        /// <returns>Returns true if the two vectors are equal, otherwise false</returns>
+        public bool EqualTo(Position rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Position.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is not equal to
+        /// </summary>
+        /// <param name="rhs">The vector to compare</param>
+        /// <returns>Returns true if the two vectors are not equal, otherwise false</returns>
+        public bool NotEqualTo(Position rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Position.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        /// <summary>
+        /// x component
+        /// </summary>
+        public float X
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_X_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// y component
+        /// </summary>
+        public float Y
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// z component
+        /// </summary>
+        public float Z
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants. It's 0.0.
+        /// </summary>
+        public static float ParentOriginTop
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginTop_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants. It's 1.0.
+        /// </summary>
+        public static float ParentOriginBottom
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginBottom_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants. It's 0.0.
+        /// </summary>
+        public static float ParentOriginLeft
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginLeft_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants. It's 1.0.
+        /// </summary>
+        public static float ParentOriginRight
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginRight_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants. It's 0.5.
+        /// </summary>
+        public static float ParentOriginMiddle
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.ParentOriginMiddle_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.0, 0.0, 0.5
+        /// </summary>
+        public static Position ParentOriginTopLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.5, 0.0, 0.5
+        /// </summary>
+        public static Position ParentOriginTopCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 1.0, 0.0, 0.5
+        /// </summary>
+        public static Position ParentOriginTopRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.0, 0.5, 0.5
+        /// </summary>
+        public static Position ParentOriginCenterLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.0, 0.5, 0.5
+        /// </summary>
+        public static Position ParentOriginCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 1.0, 0.5, 0.5
+        /// </summary>
+        public static Position ParentOriginCenterRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.0f, 1.0f, 0.5f
+        /// </summary>
+        public static Position ParentOriginBottomLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 0.5, 1.0, 0.5
+        /// </summary>
+        public static Position ParentOriginBottomCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// ParentOrigin constants: 1.0, 1.0, 0.5
+        /// </summary>
+        public static Position ParentOriginBottomRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0
+        /// </summary>
+        public static float AnchorPointTop
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointTop_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 1.0
+        /// </summary>
+        public static float AnchorPointBottom
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointBottom_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0
+        /// </summary>
+        public static float AnchorPointLeft
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointLeft_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 1.0
+        /// </summary>
+        public static float AnchorPointRight
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointRight_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0
+        /// </summary>
+        public static float AnchorPointMiddle
+        {
+            get
+            {
+                float ret = NDalicPINVOKE.AnchorPointMiddle_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0, 0.0, 0.5
+        /// </summary>
+        public static Position AnchorPointTopLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.5, 0.0, 0.5
+        /// </summary>
+        public static Position AnchorPointTopCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 1.0, 0.0, 0.5
+        /// </summary>
+        public static Position AnchorPointTopRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0, 0.5, 0.5
+        /// </summary>
+        public static Position AnchorPointCenterLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.5, 0.5, 0.5
+        /// </summary>
+        public static Position AnchorPointCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 1.0, 0.5, 0.5
+        /// </summary>
+        public static Position AnchorPointCenterRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.0, 1.0, 0.5
+        /// </summary>
+        public static Position AnchorPointBottomLeft
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 0.5, 1.0, 0.5
+        /// </summary>
+        public static Position AnchorPointBottomCenter
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// AnchorPoint constants: 1.0, 1.0, 0.5
+        /// </summary>
+        public static Position AnchorPointBottomRight
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Constant ( 1.0f, 1.0f, 1.0f )
+        /// </summary>
+        public static Position One
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ONE_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position XAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position YAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position ZAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position NegativeXAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position NegativeYAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Position NegativeZAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Constant ( 0.0f, 0.0f, 0.0f )
+        /// </summary>
+        public static Position Zero
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get();
+                Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        public static implicit operator Vector3(Position Position)
+        {
+            return new Vector3(Position.X, Position.Y, Position.Z);
+        }
+
+        /// <summary>
+        /// </summary>
+        public static implicit operator Position(Vector3 vec)
+        {
+            return new Position(vec.X, vec.Y, vec.Z);
+        }
 
-    /**
-     * @brief GetHashCode
-     *
-     * @since 1.0.0
-     * @return int, hascode of position
-     */
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
     }
 
-    /**
-     * @brief Clone
-     *
-     * @since 1.0.0
-     * @return Position object
-     */
-    public Position Clone()
+    public struct ParentOrigin
     {
-      Position copy = new Position(X, Y, Z);
-      return copy;
+        public static readonly float Top = Position.ParentOriginTop;
+        public static readonly float Bottom = Position.ParentOriginBottom;
+        public static readonly float Left = Position.ParentOriginLeft;
+        public static readonly float Right = Position.ParentOriginRight;
+        public static readonly float Middle = Position.ParentOriginMiddle;
+        public static readonly Position TopLeft = Position.ParentOriginTopLeft;
+        public static readonly Position TopCenter = Position.ParentOriginTopCenter;
+        public static readonly Position TopRight = Position.ParentOriginTopRight;
+        public static readonly Position CenterLeft = Position.ParentOriginCenterLeft;
+        public static readonly Position Center = Position.ParentOriginCenter;
+        public static readonly Position CenterRight = Position.ParentOriginCenterRight;
+        public static readonly Position BottomLeft = Position.ParentOriginBottomLeft;
+        public static readonly Position BottomCenter = Position.ParentOriginBottomCenter;
+        public static readonly Position BottomRight = Position.ParentOriginBottomRight;
     }
-
-    // User-defined conversion from Position to Vector3
-    public static implicit operator Vector3(Position pos)
+    public struct AnchorPoint
     {
-      return new Vector3(pos.x, pos.y, pos.z);
+        public static readonly float Top = Position.AnchorPointTop;
+        public static readonly float Bottom = Position.AnchorPointBottom;
+        public static readonly float Left = Position.AnchorPointLeft;
+        public static readonly float Right = Position.AnchorPointRight;
+        public static readonly float Middle = Position.AnchorPointMiddle;
+        public static readonly Position TopLeft = Position.AnchorPointTopLeft;
+        public static readonly Position TopCenter = Position.AnchorPointTopCenter;
+        public static readonly Position TopRight = Position.AnchorPointTopRight;
+        public static readonly Position CenterLeft = Position.AnchorPointCenterLeft;
+        public static readonly Position Center = Position.AnchorPointCenter;
+        public static readonly Position CenterRight = Position.AnchorPointCenterRight;
+        public static readonly Position BottomLeft = Position.AnchorPointBottomLeft;
+        public static readonly Position BottomCenter = Position.AnchorPointBottomCenter;
+        public static readonly Position BottomRight = Position.AnchorPointBottomRight;
     }
-
-    public static implicit operator Position(Vector3 vec)
+    public struct PositionAxis
     {
-      return new Position(vec.X, vec.Y, vec.Z);
+        public static readonly Position X = Position.XAxis;
+        public static readonly Position Y = Position.YAxis;
+        public static readonly Position Z = Position.ZAxis;
+        public static readonly Position NegativeX = Position.NegativeXAxis;
+        public static readonly Position NegativeY = Position.NegativeYAxis;
+        public static readonly Position NegativeZ = Position.NegativeZAxis;
     }
-  }
+
 }
+
+
diff --git a/src/Tizen.NUI/devel-src/Position2D.cs b/src/Tizen.NUI/devel-src/Position2D.cs
new file mode 100755 (executable)
index 0000000..86ee0a6
--- /dev/null
@@ -0,0 +1,212 @@
+/*
+ * 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.
+ *
+ */
+
+namespace Tizen.NUI {
+
+public class Position2D : global::System.IDisposable {
+  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+  protected bool swigCMemOwn;
+
+  internal Position2D(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(Position2D obj) {
+    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+  }
+
+  ~Position2D() {
+    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_Vector2(swigCPtr);
+        }
+        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+      }
+      global::System.GC.SuppressFinalize(this);
+    }
+  }
+
+
+  public static Position2D operator+(Position2D arg1, Position2D arg2) {
+    return arg1.Add(arg2);
+  }
+
+  public static Position2D operator-(Position2D arg1, Position2D arg2) {
+    return arg1.Subtract(arg2);
+  }
+
+  public static Position2D operator-(Position2D arg1) {
+    return arg1.Subtract();
+  }
+
+  public static Position2D operator*(Position2D arg1, Position2D arg2) {
+    return arg1.Multiply(arg2);
+  }
+
+  public static Position2D operator*(Position2D arg1, int arg2) {
+    return arg1.Multiply(arg2);
+  }
+
+  public static Position2D operator/(Position2D arg1, Position2D arg2) {
+    return arg1.Divide(arg2);
+  }
+
+  public static Position2D operator/(Position2D arg1, int arg2) {
+    return arg1.Divide(arg2);
+  }
+
+  public float this[uint index]
+  {
+    get
+    {
+      return ValueOfIndex(index);
+    }
+  }
+
+  internal static Position2D GetPosition2DFromPtr(global::System.IntPtr cPtr) {
+    Position2D ret = new Position2D(cPtr, false);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+
+  public Position2D() : this(NDalicPINVOKE.new_Vector2__SWIG_0(), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public Position2D(int x, int y) : this(NDalicPINVOKE.new_Vector2__SWIG_1((float)x, (float)y), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  public Position2D(Position position) : this(NDalicPINVOKE.new_Vector2__SWIG_3(Position.getCPtr(position)), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
+  private Position2D Add(Position2D rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Add(swigCPtr, Position2D.getCPtr(rhs)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Position2D Subtract(Position2D rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Position2D.getCPtr(rhs)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+
+  private Position2D Multiply(Position2D rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Position2D.getCPtr(rhs)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Position2D Multiply(int rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, (float)rhs), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+
+  private Position2D Divide(Position2D rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Position2D.getCPtr(rhs)), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Position2D Divide(int rhs) {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, (float)rhs), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private Position2D Subtract() {
+    Position2D ret = new Position2D(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public bool EqualTo(Position2D rhs) {
+    bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Position2D.getCPtr(rhs));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  public bool NotEqualTo(Position2D rhs) {
+    bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Position2D.getCPtr(rhs));
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+  private int ValueOfIndex(uint index) {
+    int ret = (int)NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index);
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    return ret;
+  }
+
+
+  public int X {
+    set {
+      NDalicPINVOKE.Vector2_X_set(swigCPtr, (float)value);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
+    get {
+      float ret = NDalicPINVOKE.Vector2_X_get(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+      return (int)ret;
+    }
+  }
+
+  public int Y {
+    set {
+      NDalicPINVOKE.Vector2_Y_set(swigCPtr, (float)value);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
+    get {
+      float ret = NDalicPINVOKE.Vector2_Y_get(swigCPtr);
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+      return (int)ret;
+    }
+  }
+
+  public static implicit operator Vector2(Position2D position2d)
+  {
+    return new Vector2((float)position2d.X, (float)position2d.Y);
+  }
+
+  public static implicit operator Position2D(Vector2 vec)
+  {
+    return new Position2D((int)vec.X, (int)vec.Y);
+  }
+
+}
+
+}
+
+
index 14e64a3..dae37ca 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum PositionInheritanceMode {
+    internal enum PositionInheritanceMode {
   INHERIT_PARENT_POSITION,
   USE_PARENT_POSITION,
   USE_PARENT_POSITION_PLUS_LOCAL_POSITION,
index 56cff15..ff238ac 100755 (executable)
@@ -9,8 +9,8 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
-public enum PrimitiveVisualShapeType {
+/* moved to VisualMaps.cs
+    internal enum PrimitiveVisualShapeType {
   SPHERE,
   CONICAL_FRUSTRUM,
   CONE,
@@ -19,5 +19,5 @@ public enum PrimitiveVisualShapeType {
   OCTAHEDRON,
   BEVELLED_CUBE
 }
-
+*/
 }
index 2181f19..2c7353c 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class ProgressBar : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    using System;
+    using System.Runtime.InteropServices;
 
-  internal ProgressBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ProgressBar_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ProgressBar obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+    /// <summary>
+    /// ProgressBar is a control to give the user an indication of the progress of an operation.
+    /// </summary>
+    public class ProgressBar : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  ~ProgressBar() {
-    DisposeQueue.Instance.Add(this);
-  }
+        internal ProgressBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ProgressBar_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ProgressBar obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ProgressBar(swigCPtr);
+        ~ProgressBar()
+        {
+            DisposeQueue.Instance.Add(this);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-  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_ProgressBar_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_ProgressBar(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
         }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_ProgressBar_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get();
-    public static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get();
-    public static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get();
-    public static readonly int TRACK_VISUAL = NDalicPINVOKE.ProgressBar_Property_TRACK_VISUAL_get();
-    public static readonly int PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VISUAL_get();
-    public static readonly int SECONDARY_PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VISUAL_get();
-    public static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get();
-    public static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get();
-    public static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get();
-  
-  }
-
-  public ProgressBar () : this (NDalicPINVOKE.ProgressBar_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ProgressBar(ProgressBar handle) : this(NDalicPINVOKE.new_ProgressBar__SWIG_1(ProgressBar.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ProgressBar Assign(ProgressBar handle) {
-    ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_Assign(swigCPtr, ProgressBar.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static ProgressBar DownCast(BaseHandle handle) {
-    ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t ValueChangedSignal() {
-    SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t(NDalicPINVOKE.ProgressBar_ValueChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public float ProgressValue
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ProgressBar.Property.PROGRESS_VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.PROGRESS_VALUE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float SecondaryProgressValue
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VALUE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool Indeterminate
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( ProgressBar.Property.INDETERMINATE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.INDETERMINATE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map TrackVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ProgressBar.Property.TRACK_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.TRACK_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map ProgressVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ProgressBar.Property.PROGRESS_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.PROGRESS_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SecondaryProgressVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map IndeterminateVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ProgressBar.Property.INDETERMINATE_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.INDETERMINATE_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array IndeterminateVisualAnimation
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map LabelVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( ProgressBar.Property.LABEL_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ProgressBar.Property.LABEL_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
 
-}
+
+
+        /// <summary>
+        /// Event arguments that passed via ValueChangedEventArgs
+        /// </summary>
+        public class ValueChangedEventArgs : EventArgs
+        {
+            private ProgressBar _progressBar;
+            private float _progressValue;
+            private float _secondaryProgressValue;
+
+            public ProgressBar ProgressBar
+            {
+                get
+                {
+                    return _progressBar;
+                }
+                set
+                {
+                    _progressBar = value;
+                }
+            }
+
+            public float ProgressValue
+            {
+                get
+                {
+                    return _progressValue;
+                }
+                set
+                {
+                    _progressValue = value;
+                }
+            }
+
+            public float SecondaryProgressValue
+            {
+                get
+                {
+                    return _secondaryProgressValue;
+                }
+                set
+                {
+                    _secondaryProgressValue = value;
+                }
+            }
+
+        }
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void ValueChangedCallbackDelegate(IntPtr progressBar, float progressValue, float secondaryProgressValue);
+        private EventHandler<ValueChangedEventArgs> _progressBarValueChangedEventHandler;
+        private ValueChangedCallbackDelegate _progressBarValueChangedCallbackDelegate;
+
+        /// <summary>
+        /// Event is sent when the ProgressBar value changes.
+        /// </summary>
+        public event EventHandler<ValueChangedEventArgs> ValueChanged
+        {
+            add
+            {
+                if (_progressBarValueChangedEventHandler == null)
+                {
+                    _progressBarValueChangedCallbackDelegate = (OnValueChanged);
+                    ValueChangedSignal().Connect(_progressBarValueChangedCallbackDelegate);
+                }
+                _progressBarValueChangedEventHandler += value;
+            }
+            remove
+            {
+                _progressBarValueChangedEventHandler -= value;
+                if (_progressBarValueChangedEventHandler == null && _progressBarValueChangedCallbackDelegate != null)
+                {
+                    ValueChangedSignal().Disconnect(_progressBarValueChangedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for ProgressBar ValueChanged signal
+        private void OnValueChanged(IntPtr progressBar, float progressValue, float secondaryProgressValue)
+        {
+            ValueChangedEventArgs e = new ValueChangedEventArgs();
+
+            // Populate all members of "e" (ValueChangedEventArgs) with real page
+            e.ProgressBar = ProgressBar.GetProgressBarFromPtr(progressBar);
+            e.ProgressValue = progressValue;
+            e.SecondaryProgressValue = secondaryProgressValue;
+
+            if (_progressBarValueChangedEventHandler != null)
+            {
+                _progressBarValueChangedEventHandler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        internal static ProgressBar GetProgressBarFromPtr(global::System.IntPtr cPtr)
+        {
+            ProgressBar ret = new ProgressBar(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_ProgressBar_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_ProgressBar_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get();
+            internal static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get();
+            internal static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get();
+            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.ProgressBar_Property_TRACK_VISUAL_get();
+            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VISUAL_get();
+            internal static readonly int SECONDARY_PROGRESS_VISUAL = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VISUAL_get();
+            internal static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get();
+            internal static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get();
+            internal static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get();
+
+        }
+
+        /// <summary>
+        /// Creates the ProgressBar.
+        /// </summary>
+        public ProgressBar() : this(NDalicPINVOKE.ProgressBar_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal ProgressBar(ProgressBar handle) : this(NDalicPINVOKE.new_ProgressBar__SWIG_1(ProgressBar.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ProgressBar Assign(ProgressBar handle)
+        {
+            ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_Assign(swigCPtr, ProgressBar.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to ProgressBar handle.
+        /// If handle points to a ProgressBar, the downcast produces valid handle.
+        /// If not the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>handle to a ProgressBar or an uninitialized handle</returns>
+        public new static ProgressBar DownCast(BaseHandle handle)
+        {
+            ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ProgressBarValueChangedSignal ValueChangedSignal()
+        {
+            ProgressBarValueChangedSignal ret = new ProgressBarValueChangedSignal(NDalicPINVOKE.ProgressBar_ValueChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// The progress value of progress bar, progress runs form 0 to 1.
+        /// If Value is set to 0, progress bar will be set to beginning.
+        /// If Value is set to 1, progress bar will be set to end.
+        /// Any Value outside of the range is ignored.
+        /// </summary>
+        public float ProgressValue
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ProgressBar.Property.PROGRESS_VALUE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The secondary progress value of progress bar, secondary progress runs form 0 to 1.
+        /// Optional. If not supplied, the default is 0.
+        /// If Value is set to 0, progress bar will be set secondary progress to beginning.
+        /// If Value is set to 1, progress bar will be set secondary progress to end.
+        /// Any Value outside of the range is ignored.
+        /// </summary>
+        public float SecondaryProgressValue
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the progress-bar as \e indeterminate state.
+        /// </summary>
+        public bool Indeterminate
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(ProgressBar.Property.INDETERMINATE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The track Visual value of progress bar, it's a full progress area and it's shown behind PROGRESS_VISUAL.
+        /// Optional. If not supplied, the default track visual will be shown.
+        /// </summary>
+        public Tizen.NUI.PropertyMap TrackVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.TRACK_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The progress Visual value of progress bar, size of the progress visual is changed based on PROGRESS_VALUE.
+        /// Optional. If not supplied, the default progress visual will be shown.
+        /// </summary>
+        public Tizen.NUI.PropertyMap ProgressVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The secondary progress visual of progress bar, size of the secondary progress visual is changed based on SECONDARY_PROGRESS_VALUE.
+        /// Optional. If not supplied, the secondary progress visual will not be shown.
+        /// </summary>
+        public Tizen.NUI.PropertyMap SecondaryProgressVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The indeterminate visual of progress bar.
+        /// Optional. If not supplied, the default inditerminate visual will be shown.
+        /// </summary>
+        public Tizen.NUI.PropertyMap IndeterminateVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The transition data for indeterminate visual animation.
+        /// Optional. If not supplied, default animation will be played.
+        /// </summary>
+        public Tizen.NUI.PropertyArray IndeterminateVisualAnimation
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.INDETERMINATE_VISUAL_ANIMATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// The Label visual of progress bar.
+        /// </summary>
+        public Tizen.NUI.PropertyMap LabelVisual
+        {
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(ProgressBar.Property.LABEL_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ProgressBar.Property.LABEL_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
similarity index 51%
rename from src/Tizen.NUI/devel-src/BoolSignal.cs
rename to src/Tizen.NUI/devel-src/ProgressBarValueChangedSignal.cs
index 15ab8ad..1406298 100755 (executable)
 
 namespace Tizen.NUI {
 
-public class BoolSignal : global::System.IDisposable {
+public class ProgressBarValueChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
-  internal BoolSignal(global::System.IntPtr cPtr, bool cMemoryOwn) {
+  internal ProgressBarValueChangedSignal(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(BoolSignal obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ProgressBarValueChangedSignal obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 
-  ~BoolSignal() {
-    Dispose();
+  ~ProgressBarValueChangedSignal() {
+    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_BoolSignal(swigCPtr);
+          NDalicPINVOKE.delete_ProgressBarValueChangedSignal(swigCPtr);
         }
         swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
       }
@@ -40,41 +45,42 @@ public class BoolSignal : global::System.IDisposable {
     }
   }
 
-  public BoolSignal() : this(NDalicPINVOKE.new_BoolSignal(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
 
   public bool Empty() {
-    bool ret = NDalicPINVOKE.BoolSignal_Empty(swigCPtr);
+    bool ret = NDalicPINVOKE.ProgressBarValueChangedSignal_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
   public uint GetConnectionCount() {
-    uint ret = NDalicPINVOKE.BoolSignal_GetConnectionCount(swigCPtr);
+    uint ret = NDalicPINVOKE.ProgressBarValueChangedSignal_GetConnectionCount(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public void Connect(SWIGTYPE_p_f___bool func) {
-    NDalicPINVOKE.BoolSignal_Connect__SWIG_0(swigCPtr, SWIGTYPE_p_f___bool.getCPtr(func));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public void Connect(System.Delegate func) {
+System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
+    {
+      NDalicPINVOKE.ProgressBarValueChangedSignal_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
   }
 
-  public void Disconnect(SWIGTYPE_p_f___bool func) {
-    NDalicPINVOKE.BoolSignal_Disconnect(swigCPtr, SWIGTYPE_p_f___bool.getCPtr(func));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public void Disconnect(System.Delegate func) {
+System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
+    {
+      NDalicPINVOKE.ProgressBarValueChangedSignal_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
   }
 
-  public void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) {
-    NDalicPINVOKE.BoolSignal_Connect__SWIG_4(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), SWIGTYPE_p_Dali__FunctorDelegate.getCPtr(arg1));
+  public void Emit(ProgressBar arg1, float arg2, float arg3) {
+    NDalicPINVOKE.ProgressBarValueChangedSignal_Emit(swigCPtr, ProgressBar.getCPtr(arg1), arg2, arg3);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public bool Emit() {
-    bool ret = NDalicPINVOKE.BoolSignal_Emit(swigCPtr);
+  public ProgressBarValueChangedSignal() : this(NDalicPINVOKE.new_ProgressBarValueChangedSignal(), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
   }
 
 }
diff --git a/src/Tizen.NUI/devel-src/ProjectionMode.cs b/src/Tizen.NUI/devel-src/ProjectionMode.cs
deleted file mode 100755 (executable)
index 8641aea..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum ProjectionMode {
-  PERSPECTIVE_PROJECTION,
-  ORTHOGRAPHIC_PROJECTION
-}
-
-}
index 456b945..abf111c 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Property : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    internal class Property : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal 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;
-  }
+        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() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Property()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Property(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Property(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public static int INVALID_INDEX {
-    get {
-      int ret = NDalicPINVOKE.Property_INVALID_INDEX_get();
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static int INVALID_KEY {
-    get {
-      int ret = NDalicPINVOKE.Property_INVALID_KEY_get();
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static int INVALID_COMPONENT_INDEX {
-    get {
-      int ret = NDalicPINVOKE.Property_INVALID_COMPONENT_INDEX_get();
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public Property(Handle arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Handle.getCPtr(arg0), propertyIndex), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Property(Handle arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Handle.getCPtr(arg0), propertyIndex, componentIndex), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Property(Handle arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Handle.getCPtr(arg0), propertyName), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Property(Handle arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Handle.getCPtr(arg0), propertyName, componentIndex), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Handle _object {
-    set {
-      NDalicPINVOKE.Property__object_set(swigCPtr, Handle.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      Handle ret = new Handle(NDalicPINVOKE.Property__object_get(swigCPtr), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int propertyIndex {
-    set {
-      NDalicPINVOKE.Property_propertyIndex_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Property_propertyIndex_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public int componentIndex {
-    set {
-      NDalicPINVOKE.Property_componentIndex_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Property_componentIndex_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public class Array : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Array(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(Array obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Array() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Property_Array(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
+
+
+        internal static int INVALID_INDEX
+        {
+            get
+            {
+                int ret = NDalicPINVOKE.Property_INVALID_INDEX_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static int INVALID_KEY
+        {
+            get
+            {
+                int ret = NDalicPINVOKE.Property_INVALID_KEY_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static int INVALID_COMPONENT_INDEX
+        {
+            get
+            {
+                int ret = NDalicPINVOKE.Property_INVALID_COMPONENT_INDEX_get();
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public Property(Handle arg0, int propertyIndex) : this(NDalicPINVOKE.new_Property__SWIG_0(Handle.getCPtr(arg0), propertyIndex), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Property(Handle arg0, int propertyIndex, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_1(Handle.getCPtr(arg0), propertyIndex, componentIndex), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Property(Handle arg0, string propertyName) : this(NDalicPINVOKE.new_Property__SWIG_2(Handle.getCPtr(arg0), propertyName), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Property(Handle arg0, string propertyName, int componentIndex) : this(NDalicPINVOKE.new_Property__SWIG_3(Handle.getCPtr(arg0), propertyName, componentIndex), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Handle _object
+        {
+            set
+            {
+                NDalicPINVOKE.Property__object_set(swigCPtr, Handle.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Handle ret = new Handle(NDalicPINVOKE.Property__object_get(swigCPtr), false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public int propertyIndex
+        {
+            set
+            {
+                NDalicPINVOKE.Property_propertyIndex_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Property_propertyIndex_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        public int componentIndex
+        {
+            set
+            {
+                NDalicPINVOKE.Property_componentIndex_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Property_componentIndex_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
     }
-  
-    public Property.Value this[uint index]
+
+    /// <summary>
+    /// A Array of property values.
+    /// </summary>
+    public class PropertyArray : global::System.IDisposable
     {
-      get
-      {
-        return ValueOfIndex(index);
-      }
-    }
-  
-    public Array() : this(NDalicPINVOKE.new_Property_Array__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Array(Property.Array other) : this(NDalicPINVOKE.new_Property_Array__SWIG_1(Property.Array.getCPtr(other)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public uint Size() {
-      uint ret = NDalicPINVOKE.Property_Array_Size(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public uint Count() {
-      uint ret = NDalicPINVOKE.Property_Array_Count(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Empty() {
-      bool ret = NDalicPINVOKE.Property_Array_Empty(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public void Clear() {
-      NDalicPINVOKE.Property_Array_Clear(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public void Reserve(uint size) {
-      NDalicPINVOKE.Property_Array_Reserve(swigCPtr, size);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public void Resize(uint size) {
-      NDalicPINVOKE.Property_Array_Resize(swigCPtr, size);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public uint Capacity() {
-      uint ret = NDalicPINVOKE.Property_Array_Capacity(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public void PushBack(Property.Value value) {
-      NDalicPINVOKE.Property_Array_PushBack(swigCPtr, Property.Value.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Property.Array Add(Property.Value value) {
-      Property.Array ret = new Property.Array(NDalicPINVOKE.Property_Array_Add(swigCPtr, Property.Value.getCPtr(value)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value GetElementAt(uint index) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Array_GetElementAt__SWIG_0(swigCPtr, index), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value ValueOfIndex(uint index) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Array_ValueOfIndex__SWIG_0(swigCPtr, index), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Array Assign(Property.Array other) {
-      Property.Array ret = new Property.Array(NDalicPINVOKE.Property_Array_Assign(swigCPtr, Property.Array.getCPtr(other)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-  }
-
-  public class Key : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Key(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(Key obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Key() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Property_Key(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property.Key.Type type {
-      set {
-        NDalicPINVOKE.Property_Key_type_set(swigCPtr, (int)value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        Property.Key.Type ret = (Property.Key.Type)NDalicPINVOKE.Property_Key_type_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public int indexKey {
-      set {
-        NDalicPINVOKE.Property_Key_indexKey_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        int ret = NDalicPINVOKE.Property_Key_indexKey_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public string stringKey {
-      set {
-        NDalicPINVOKE.Property_Key_stringKey_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        string ret = NDalicPINVOKE.Property_Key_stringKey_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public Key(string key) : this(NDalicPINVOKE.new_Property_Key__SWIG_0(key), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Key(int key) : this(NDalicPINVOKE.new_Property_Key__SWIG_1(key), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public bool EqualTo(string rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_0(swigCPtr, rhs);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool EqualTo(int rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_1(swigCPtr, rhs);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool EqualTo(Property.Key rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_2(swigCPtr, Property.Key.getCPtr(rhs));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool NotEqualTo(string rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_0(swigCPtr, rhs);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool NotEqualTo(int rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_1(swigCPtr, rhs);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool NotEqualTo(Property.Key rhs) {
-      bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_2(swigCPtr, Property.Key.getCPtr(rhs));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public enum Type {
-      INDEX,
-      STRING
-    }
-  
-  }
-
-  public class Map : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Map(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(Map obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Map() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Property_Map(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal PropertyArray(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(PropertyArray obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~PropertyArray()
+        {
+            Dispose();
+        }
+
+        public virtual void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Property_Array(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Operator to access an element.
+        /// </summary>
+        /// <param name="index">The element index to access. No bounds checking is performed</param>
+        /// <returns>The a reference to the element</returns>
+        public PropertyValue this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PropertyArray() : this(NDalicPINVOKE.new_Property_Array__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PropertyArray(PropertyArray other) : this(NDalicPINVOKE.new_Property_Array__SWIG_1(PropertyArray.getCPtr(other)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the number of elements in the array.
+        /// </summary>
+        /// <returns>The number of elements in the array</returns>
+        public uint Size()
+        {
+            uint ret = NDalicPINVOKE.Property_Array_Size(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the number of elements in the array.
+        /// </summary>
+        /// <returns>The number of elements in the array</returns>
+        public uint Count()
+        {
+            uint ret = NDalicPINVOKE.Property_Array_Count(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns whether the array is empty.
+        /// </summary>
+        /// <returns>Return true if empty, false otherwise</returns>
+        public bool Empty()
+        {
+            bool ret = NDalicPINVOKE.Property_Array_Empty(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Clears the array.
+        /// </summary>
+        public void Clear()
+        {
+            NDalicPINVOKE.Property_Array_Clear(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Increases the capacity of the array.
+        /// </summary>
+        /// <param name="size">The size to reserve</param>
+        public void Reserve(uint size)
+        {
+            NDalicPINVOKE.Property_Array_Reserve(swigCPtr, size);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Resizes to size.
+        /// </summary>
+        /// <param name="size">The size to resize</param>
+        public void Resize(uint size)
+        {
+            NDalicPINVOKE.Property_Array_Resize(swigCPtr, size);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the capacity of the array.
+        /// </summary>
+        /// <returns>The allocated capacity of the array</returns>
+        public uint Capacity()
+        {
+            uint ret = NDalicPINVOKE.Property_Array_Capacity(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Adds an element to the array.
+        /// </summary>
+        /// <param name="value">The value to add to the end of the array</param>
+        public void PushBack(PropertyValue value)
+        {
+            NDalicPINVOKE.Property_Array_PushBack(swigCPtr, PropertyValue.getCPtr(value));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Add an element to the array.
+        /// </summary>
+        /// <param name="value">The value to add to the end of the array</param>
+        public PropertyArray Add(PropertyValue value)
+        {
+            PropertyArray ret = new PropertyArray(NDalicPINVOKE.Property_Array_Add(swigCPtr, PropertyValue.getCPtr(value)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Access an element.
+        /// </summary>
+        /// <param name="index">The element index to access. No bounds checking is performed</param>
+        /// <returns>The a reference to the element</returns>
+        public PropertyValue GetElementAt(uint index)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Array_GetElementAt__SWIG_0(swigCPtr, index), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the value of elements in the array.
+        /// </summary>
+        /// <param name="index">The element index to retrieve.</param>
+        /// <returns>The a reference to the element</returns>
+        public PropertyValue ValueOfIndex(uint index)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Array_ValueOfIndex__SWIG_0(swigCPtr, index), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Copy the array.
+        /// </summary>
+        /// <param name="other">The array to copy from</param>
+        /// <returns>The copied array</returns>
+        internal PropertyArray Assign(PropertyArray other)
+        {
+            PropertyArray ret = new PropertyArray(NDalicPINVOKE.Property_Array_Assign(swigCPtr, PropertyArray.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
     }
-  
-    public Property.Value this[string key]
+
+    /// <summary>
+    /// A key type which can be either a std::string or a Property::Index
+    /// </summary>
+    public class PropertyKey : global::System.IDisposable
     {
-      get
-      {
-        return ValueOfIndex(key);
-      }
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal PropertyKey(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(PropertyKey obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~PropertyKey()
+        {
+            Dispose();
+        }
+
+        public virtual void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Property_Key(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// The type of the key
+        /// </summary>
+        public PropertyKey.Type type
+        {
+            set
+            {
+                NDalicPINVOKE.Property_Key_type_set(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                PropertyKey.Type ret = (PropertyKey.Type)NDalicPINVOKE.Property_Key_type_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// The index key.
+        /// </summary>
+        public int indexKey
+        {
+            set
+            {
+                NDalicPINVOKE.Property_Key_indexKey_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Property_Key_indexKey_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// The string key.
+        /// </summary>
+        public string stringKey
+        {
+            set
+            {
+                NDalicPINVOKE.Property_Key_stringKey_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                string ret = NDalicPINVOKE.Property_Key_stringKey_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">The string key</param>
+        public PropertyKey(string key) : this(NDalicPINVOKE.new_Property_Key__SWIG_0(key), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="key">The index key</param>
+        public PropertyKey(int key) : this(NDalicPINVOKE.new_Property_Key__SWIG_1(key), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Compare if rhs is equal to
+        /// </summary>
+        /// <param name="rhs">A string key to compare against</param>
+        /// <returns>Returns true if the key compares, or false if it isn't equal or of the wrong type</returns>
+        public bool EqualTo(string rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_0(swigCPtr, rhs);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is equal to
+        /// </summary>
+        /// <param name="rhs">A index key to compare against</param>
+        /// <returns>Returns true if the key compares, or false if it isn't equal or of the wrong type</returns>
+        public bool EqualTo(int rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_1(swigCPtr, rhs);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is equal to
+        /// </summary>
+        /// <param name="rhs">A key to compare against</param>
+        /// <returns>Returns true if the keys are of the same type and have the same value</returns>
+        public bool EqualTo(PropertyKey rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_EqualTo__SWIG_2(swigCPtr, PropertyKey.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is not equal to
+        /// </summary>
+        /// <param name="rhs">An index key to compare against.</param>
+        /// <returns>Returns true if the key is not equal or not a string key</returns>
+        public bool NotEqualTo(string rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_0(swigCPtr, rhs);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is not equal to
+        /// </summary>
+        /// <param name="rhs">An index key to compare against.</param>
+        /// <returns>Returns true if the key is not equal, or not an index key</returns>
+        public bool NotEqualTo(int rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_1(swigCPtr, rhs);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Compare if rhs is not equal to
+        /// </summary>
+        /// <param name="rhs">A key to compare against.</param>
+        /// <returns>Returns true if the keys are not of the same type or are not equal</returns>
+        public bool NotEqualTo(PropertyKey rhs)
+        {
+            bool ret = NDalicPINVOKE.Property_Key_NotEqualTo__SWIG_2(swigCPtr, PropertyKey.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// The type of key
+        /// </summary>
+        public enum Type
+        {
+            Index,
+            String
+        }
+
     }
-  
-    public Property.Value this[int key]
+
+    /// <summary>
+    /// A Map of property values, the key type could be String or Property::Index.
+    /// </summary>
+    public class PropertyMap : global::System.IDisposable
     {
-      get
-      {
-        return ValueOfIndex(key);
-      }
-    }
-  
-    public Map() : this(NDalicPINVOKE.new_Property_Map__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Map(Property.Map other) : this(NDalicPINVOKE.new_Property_Map__SWIG_1(Property.Map.getCPtr(other)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public uint Count() {
-      uint ret = NDalicPINVOKE.Property_Map_Count(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Empty() {
-      bool ret = NDalicPINVOKE.Property_Map_Empty(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public void Insert(string key, Property.Value value) {
-      NDalicPINVOKE.Property_Map_Insert__SWIG_0(swigCPtr, key, Property.Value.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public void Insert(int key, Property.Value value) {
-      NDalicPINVOKE.Property_Map_Insert__SWIG_2(swigCPtr, key, Property.Value.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Property.Map Add(string key, Property.Value value) {
-      Property.Map ret = new Property.Map(NDalicPINVOKE.Property_Map_Add__SWIG_0(swigCPtr, key, Property.Value.getCPtr(value)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Map Add(int key, Property.Value value) {
-      Property.Map ret = new Property.Map(NDalicPINVOKE.Property_Map_Add__SWIG_2(swigCPtr, key, Property.Value.getCPtr(value)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value GetValue(uint position) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Map_GetValue(swigCPtr, position), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public string GetKey(uint position) {
-      string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Key GetKeyAt(uint position) {
-      Property.Key ret = new Property.Key(NDalicPINVOKE.Property_Map_GetKeyAt(swigCPtr, position), true);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public StringValuePair GetPair(uint position) {
-      StringValuePair ret = new StringValuePair(NDalicPINVOKE.Property_Map_GetPair(swigCPtr, position), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value Find(string key) {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value Find(int key) {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value Find(int indexKey, string stringKey) {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_3(swigCPtr, indexKey, stringKey);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value Find(string key, Property.Type type) {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value Find(int key, Property.Type type) {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public void Clear() {
-      NDalicPINVOKE.Property_Map_Clear(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public void Merge(Property.Map from) {
-      NDalicPINVOKE.Property_Map_Merge(swigCPtr, Property.Map.getCPtr(from));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Property.Value ValueOfIndex(string key) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_0(swigCPtr, key), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Value ValueOfIndex(int key) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_2(swigCPtr, key), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Map Assign(Property.Map other) {
-      Property.Map ret = new Property.Map(NDalicPINVOKE.Property_Map_Assign(swigCPtr, Property.Map.getCPtr(other)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-  }
-
-  public class Value : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Value(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(Value obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Value() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Property_Value(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-  
-      // Extension to property value class that allows us to create a
-      // PropertyValue from a C# object, e.g. int, float, string
-      static public Property.Value CreateFromObject( System.Object obj)
-      {
-        System.Type type = obj.GetType ();
-  
-          Property.Value value;
-  
-          if ( type.Equals (typeof(int)) )
-          {
-            //Console.WriteLine (" got an int property value ");
-            value = new Property.Value ((int) obj );
-          }
-          if ( type.Equals (typeof(System.Int32)) )
-          {
-            //Console.WriteLine (" got an int property value ");
-            value = new Property.Value ((int) obj );
-          }
-          else if ( type.Equals (typeof(bool)) )
-          {
-            //Console.WriteLine (" got an bool property value ");
-            value = new Property.Value ((bool) obj );
-          }
-          else if ( type.Equals (typeof(float)) )
-          {
-            //Console.WriteLine (" got an float property value ");
-            value = new Property.Value ((float) obj );
-          }
-          else if ( type.Equals (typeof(string)) )
-          {
-            //Console.WriteLine (" got a string property value ");
-            value = new Property.Value ((string) obj );
-          }
-          else if ( type.Equals (typeof(Vector2)) )
-          {
-            //Console.WriteLine (" got an Vector2 property value ");
-            value = new Property.Value ((Vector2) obj );
-          }
-          else if ( type.Equals (typeof(Vector3)) )
-          {
-            //Console.WriteLine (" got an Vector3 property value ");
-            value = new Property.Value ((Vector3) obj );
-          }
-          else if ( type.Equals (typeof(Vector4)) )
-          {
-            //Console.WriteLine (" got an Vector4 property value ");
-  
-            value = new Property.Value ((Vector4) obj );
-          }
-          else if ( type.Equals (typeof(Position)) )
-          {
-            //Console.WriteLine (" got an Position property value ");
-            value = new Property.Value ((Position) obj );
-          }
-          else if ( type.Equals (typeof(Size)) )
-          {
-            //Console.WriteLine (" got an Size property value ");
-            value = new Property.Value ((Size) obj );
-          }
-          else if ( type.Equals (typeof(Color)) )
-          {
-            //Console.WriteLine (" got an Color property value ");
-            value = new Property.Value ((Color) obj );
-          }
-          else
-          {
-             throw new global::System.InvalidOperationException("Unimplemented type for Property Value");
-          }
-          return  value;
-      }
-  
-  
-   
-    public Value() : this(NDalicPINVOKE.new_Property_Value__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(bool boolValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_1(boolValue), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(int integerValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_2(integerValue), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(float floatValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_3(floatValue), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Vector2 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Vector2.getCPtr(vectorValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Vector3 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Vector3.getCPtr(vectorValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Vector4 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Vector4.getCPtr(vectorValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Matrix3 matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_7(Matrix3.getCPtr(matrixValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Matrix matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_8(Matrix.getCPtr(matrixValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Rectangle vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_9(Rectangle.getCPtr(vectorValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(AngleAxis angleAxis) : this(NDalicPINVOKE.new_Property_Value__SWIG_10(AngleAxis.getCPtr(angleAxis)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Quaternion quaternion) : this(NDalicPINVOKE.new_Property_Value__SWIG_11(Quaternion.getCPtr(quaternion)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(string stringValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_12(stringValue), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Property.Array arrayValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_14(Property.Array.getCPtr(arrayValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Property.Map mapValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_15(Property.Map.getCPtr(mapValue)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Property.Type type) : this(NDalicPINVOKE.new_Property_Value__SWIG_16((int)type), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Value(Property.Value value) : this(NDalicPINVOKE.new_Property_Value__SWIG_17(Property.Value.getCPtr(value)), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public Property.Value Assign(Property.Value value) {
-      Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Value_Assign(swigCPtr, Property.Value.getCPtr(value)), false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public Property.Type GetType() {
-      Property.Type ret = (Property.Type)NDalicPINVOKE.Property_Value_GetType(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(ref bool boolValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, ref boolValue);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(ref float floatValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, ref floatValue);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(ref int integerValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, ref integerValue);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Rectangle rect) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_4(swigCPtr, Rectangle.getCPtr(rect));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Vector2 vectorValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_5(swigCPtr, Vector2.getCPtr(vectorValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Vector3 vectorValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Vector3.getCPtr(vectorValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Vector4 vectorValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_7(swigCPtr, Vector4.getCPtr(vectorValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Matrix3 matrixValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_8(swigCPtr, Matrix3.getCPtr(matrixValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Matrix matrixValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_9(swigCPtr, Matrix.getCPtr(matrixValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(AngleAxis angleAxisValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_10(swigCPtr, AngleAxis.getCPtr(angleAxisValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Quaternion quaternionValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_11(swigCPtr, Quaternion.getCPtr(quaternionValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(out string stringValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_12(swigCPtr, out stringValue);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Property.Array arrayValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_13(swigCPtr, Property.Array.getCPtr(arrayValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
-  
-    public bool Get(Property.Map mapValue) {
-      bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_14(swigCPtr, Property.Map.getCPtr(mapValue));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal PropertyMap(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(PropertyMap obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~PropertyMap()
+        {
+            Dispose();
+        }
+
+        public virtual void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Property_Map(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Operator to access the element with the specified string key.
+        /// If an element with the key does not exist, then it is created.
+        /// </summary>
+        /// <param name="key">The key whose value to access</param>
+        /// <returns>A value for the element with the specified key</returns>
+        public PropertyValue this[string key]
+        {
+            get
+            {
+                return ValueOfIndex(key);
+            }
+        }
+
+        /// <summary>
+        /// Operator to access the element with the specified index key.
+        /// If an element with the key does not exist, then it is created.
+        /// </summary>
+        /// <param name="key">The key whose value to access</param>
+        /// <returns>A value for the element with the specified key</returns>
+        public PropertyValue this[int key]
+        {
+            get
+            {
+                return ValueOfIndex(key);
+            }
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PropertyMap() : this(NDalicPINVOKE.new_Property_Map__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="other">The Map to copy from</param>
+        public PropertyMap(PropertyMap other) : this(NDalicPINVOKE.new_Property_Map__SWIG_1(PropertyMap.getCPtr(other)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the number of elements in the map.
+        /// </summary>
+        /// <returns>The number of elements in the map</returns>
+        public uint Count()
+        {
+            uint ret = NDalicPINVOKE.Property_Map_Count(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns whether the map is empty.
+        /// </summary>
+        /// <returns>Returns true if empty, false otherwise</returns>
+        public bool Empty()
+        {
+            bool ret = NDalicPINVOKE.Property_Map_Empty(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Inserts the key-value pair in the Map, with the key type as string.
+        /// Does not check for duplicates.
+        /// </summary>
+        /// <param name="key">The key to insert</param>
+        /// <param name="value">The value to insert</param>
+        public void Insert(string key, PropertyValue value)
+        {
+            NDalicPINVOKE.Property_Map_Insert__SWIG_0(swigCPtr, key, PropertyValue.getCPtr(value));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Inserts the key-value pair in the Map, with the key type as index.
+        /// Does not check for duplicates.
+        /// </summary>
+        /// <param name="key">The key to insert</param>
+        /// <param name="value">The value to insert</param>
+        public void Insert(int key, PropertyValue value)
+        {
+            NDalicPINVOKE.Property_Map_Insert__SWIG_2(swigCPtr, key, PropertyValue.getCPtr(value));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Inserts the key-value pair in the Map, with the key type as string.
+        /// Does not check for duplicates.
+        /// </summary>
+        /// <param name="key">The key to insert</param>
+        /// <param name="value">The value to insert</param>
+        /// <returns>Returns a reference to this object</returns>
+        public PropertyMap Add(string key, PropertyValue value)
+        {
+            PropertyMap ret = new PropertyMap(NDalicPINVOKE.Property_Map_Add__SWIG_0(swigCPtr, key, PropertyValue.getCPtr(value)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Inserts the key-value pair in the Map, with the key type as string.
+        /// Does not check for duplicates.
+        /// </summary>
+        /// <param name="key">The key to insert</param>
+        /// <param name="value">The value to insert</param>
+        /// <returns>Returns a reference to this object</returns>
+        public PropertyMap Add(int key, PropertyValue value)
+        {
+            PropertyMap ret = new PropertyMap(NDalicPINVOKE.Property_Map_Add__SWIG_2(swigCPtr, key, PropertyValue.getCPtr(value)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the value at the specified position.
+        /// </summary>
+        /// <param name="position">The specified position</param>
+        /// <returns>A reference to the value at the specified position</returns>
+        public PropertyValue GetValue(uint position)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Map_GetValue(swigCPtr, position), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the key at the specified position.
+        /// </summary>
+        /// <param name="position">The specified position</param>
+        /// <returns>A reference to the key at the specified position</returns>
+        public string GetKey(uint position)
+        {
+            string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieve the key at the specified position.
+        /// </summary>
+        /// <param name="position">The specified position</param>
+        /// <returns>A copy of the key at the specified position</returns>
+        public PropertyKey GetKeyAt(uint position)
+        {
+            PropertyKey ret = new PropertyKey(NDalicPINVOKE.Property_Map_GetKeyAt(swigCPtr, position), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal StringValuePair GetPair(uint position)
+        {
+            StringValuePair ret = new StringValuePair(NDalicPINVOKE.Property_Map_GetPair(swigCPtr, position), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <returns>The value if it exists, an empty object otherwise</returns>
+        public PropertyValue Find(string key)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <returns>The value if it exists, an empty object otherwise</returns>
+        public PropertyValue Find(int key)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified keys if either exist.
+        /// </summary>
+        /// <param name="indexKey">The index key to find</param>
+        /// <param name="stringKey">The string key to find</param>
+        /// <returns>The value if it exists, an empty object otherwise</returns>
+        public PropertyValue Find(int indexKey, string stringKey)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_3(swigCPtr, indexKey, stringKey);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists and its type is type.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <param name="type">The type to check</param>
+        /// <returns>The value if it exists, an empty value otherwise</returns>
+        public PropertyValue Find(string key, PropertyType type)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the value for the specified key if it exists and its type is type.
+        /// </summary>
+        /// <param name="key">The key to find</param>
+        /// <param name="type">The type to check</param>
+        /// <returns>The value if it exists, an empty value otherwise</returns>
+        public PropertyValue Find(int key, PropertyType type)
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type);
+            PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Clears the map.
+        /// </summary>
+        public void Clear()
+        {
+            NDalicPINVOKE.Property_Map_Clear(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Merges values from the map 'from' to the current.
+        /// Any values in 'from' will overwrite the values in the current map.
+        /// </summary>
+        /// <param name="from">The map to merge from</param>
+        public void Merge(PropertyMap from)
+        {
+            NDalicPINVOKE.Property_Map_Merge(swigCPtr, PropertyMap.getCPtr(from));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Retrieves the element with the specified string key.
+        /// </summary>
+        /// <param name="key">The key whose value to retrieve</param>
+        /// <returns>The value for the element with the specified key</returns>
+        public PropertyValue ValueOfIndex(string key)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_0(swigCPtr, key), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the element with the specified index key.
+        /// </summary>
+        /// <param name="key">The key whose value to retrieve</param>
+        /// <returns>The value for the element with the specified key</returns>
+        public PropertyValue ValueOfIndex(int key)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_2(swigCPtr, key), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Copy the map.
+        /// </summary>
+        /// <param name="other">The map to copy from</param>
+        /// <returns>The copied map</returns>
+        internal PropertyMap Assign(PropertyMap other)
+        {
+            PropertyMap ret = new PropertyMap(NDalicPINVOKE.Property_Map_Assign(swigCPtr, PropertyMap.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
     }
-  
-    public Property.Array GetArray() {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetArray(swigCPtr);
-      Property.Array ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Array(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
+
+    /// <summary>
+    /// A value-type representing a property value.
+    /// </summary>
+    public class PropertyValue : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal PropertyValue(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(PropertyValue obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~PropertyValue()
+        {
+            Dispose();
+        }
+
+        public virtual void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Property_Value(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+
+        /// <summary>
+        /// Extension to property value class that allows us to create a
+        /// PropertyValue from a C# object, e.g. int, float, string
+        /// </summary>
+        /// <param name="obj">An object to create</param>
+        /// <returns>The created value</returns>
+        static public PropertyValue CreateFromObject(System.Object obj)
+        {
+            System.Type type = obj.GetType();
+
+            PropertyValue value;
+
+            if (type.Equals(typeof(int)))
+            {
+                System.Console.WriteLine(" got an int property value ");
+                value = new PropertyValue((int)obj);
+            }
+            if (type.Equals(typeof(System.Int32)))
+            {
+                System.Console.WriteLine(" got an int property value ");
+                value = new PropertyValue((int)obj);
+            }
+            else if (type.Equals(typeof(bool)))
+            {
+                System.Console.WriteLine(" got an bool property value ");
+                value = new PropertyValue((bool)obj);
+            }
+            else if (type.Equals(typeof(float)))
+            {
+                System.Console.WriteLine(" got an float property value ");
+                value = new PropertyValue((float)obj);
+            }
+            else if (type.Equals(typeof(string)))
+            {
+                System.Console.WriteLine(" got a string property value ");
+                value = new PropertyValue((string)obj);
+            }
+            else if (type.Equals(typeof(Vector2)))
+            {
+                System.Console.WriteLine(" got an Vector2 property value ");
+                value = new PropertyValue((Vector2)obj);
+            }
+            else if (type.Equals(typeof(Vector3)))
+            {
+                System.Console.WriteLine(" got an Vector3 property value ");
+                value = new PropertyValue((Vector3)obj);
+            }
+            else if (type.Equals(typeof(Vector4)))
+            {
+                System.Console.WriteLine(" got an Vector4 property value ");
+
+                value = new PropertyValue((Vector4)obj);
+            }
+            else if (type.Equals(typeof(Position)))
+            {
+                System.Console.WriteLine(" got an Position property value ");
+                value = new PropertyValue((Position)obj);
+            }
+            else if (type.Equals(typeof(Size)))
+            {
+                System.Console.WriteLine(" got an Size property value ");
+                value = new PropertyValue((Size)obj);
+            }
+            else if (type.Equals(typeof(Color)))
+            {
+                System.Console.WriteLine(" got an Color property value ");
+                value = new PropertyValue((Color)obj);
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("Unimplemented type for Property Value");
+            }
+            return value;
+        }
+
+
+        /// <summary>
+        /// Creates a Size2D property value.
+        /// </summary>
+        /// <param name="vectorValue">A Size2D values</param>
+        public PropertyValue(Size2D vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Size2D.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Size property value.
+        /// </summary>
+        /// <param name="vectorValue">A Size values</param>
+        public PropertyValue(Size vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Size.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Position2D property value.
+        /// </summary>
+        /// <param name="vectorValue">A Position2D values</param>
+        public PropertyValue(Position2D vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Position2D.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Position property value.
+        /// </summary>
+        /// <param name="vectorValue">A Position values</param>
+        public PropertyValue(Position vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Position.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Color property value.
+        /// </summary>
+        /// <param name="vectorValue">A Color values</param>
+        public PropertyValue(Color vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Color.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+
+        /// <summary>
+        /// Retrieves a Size2D value.
+        /// </summary>
+        /// <param name="vectorValue"> On return, a Size2D value</param>
+        public bool Get(Size2D vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_5(swigCPtr, Size2D.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a Size2D value.
+        /// </summary>
+        /// <param name="vectorValue"> On return, a Size2D value</param>
+        public bool Get(Size vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Size.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a Position2D value.
+        /// </summary>
+        /// <param name="vectorValue"> On return, a Position2D value</param>
+        public bool Get(Position2D vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_5(swigCPtr, Position2D.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a Position value.
+        /// </summary>
+        /// <param name="vectorValue"> On return, a Position value</param>
+        public bool Get(Position vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Position.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a Color value.
+        /// </summary>
+        /// <param name="vectorValue"> On return, a Color value</param>
+        public bool Get(Color vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_7(swigCPtr, Color.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public PropertyValue() : this(NDalicPINVOKE.new_Property_Value__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a boolean property value.
+        /// </summary>
+        /// <param name="boolValue">A boolean value</param>
+        public PropertyValue(bool boolValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_1(boolValue), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates an integer property value.
+        /// </summary>
+        /// <param name="integerValue">An integer value</param>
+        public PropertyValue(int integerValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_2(integerValue), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a float property value.
+        /// </summary>
+        /// <param name="floatValue">A floating-point value</param>
+        public PropertyValue(float floatValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_3(floatValue), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Vector2 property value.
+        /// </summary>
+        /// <param name="vectorValue">A vector of 2 floating-point values</param>
+        public PropertyValue(Vector2 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_4(Vector2.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Vector3 property value.
+        /// </summary>
+        /// <param name="vectorValue">A vector of 3 floating-point values</param>
+        public PropertyValue(Vector3 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Vector3.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Vector4 property value.
+        /// </summary>
+        /// <param name="vectorValue">A vector of 4 floating-point values</param>
+        public PropertyValue(Vector4 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Vector4.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PropertyValue(Matrix3 matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_7(Matrix3.getCPtr(matrixValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PropertyValue(Matrix matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_8(Matrix.getCPtr(matrixValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Rectangle property value.
+        /// </summary>
+        /// <param name="vectorValue">A Rectangle values</param>
+        public PropertyValue(Rectangle vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_9(Rectangle.getCPtr(vectorValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PropertyValue(AngleAxis angleAxis) : this(NDalicPINVOKE.new_Property_Value__SWIG_10(AngleAxis.getCPtr(angleAxis)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a Rotation property value.
+        /// </summary>
+        /// <param name="quaternion">A Rotation values</param>
+        public PropertyValue(Rotation quaternion) : this(NDalicPINVOKE.new_Property_Value__SWIG_11(Rotation.getCPtr(quaternion)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a string property value.
+        /// </summary>
+        /// <param name="stringValue">A string</param>
+        public PropertyValue(string stringValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_12(stringValue), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates an array property value.
+        /// </summary>
+        /// <param name="arrayValue">An array</param>
+        public PropertyValue(PropertyArray arrayValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_14(PropertyArray.getCPtr(arrayValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a map property value.
+        /// </summary>
+        /// <param name="mapValue">An array</param>
+        public PropertyValue(PropertyMap mapValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_15(PropertyMap.getCPtr(mapValue)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a PropertyType value.
+        /// </summary>
+        /// <param name="type">A PropertyType values</param>
+        public PropertyValue(PropertyType type) : this(NDalicPINVOKE.new_Property_Value__SWIG_16((int)type), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates a PropertyValue value.
+        /// </summary>
+        /// <param name="value">A PropertyValue values</param>
+        public PropertyValue(PropertyValue value) : this(NDalicPINVOKE.new_Property_Value__SWIG_17(PropertyValue.getCPtr(value)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Copy the value.
+        /// </summary>
+        /// <param name="value">The value to copy from</param>
+        /// <returns>The copied value</returns>
+        internal PropertyValue Assign(PropertyValue value)
+        {
+            PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Value_Assign(swigCPtr, PropertyValue.getCPtr(value)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Queries the type of this property value.
+        /// </summary>
+        /// <returns>The type ID</returns>
+        public PropertyType GetType()
+        {
+            PropertyType ret = (PropertyType)NDalicPINVOKE.Property_Value_GetType(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a boolean value.
+        /// </summary>
+        /// <param name="boolValue">On return, a boolean value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(ref bool boolValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, ref boolValue);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a floating-point value.
+        /// </summary>
+        /// <param name="floatValue">On return, a floating-point value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(ref float floatValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, ref floatValue);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a integer value.
+        /// </summary>
+        /// <param name="integerValue">On return, a integer value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(ref int integerValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, ref integerValue);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves an integer rectangle.
+        /// </summary>
+        /// <param name="rect">On return, an integer rectangle</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(Rectangle rect)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_4(swigCPtr, Rectangle.getCPtr(rect));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a vector value.
+        /// </summary>
+        /// <param name="vectorValue">On return, a vector value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(Vector2 vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_5(swigCPtr, Vector2.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a vector value.
+        /// </summary>
+        /// <param name="vectorValue">On return, a vector value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(Vector3 vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Vector3.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a vector value.
+        /// </summary>
+        /// <param name="vectorValue">On return, a vector value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(Vector4 vectorValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_7(swigCPtr, Vector4.getCPtr(vectorValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool Get(Matrix3 matrixValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_8(swigCPtr, Matrix3.getCPtr(matrixValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool Get(Matrix matrixValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_9(swigCPtr, Matrix.getCPtr(matrixValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool Get(AngleAxis angleAxisValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_10(swigCPtr, AngleAxis.getCPtr(angleAxisValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a Rotation value.
+        /// </summary>
+        /// <param name="quaternionValue">On return, a Rotation value</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(Rotation quaternionValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_11(swigCPtr, Rotation.getCPtr(quaternionValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves a string property value.
+        /// </summary>
+        /// <param name="stringValue">On return, a string</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(out string stringValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_12(swigCPtr, out stringValue);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves an array property value.
+        /// </summary>
+        /// <param name="arrayValue">On return, the array as a vector Property Values</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(PropertyArray arrayValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_13(swigCPtr, PropertyArray.getCPtr(arrayValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves an map property value.
+        /// </summary>
+        /// <param name="mapValue">On return, the map as vector of string and Property Value pairs</param>
+        /// <returns>Returns true if the value is successfully retrieved, false if the type is not convertible</returns>
+        public bool Get(PropertyMap mapValue)
+        {
+            bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_14(swigCPtr, PropertyMap.getCPtr(mapValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the Array API of the Property::Value without copying the contents of the map.
+        /// </summary>
+        /// <returns>The Array API of the Property::Value or NULL if not a Property::Array</returns>
+        public PropertyArray GetArray()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetArray(swigCPtr);
+            PropertyArray ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyArray(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the Map API of the Property::Value without copying the contents of the map.
+        /// </summary>
+        /// <returns>The Map API of the Property::Value or NULL if not a Property::Map</returns>
+        public PropertyMap GetMap()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetMap(swigCPtr);
+            PropertyMap ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyMap(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
     }
-  
-    public Property.Map GetMap() {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetMap(swigCPtr);
-      Property.Map ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Map(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
+
+    public enum PropertyType
+    {
+        None,
+        Boolean,
+        Float,
+        Integer,
+        Vector2,
+        Vector3,
+        Vector4,
+        Matrix3,
+        Matrix,
+        Rectangle,
+        Rotation,
+        String,
+        Array,
+        Map
     }
-  
-  }
-
-  public enum Type {
-    NONE,
-    BOOLEAN,
-    FLOAT,
-    INTEGER,
-    VECTOR2,
-    VECTOR3,
-    VECTOR4,
-    MATRIX3,
-    MATRIX,
-    RECTANGLE,
-    ROTATION,
-    STRING,
-    ARRAY,
-    MAP
-  }
-
-  public enum AccessMode {
-    READ_ONLY,
-    READ_WRITE,
-    ANIMATABLE,
-    ACCESS_MODE_COUNT
-  }
 
-}
+    public enum PropertyAccessMode
+    {
+        ReadOnly,
+        ReadWrite,
+        Animatable,
+        AccessModeCount
+    }
 
 }
index b919ee7..db22d2a 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class PropertyBuffer : BaseHandle {
+    internal class PropertyBuffer : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyBuffer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -61,7 +61,7 @@ public class PropertyBuffer : BaseHandle {
   }
 
 
-  public PropertyBuffer (Property.Map bufferFormat) : this (NDalicPINVOKE.PropertyBuffer_New(Property.Map.getCPtr(bufferFormat)), true) {
+  public PropertyBuffer (PropertyMap bufferFormat) : this (NDalicPINVOKE.PropertyBuffer_New(PropertyMap.getCPtr(bufferFormat)), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
   }
index aa833ba..8550627 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PropertyCondition : BaseHandle {
+    internal class PropertyCondition : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyCondition(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyCondition_SWIGUpcast(cPtr), cMemoryOwn) {
index 44b77f3..434e20c 100755 (executable)
@@ -14,7 +14,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class PropertyNotification : BaseHandle {
+    internal class PropertyNotification : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal PropertyNotification(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyNotification_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -131,7 +131,7 @@ public class NotifyEventArgs : EventArgs
 
   public static PropertyNotification GetPropertyNotificationFromPtr(global::System.IntPtr cPtr) {
     PropertyNotification ret = new PropertyNotification(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
index d64feb8..7c3db97 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PropertyNotifySignal : global::System.IDisposable {
+    internal class PropertyNotifySignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index d3e51f5..7560286 100755 (executable)
-using System;
+#define DOT_NET_CORE
+
+using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
-
-#if true
+#if (DOT_NET_CORE)
 using System.Reflection;
 #endif
 
 namespace Tizen.NUI
 {
-  /// <summary>
-  /// Helper class for calculating what property indexes should be assigned to C# View (view) classes.
-  /// </summary>
-  public class PropertyRangeManager
+    /// <summary>
+    /// Helper class for calculating what property indexes should be assigned to C# View (view) classes.
+    /// </summary>
+    internal class PropertyRangeManager
   {
     private Dictionary<String, PropertyRange > _propertyRange;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Tizen.NUI.PropertyRangeManager"/> class.
-    /// </summary>
-    public PropertyRangeManager ()
-    {
-      _propertyRange = new Dictionary<String, PropertyRange > ();
-    }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Tizen.NUI.PropertyRangeManager"/> class.
+        /// </summary>
+        public PropertyRangeManager()
+        {
+            _propertyRange = new Dictionary<String, PropertyRange>();
+        }
 
-    /// <summary>
-    /// Only called if a View has scriptable properties
-    /// </summary>
-    private PropertyRange RegisterView( string viewName, System.Type viewType )
-    {
-      PropertyRange range;
+        /// <summary>
+        /// Only called if a View has scriptable properties
+        /// </summary>
+        private PropertyRange RegisterView(string viewName, System.Type viewType)
+        {
+            PropertyRange range;
 
-      if ( _propertyRange.TryGetValue (viewName, out range) )
-      {
-        // already registered
-        return range;
-      }
+            if (_propertyRange.TryGetValue(viewName, out range))
+            {
+                // already registered
+                return range;
+            }
 
-      // Find out the event and animatable start indexes for the type
-      range = new PropertyRange();
+            // Find out the event and animatable start indexes for the type
+            range = new PropertyRange();
 
-      GetPropertyStartRange( viewType, ref range);
+            GetPropertyStartRange(viewType, ref range);
 
-      // add it to our dictionary
-      _propertyRange.Add( viewName, range );
+            // add it to our dictionary
+            _propertyRange.Add(viewName, range);
 
-      return range;
+            return range;
 
-     }
+        }
 
-    /// <summary>
-    /// Gets the index of the property.
-    /// Each property has to have unique index for this view type
-    /// </summary>
-    /// <returns>The property index.</returns>
-    /// <param name="viewName">View name</param>
-    /// <param name="viewType">View type</param>
-    /// <param name="type">Type.</param>
-    public int GetPropertyIndex( string viewName, System.Type viewType, ScriptableProperty.ScriptableType type )
-    {
+        /// <summary>
+        /// Gets the index of the property.
+        /// Each property has to have unique index for this view type
+        /// </summary>
+        /// <returns>The property index.</returns>
+        /// <param name="viewName">View name</param>
+        /// <param name="viewType">View type</param>
+        /// <param name="type">Type.</param>
+        public int GetPropertyIndex(string viewName, System.Type viewType, ScriptableProperty.ScriptableType type)
+        {
 
-      PropertyRange range;
+            PropertyRange range;
 
-      if (!  _propertyRange.TryGetValue (viewName, out range) )
-      {
-         // view not found, register it now
-          range = RegisterView( viewName, viewType);
-      }
+            if (!_propertyRange.TryGetValue(viewName, out range))
+            {
+                // view not found, register it now
+                range = RegisterView(viewName, viewType);
+            }
 
-      int index =  range.GetNextFreePropertyIndex ( type );
+            int index = range.GetNextFreePropertyIndex(type);
 
-      // update the dictionary
-      _propertyRange[viewName]=range;
+            // update the dictionary
+            _propertyRange[viewName] = range;
 
-      return index;
+            return index;
 
-    }
+        }
 
-    ///<summary>
-    /// We calculate the start property indices, based on the type and it's class  heirachy, e.g. DateView (70,000)- > Spin (60,000) -> View (50,000)
-    /// </summary>
-    private void GetPropertyStartRange( System.Type viewType, ref PropertyRange range )
-    {
-      const int maxCountPerDerivation = 1000; // For child and animtable properties we use a gap of 1000 between each
-      // views property range in the heirachy
-
-      // custom views start there property index, at view_PROPERTY_END_INDEX
-      // we add 1000, just incase View class (our C# custom view base) starts using scriptable properties
-      int startEventPropertyIndex = (int)View.PropertyRange.CONTROL_PROPERTY_END_INDEX+maxCountPerDerivation;
-
-      // for animatable properties current range starts at ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
-      // we add 1000, just incase View class starts using animatable properties
-      int startAnimatablePropertyIndex = (int)Tizen.NUI.PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX +maxCountPerDerivation;\r
-\r
-#if true
-            while (viewType.GetTypeInfo().BaseType.Name != "CustomView")   // custom view is our C# view base class. we don't go any deeper.\r
-            {\r
-                // for every base class increase property start index\r
-                startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000\r
-                startAnimatablePropertyIndex += maxCountPerDerivation;\r
-\r
-                Tizen.Log.Debug("NUI-APP", "getStartPropertyIndex =  " + viewType.Name + "current index " + startEventPropertyIndex);\r
-                viewType = viewType.GetTypeInfo().BaseType;\r
-            }\r
+        ///<summary>
+        /// We calculate the start property indices, based on the type and it's class  heirachy, e.g. DateView (70,000)- > Spin (60,000) -> View (50,000)
+        /// </summary>
+        private void GetPropertyStartRange(System.Type viewType, ref PropertyRange range)
+        {
+            const int maxCountPerDerivation = 1000; // For child and animtable properties we use a gap of 1000 between each
+                                                    // views property range in the heirachy
+
+            // custom views start there property index, at view_PROPERTY_END_INDEX
+            // we add 1000, just incase View class (our C# custom view base) starts using scriptable properties
+            int startEventPropertyIndex = (int)View.PropertyRange.CONTROL_PROPERTY_END_INDEX + maxCountPerDerivation;
+
+            // for animatable properties current range starts at ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
+            // we add 1000, just incase View class starts using animatable properties
+            int startAnimatablePropertyIndex = (int)Tizen.NUI.PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + maxCountPerDerivation;
+
+#if (DOT_NET_CORE)
+            while ( viewType.GetTypeInfo().BaseType.Name != "CustomView" )   // custom view is our C# view base class. we don't go any deeper.
 #else
-      //original
-      while ( viewType.BaseType.Name != "CustomView" )   // custom view is our C# view base class. we don't go any deeper.
-      {
-        // for every base class increase property start index
-        startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000
-        startAnimatablePropertyIndex += maxCountPerDerivation;
-
-        ////Console.WriteLine ("getStartPropertyIndex =  " + viewType.Name +"current index " + startEventPropertyIndex);
-        viewType = viewType.BaseType;
-      }
+            while (viewType.BaseType.Name != "CustomView")   // custom view is our C# view base class. we don't go any deeper.
 #endif
-\r
+            {
+                // for every base class increase property start index
+                startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000
+                startAnimatablePropertyIndex += maxCountPerDerivation;
+
+                //Console.WriteLine ("getStartPropertyIndex =  " + viewType.Name +"current index " + startEventPropertyIndex);
+#if (DOT_NET_CORE)
+                viewType = viewType.GetTypeInfo().BaseType;
+#else
+                viewType = viewType.BaseType;
+#endif
+            }
+
             range.startEventIndex = startEventPropertyIndex;
-      range.lastUsedEventIndex = startEventPropertyIndex;
+            range.lastUsedEventIndex = startEventPropertyIndex;
 
-      range.startAnimationIndex = startAnimatablePropertyIndex;
-      range.lastUsedAnimationIndex = startAnimatablePropertyIndex;
-
-    }
+            range.startAnimationIndex = startAnimatablePropertyIndex;
+            range.lastUsedAnimationIndex = startAnimatablePropertyIndex;
 
+        }
 
-    public struct PropertyRange
-    {
 
-      public int GetNextFreePropertyIndex( ScriptableProperty.ScriptableType type)
-      {
-        if ( type == ScriptableProperty.ScriptableType.Default )
-        {
-           lastUsedEventIndex++;
-           return lastUsedEventIndex;
-        }
-        else
+        public struct PropertyRange
         {
-          lastUsedAnimationIndex++;
-          return lastUsedAnimationIndex ;
-        }
-      }
 
+            public int GetNextFreePropertyIndex(ScriptableProperty.ScriptableType type)
+            {
+                if (type == ScriptableProperty.ScriptableType.Default)
+                {
+                    lastUsedEventIndex++;
+                    return lastUsedEventIndex;
+                }
+                else
+                {
+                    lastUsedAnimationIndex++;
+                    return lastUsedAnimationIndex;
+                }
+            }
 
-      public int startEventIndex;    /// start of the property range
-      public int lastUsedEventIndex;    /// last used of the property index
 
-      public int startAnimationIndex;  /// start of the property range
-      public int lastUsedAnimationIndex; /// last used of the property index
-    };
+            public int startEventIndex;    /// start of the property range
+            public int lastUsedEventIndex;    /// last used of the property index
 
+            public int startAnimationIndex;  /// start of the property range
+            public int lastUsedAnimationIndex; /// last used of the property index
+        };
 
 
-}
+
+    }
 }
index 455cc5a..b9409af 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum PropertyRanges {
+    internal enum PropertyRanges {
   DEFAULT_OBJECT_PROPERTY_START_INDEX = 0,
   DEFAULT_ACTOR_PROPERTY_START_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX,
   DEFAULT_ACTOR_PROPERTY_MAX_COUNT = 10000,
index aa07b7d..43f824d 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class PropertyRegistration : global::System.IDisposable {
+    internal class PropertyRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -40,7 +40,7 @@ public class PropertyRegistration : global::System.IDisposable {
     }
   }
 
-  public PropertyRegistration(TypeRegistration registered, string name, int index, Property.Type type, SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void setFunc, SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value getFunc) : this(NDalicPINVOKE.new_PropertyRegistration(TypeRegistration.getCPtr(registered), name, index, (int)type, SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.getCPtr(setFunc), SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.getCPtr(getFunc)), true) {
+  public PropertyRegistration(TypeRegistration registered, string name, int index, PropertyType type, SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void setFunc, SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value getFunc) : this(NDalicPINVOKE.new_PropertyRegistration(TypeRegistration.getCPtr(registered), name, index, (int)type, SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.getCPtr(setFunc), SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.getCPtr(getFunc)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 34c1c80..ca01c05 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class PushButton : Button {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// A PushButton changes its appearance when is pressed and returns to its original when is released.
+    /// </summary>
+    public class PushButton : Button
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~PushButton() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~PushButton()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_PushButton(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_PushButton(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();
-    }
-  }
 
 
-  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_PushButton_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_PushButton_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get();
-    public static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get();
-    public static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get();
-    public static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get();
-    public static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get();
-  
-  }
-
-  public PushButton () : this (NDalicPINVOKE.PushButton_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PushButton Assign(PushButton pushButton) {
-    PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static PushButton DownCast(BaseHandle handle) {
-    PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new void SetButtonImage(Image image) {
-    NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetButtonImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public new void SetSelectedImage(Image image) {
-    NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSelectedImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetSelectedBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetDisabledBackgroundImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetDisabledImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetDisabledSelectedImage(Actor image) {
-    NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, Actor.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public string UnselectedIcon
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.UNSELECTED_ICON).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string SelectedIcon
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.SELECTED_ICON).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.SELECTED_ICON, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string IconAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.ICON_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string LabelPadding
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.LABEL_PADDING).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.LABEL_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string IconPadding
-  {
-    get
-    {
-      string temp;
-      GetProperty( PushButton.Property.ICON_PADDING).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( PushButton.Property.ICON_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
 
-}
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_PushButton_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_PushButton_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get();
+            internal static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get();
+            internal static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get();
+            internal static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get();
+            internal static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get();
+
+        }
+
+        /// <summary>
+        /// Creates the PushButton.
+        /// </summary>
+        public PushButton() : this(NDalicPINVOKE.PushButton_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal PushButton Assign(PushButton pushButton)
+        {
+            PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to PushButton handle.
+        /// If handle points to a PushButton, the downcast produces valid handle.
+        /// If not the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>handle to a PushButton or an uninitialized handle</returns>
+        public new static PushButton DownCast(BaseHandle handle)
+        {
+            PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal new void SetButtonImage(Image image)
+        {
+            NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetButtonImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetBackgroundImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal new void SetSelectedImage(Image image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSelectedImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetSelectedBackgroundImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledBackgroundImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetDisabledSelectedImage(Actor image)
+        {
+            NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, Actor.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Sets the unselected button image.
+        /// </summary>
+        public string UnselectedIcon
+        {
+            set
+            {
+                SetProperty(PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the selected button image.
+        /// </summary>
+        public string SelectedIcon
+        {
+            set
+            {
+                SetProperty(PushButton.Property.SELECTED_ICON, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the icon alignment.
+        /// </summary>
+        public string IconAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(PushButton.Property.ICON_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// Sets the label padding value.
+        /// </summary>
+        public Vector4 LabelPadding
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(PushButton.Property.LABEL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PushButton.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Sets the icon padding value.
+        /// </summary>
+        public string IconPadding
+        {
+            get
+            {
+                string temp;
+                GetProperty(PushButton.Property.ICON_PADDING).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(PushButton.Property.ICON_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
diff --git a/src/Tizen.NUI/devel-src/Quaternion.cs b/src/Tizen.NUI/devel-src/Quaternion.cs
deleted file mode 100755 (executable)
index a11767e..0000000
+++ /dev/null
@@ -1,349 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public class Quaternion : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
-
-  internal Quaternion(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Quaternion obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~Quaternion() {
-    DisposeQueue.Instance.Add(this);
-  }
-
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
-
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Quaternion(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public static Quaternion operator+(Quaternion arg1, Quaternion arg2) {
-    return arg1.Add(arg2);
-  }
-
-  public static Quaternion operator-(Quaternion arg1, Quaternion arg2) {
-    return arg1.Subtract(arg2);
-  }
-
-  public static Quaternion operator-(Quaternion arg1) {
-    return arg1.Subtract();
-  }
-
-  public static Quaternion operator*(Quaternion arg1, Quaternion arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Vector3 operator*(Quaternion arg1, Vector3 arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Quaternion operator*(Quaternion arg1, float arg2) {
-    return arg1.Multiply(arg2);
-  }
-
-  public static Quaternion operator/(Quaternion arg1, Quaternion arg2) {
-    return arg1.Divide(arg2);
-  }
-
-  public static Quaternion operator/(Quaternion arg1, float arg2) {
-    return arg1.Divide(arg2);
-  }
-
-  public Quaternion() : this(NDalicPINVOKE.new_Quaternion__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(float cosThetaBy2, float iBySineTheta, float jBySineTheta, float kBySineTheta) : this(NDalicPINVOKE.new_Quaternion__SWIG_1(cosThetaBy2, iBySineTheta, jBySineTheta, kBySineTheta), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector4 vector) : this(NDalicPINVOKE.new_Quaternion__SWIG_2(Vector4.getCPtr(vector)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Radian angle, Vector3 axis) : this(NDalicPINVOKE.new_Quaternion__SWIG_3(Radian.getCPtr(angle), Vector3.getCPtr(axis)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Radian pitch, Radian yaw, Radian roll) : this(NDalicPINVOKE.new_Quaternion__SWIG_4(Radian.getCPtr(pitch), Radian.getCPtr(yaw), Radian.getCPtr(roll)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Matrix matrix) : this(NDalicPINVOKE.new_Quaternion__SWIG_5(Matrix.getCPtr(matrix)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) : this(NDalicPINVOKE.new_Quaternion__SWIG_6(Vector3.getCPtr(xAxis), Vector3.getCPtr(yAxis), Vector3.getCPtr(zAxis)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion(Vector3 v0, Vector3 v1) : this(NDalicPINVOKE.new_Quaternion__SWIG_7(Vector3.getCPtr(v0), Vector3.getCPtr(v1)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Quaternion IDENTITY {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Quaternion_IDENTITY_get();
-      Quaternion ret = (cPtr == global::System.IntPtr.Zero) ? null : new Quaternion(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public bool IsIdentity() {
-    bool ret = NDalicPINVOKE.Quaternion_IsIdentity(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool ToAxisAngle(Vector3 axis, Radian angle) {
-    bool ret = NDalicPINVOKE.Quaternion_ToAxisAngle(swigCPtr, Vector3.getCPtr(axis), Radian.getCPtr(angle));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 AsVector() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_AsVector(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetEuler(Radian pitch, Radian yaw, Radian roll) {
-    NDalicPINVOKE.Quaternion_SetEuler(swigCPtr, Radian.getCPtr(pitch), Radian.getCPtr(yaw), Radian.getCPtr(roll));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 EulerAngles() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_EulerAngles(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Add(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Add(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Subtract(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Subtract__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Multiply(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Multiply__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Multiply(Vector3 other) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Quaternion_Multiply__SWIG_1(swigCPtr, Vector3.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Divide(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Divide__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Multiply(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Multiply__SWIG_2(swigCPtr, scale), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Divide(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Divide__SWIG_1(swigCPtr, scale), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Subtract() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Subtract__SWIG_1(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion AddAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_AddAssign(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion SubtractAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_SubtractAssign(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion MultiplyAssign(Quaternion other) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_MultiplyAssign__SWIG_0(swigCPtr, Quaternion.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion MultiplyAssign(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_MultiplyAssign__SWIG_1(swigCPtr, scale), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion DivideAssign(float scale) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_DivideAssign(swigCPtr, scale), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EqualTo(Quaternion rhs) {
-    bool ret = NDalicPINVOKE.Quaternion_EqualTo(swigCPtr, Quaternion.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool NotEqualTo(Quaternion rhs) {
-    bool ret = NDalicPINVOKE.Quaternion_NotEqualTo(swigCPtr, Quaternion.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Length() {
-    float ret = NDalicPINVOKE.Quaternion_Length(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float LengthSquared() {
-    float ret = NDalicPINVOKE.Quaternion_LengthSquared(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Normalize() {
-    NDalicPINVOKE.Quaternion_Normalize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion Normalized() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Normalized(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Conjugate() {
-    NDalicPINVOKE.Quaternion_Conjugate(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Invert() {
-    NDalicPINVOKE.Quaternion_Invert(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Quaternion Log() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Log(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Quaternion Exp() {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Exp(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static float Dot(Quaternion q1, Quaternion q2) {
-    float ret = NDalicPINVOKE.Quaternion_Dot(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Lerp(Quaternion q1, Quaternion q2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Lerp(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Slerp(Quaternion q1, Quaternion q2, float progress) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Slerp(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), progress), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion SlerpNoInvert(Quaternion q1, Quaternion q2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_SlerpNoInvert(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Quaternion Squad(Quaternion start, Quaternion end, Quaternion ctrl1, Quaternion ctrl2, float t) {
-    Quaternion ret = new Quaternion(NDalicPINVOKE.Quaternion_Squad(Quaternion.getCPtr(start), Quaternion.getCPtr(end), Quaternion.getCPtr(ctrl1), Quaternion.getCPtr(ctrl2), t), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static float AngleBetween(Quaternion q1, Quaternion q2) {
-    float ret = NDalicPINVOKE.Quaternion_AngleBetween(Quaternion.getCPtr(q1), Quaternion.getCPtr(q2));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Rotate(Vector4 vector) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Quaternion_Rotate__SWIG_0(swigCPtr, Vector4.getCPtr(vector)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Rotate(Vector3 vector) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Quaternion_Rotate__SWIG_1(swigCPtr, Vector3.getCPtr(vector)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 mVector {
-    set {
-      NDalicPINVOKE.Quaternion_mVector_set(swigCPtr, Vector4.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Quaternion_mVector_get(swigCPtr);
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-}
-
-}
index 683b611..4282a39 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// An angle in radians.
+    /// </summary>
+    public class Radian : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Radian(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class Radian : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Radian obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal Radian(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~Radian()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Radian obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        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_Radian(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-  ~Radian() {
-    DisposeQueue.Instance.Add(this);
-  }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Default constructor, initializes to 0.
+        /// </summary>
+        public Radian() : this(NDalicPINVOKE.new_Radian__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Radian(swigCPtr);
+        /// <summary>
+        /// Creates an angle in radians.
+        /// </summary>
+        /// <param name="value">The initial value in radians</param>
+        public Radian(float value) : this(NDalicPINVOKE.new_Radian__SWIG_1(value), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
-
-
-  public Radian() : this(NDalicPINVOKE.new_Radian__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Radian(float value) : this(NDalicPINVOKE.new_Radian__SWIG_1(value), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Radian(Degree degree) : this(NDalicPINVOKE.new_Radian__SWIG_2(Degree.getCPtr(degree)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Radian Assign(float value) {
-    Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_0(swigCPtr, value), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Radian Assign(Degree degree) {
-    Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_1(swigCPtr, Degree.getCPtr(degree)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float ConvertToFloat() {
-    float ret = NDalicPINVOKE.Radian_ConvertToFloat(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float radian {
-    set {
-      NDalicPINVOKE.Radian_radian_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Radian_radian_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
 
-}
+        /// <summary>
+        /// Creates an angle in radians from an angle in degrees.
+        /// </summary>
+        /// <param name="degree">The initial value in degrees</param>
+        public Radian(Degree degree) : this(NDalicPINVOKE.new_Radian__SWIG_2(Degree.getCPtr(degree)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Assigns an angle from a float value.
+        /// </summary>
+        /// <param name="value">Float value in radians</param>
+        /// <returns>A reference to this</returns>
+        internal Radian Assign(float value)
+        {
+            Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_0(swigCPtr, value), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Assigns an angle from a Degree value.
+        /// </summary>
+        /// <param name="degree">The value in degrees</param>
+        /// <returns>A reference to this</returns>
+        internal Radian Assign(Degree degree)
+        {
+            Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_1(swigCPtr, Degree.getCPtr(degree)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Conversion to float.
+        /// </summary>
+        /// <returns>The float value of this Radian</returns>
+        public float ConvertToFloat()
+        {
+            float ret = NDalicPINVOKE.Radian_ConvertToFloat(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// The value in radians
+        /// </summary>
+        public float radian
+        {
+            set
+            {
+                NDalicPINVOKE.Radian_radian_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Radian_radian_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 54153a2..48527dc 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class RadioButton : Button {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// A RadioButton provides a radio button which two states \e selected or \e unselected.
+    /// Radio buttons are designed to select one of many option at the same time.
+    /// RadioButton can change its current state using Selected.
+    /// 
+    /// RadioButtons can be grouped.
+    /// Two or more RadioButtons are in one group when they have this same parent.
+    /// In each groups only one RadioButton can be \e selected at a given time.
+    /// So when RadioButton is set to \e selected, other RadioButtons in its group are set to \e unselected.
+    /// When \e selected RadioButton is set to \e unselected no other RadioButtons in his group is set to \e selected.
+    /// 
+    ///  A StateChanged Event is emitted when the RadioButton change its state to \e selected or \e unselected.
+    /// </summary>
+    public class RadioButton : Button
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal RadioButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RadioButton_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal RadioButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RadioButton_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RadioButton obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RadioButton obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~RadioButton() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~RadioButton()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_RadioButton(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_RadioButton(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();
-    }
-  }
 
+        /// <summary>
+        /// Creates an uninitialized RadioButton
+        /// </summary>
+        public RadioButton() : this(NDalicPINVOKE.RadioButton_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-  public RadioButton () : this (NDalicPINVOKE.RadioButton_New__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  }
-  public RadioButton (string label) : this (NDalicPINVOKE.RadioButton_New__SWIG_1(label), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        /// <summary>
+        /// Creates an uninitialized RadioButton with Label
+        /// </summary>
+        /// <param name="label">Label text</param>
+        public RadioButton(string label) : this(NDalicPINVOKE.RadioButton_New__SWIG_1(label), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-  }
-  public RadioButton(RadioButton radioButton) : this(NDalicPINVOKE.new_RadioButton__SWIG_1(RadioButton.getCPtr(radioButton)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+        }
+        internal RadioButton(RadioButton radioButton) : this(NDalicPINVOKE.new_RadioButton__SWIG_1(RadioButton.getCPtr(radioButton)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public RadioButton Assign(RadioButton radioButton) {
-    RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_Assign(swigCPtr, RadioButton.getCPtr(radioButton)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal RadioButton Assign(RadioButton radioButton)
+        {
+            RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_Assign(swigCPtr, RadioButton.getCPtr(radioButton)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public new static RadioButton DownCast(BaseHandle handle) {
-    RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Downcasts a handle to RadioButton handle.
+        /// If handle points to a RadioButton, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>A handle to a RadioButton or an uninitialized handle</returns>
+        public new static RadioButton DownCast(BaseHandle handle)
+        {
+            RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+    }
 
 }
index f4aa817..dada221 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Rectangle : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// Rectangle class
+    /// </summary>
+    public class Rectangle : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Rectangle(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Rectangle(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Rectangle obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Rectangle obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Rectangle() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Rectangle()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Rectangle(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Rectangle(swigCPtr);
+        /// <summary>
+        /// Equality operator.
+        /// </summary>
+        /// <param name="a">First operand</param>
+        /// <param name="b">Second operand</param>
+        /// <returns>True if boxes are exactly same</returns>
+        public static bool operator ==(Rectangle a, Rectangle b)
+        {
+            // If both are null, or both are same instance, return true.
+            if (System.Object.ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
+            // If one is null, but not both, return false.
+            if (((object)a == null) || ((object)b == null))
+            {
+                return false;
+            }
+
+            // Return true if the fields match:
+            return a.X == b.X && a.Y == b.Y && a.Width == b.Width && a.Height == b.Height;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// Inequality operator.
+        /// </summary>
+        /// <param name="a">The first rectangle</param>
+        /// <param name="b">The second rectangle</param>
+        /// <returns>True if rectangles are not identical</returns>
+        public static bool operator !=(Rectangle a, Rectangle b)
+        {
+            return !(a == b);
+        }
 
-    public static bool operator ==(Rectangle a, Rectangle b)
-    {
-        // If both are null, or both are same instance, return true.
-        if (System.Object.ReferenceEquals(a, b))
+        /// <summary>
+        /// X position of the rectangle
+        /// </summary>
+        public int X
         {
-            return true;
+            set
+            {
+                x = value;
+            }
+            get
+            {
+                return x;
+            }
         }
 
-        // If one is null, but not both, return false.
-        if (((object)a == null) || ((object)b == null))
+        /// <summary>
+        /// Y position of the rectangle
+        /// </summary>
+        public int Y
         {
-            return false;
+            set
+            {
+                y = value;
+            }
+            get
+            {
+                return y;
+            }
         }
 
-        // Return true if the fields match:
-        return a.X == b.X && a.Y == b.Y && a.Width == b.Width && a.Height == b.Height;
-    }
+        /// <summary>
+        /// Width of the rectangle
+        /// </summary>
+        public int Width
+        {
+            set
+            {
+                width = value;
+            }
+            get
+            {
+                return width;
+            }
+        }
 
-    public static bool operator !=(Rectangle a, Rectangle b)
-    {
-        return !(a == b);
-    }
+        /// <summary>
+        /// Height of the rectangle
+        /// </summary>
+        public int Height
+        {
+            set
+            {
+                height = value;
+            }
+            get
+            {
+                return height;
+            }
+        }
 
-    ///< X position of the rectangle
-    public int X
-    {
-        set
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public Rectangle() : this(NDalicPINVOKE.new_Rectangle__SWIG_0(), true)
         {
-            x = value;
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        get
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="x">X coordinate (or left)</param>
+        /// <param name="y">Y coordinate (or right)</param>
+        /// <param name="width">Width (or bottom)</param>
+        /// <param name="height">Height (or top)</param>
+        public Rectangle(int x, int y, int width, int height) : this(NDalicPINVOKE.new_Rectangle__SWIG_1(x, y, width, height), true)
         {
-            return x;
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-    }
 
-    ///< Y position of the rectangle
-    public int Y
-    {
-        set
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">The original object</param>
+        public Rectangle(Rectangle rhs) : this(NDalicPINVOKE.new_Rectangle__SWIG_2(Rectangle.getCPtr(rhs)), true)
         {
-            y = value;
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        get
+
+        /// <summary>
+        /// Make reference of original Rectangle object.
+        /// </summary>
+        /// <param name="rhs">The original object</param>
+        /// <returns>Reference to this</returns>
+        public Rectangle Assign(Rectangle rhs)
         {
-            return y;
+            Rectangle ret = new Rectangle(NDalicPINVOKE.Rectangle_Assign(swigCPtr, Rectangle.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-    }
 
-    ///< Width of the rectangle
-    public int Width
-    {
-        set
+        /// <summary>
+        /// Assignment from individual values.
+        /// </summary>
+        /// <param name="newX">X coordinate</param>
+        /// <param name="newY">Y coordinate</param>
+        /// <param name="newWidth">Width</param>
+        /// <param name="newHeight">Height</param>
+        public void Set(int newX, int newY, int newWidth, int newHeight)
         {
-            width = value;
+            NDalicPINVOKE.Rectangle_Set(swigCPtr, newX, newY, newWidth, newHeight);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        get
+
+        /// <summary>
+        /// Determines whether or not this Rectangle is empty.
+        /// </summary>
+        /// <returns>True if width or height are zero</returns>
+        public bool IsEmpty()
         {
-            return width;
+            bool ret = NDalicPINVOKE.Rectangle_IsEmpty(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-    }
 
-    ///< Height of the rectangle
-    public int Height
-    {
-        set
+        /// <summary>
+        /// Gets the left of the rectangle.
+        /// </summary>
+        /// <returns>The left edge of the rectangle</returns>
+        public int Left()
         {
-            height = value;
+            int ret = NDalicPINVOKE.Rectangle_Left(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        get
+
+        /// <summary>
+        /// Gets the right of the rectangle.
+        /// </summary>
+        /// <returns>The right edge of the rectangle</returns>
+        public int Right()
         {
-            return height;
+            int ret = NDalicPINVOKE.Rectangle_Right(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-    }
 
-  public Rectangle() : this(NDalicPINVOKE.new_Rectangle__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Rectangle(int x, int y, int width, int height) : this(NDalicPINVOKE.new_Rectangle__SWIG_1(x, y, width, height), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Rectangle(Rectangle rhs) : this(NDalicPINVOKE.new_Rectangle__SWIG_2(Rectangle.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Rectangle Assign(Rectangle rhs) {
-    Rectangle ret = new Rectangle(NDalicPINVOKE.Rectangle_Assign(swigCPtr, Rectangle.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Set(int newX, int newY, int newWidth, int newHeight) {
-    NDalicPINVOKE.Rectangle_Set(swigCPtr, newX, newY, newWidth, newHeight);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsEmpty() {
-    bool ret = NDalicPINVOKE.Rectangle_IsEmpty(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Left() {
-    int ret = NDalicPINVOKE.Rectangle_Left(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Right() {
-    int ret = NDalicPINVOKE.Rectangle_Right(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Top() {
-    int ret = NDalicPINVOKE.Rectangle_Top(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Bottom() {
-    int ret = NDalicPINVOKE.Rectangle_Bottom(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int Area() {
-    int ret = NDalicPINVOKE.Rectangle_Area(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Intersects(Rectangle other) {
-    bool ret = NDalicPINVOKE.Rectangle_Intersects(swigCPtr, Rectangle.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool Contains(Rectangle other) {
-    bool ret = NDalicPINVOKE.Rectangle_Contains(swigCPtr, Rectangle.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private int x {
-    set {
-      NDalicPINVOKE.Rectangle_x_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_x_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int left {
-    set {
-      NDalicPINVOKE.Rectangle_left_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_left_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int y {
-    set {
-      NDalicPINVOKE.Rectangle_y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int right {
-    set {
-      NDalicPINVOKE.Rectangle_right_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_right_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int width {
-    set {
-      NDalicPINVOKE.Rectangle_width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int bottom {
-    set {
-      NDalicPINVOKE.Rectangle_bottom_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_bottom_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int height {
-    set {
-      NDalicPINVOKE.Rectangle_height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int top {
-    set {
-      NDalicPINVOKE.Rectangle_top_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Rectangle_top_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Gets the top of the rectangle.
+        /// </summary>
+        /// <returns>The top of the rectangle</returns>
+        public int Top()
+        {
+            int ret = NDalicPINVOKE.Rectangle_Top(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        /// <summary>
+        /// Gets the bottom of the rectangle.
+        /// </summary>
+        /// <returns>The bottom of the rectangle</returns>
+        public int Bottom()
+        {
+            int ret = NDalicPINVOKE.Rectangle_Bottom(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets the area of the rectangle.
+        /// </summary>
+        /// <returns>The area of the rectangle</returns>
+        public int Area()
+        {
+            int ret = NDalicPINVOKE.Rectangle_Area(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Determines whether or not this rectangle and the specified rectangle intersect.
+        /// </summary>
+        /// <param name="other">The other rectangle to test against this rectangle</param>
+        /// <returns>True if the rectangles intersect</returns>
+        public bool Intersects(Rectangle other)
+        {
+            bool ret = NDalicPINVOKE.Rectangle_Intersects(swigCPtr, Rectangle.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Determines whether or not this Rectangle contains the specified rectangle.
+        /// </summary>
+        /// <param name="other">The other rectangle to test against this rectangle</param>
+        /// <returns>True if the specified rectangle is contained</returns>
+        public bool Contains(Rectangle other)
+        {
+            bool ret = NDalicPINVOKE.Rectangle_Contains(swigCPtr, Rectangle.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private int x
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_x_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_x_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int left
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_left_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_left_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int y
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int right
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_right_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_right_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int width
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_width_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_width_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int bottom
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_bottom_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_bottom_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int height
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_height_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_height_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int top
+        {
+            set
+            {
+                NDalicPINVOKE.Rectangle_top_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Rectangle_top_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 4fb2602..1f3e97a 100755 (executable)
@@ -38,7 +38,7 @@ public class RefObject : global::System.IDisposable {
 
  public static RefObject GetRefObjectFromPtr(global::System.IntPtr cPtr) {
     RefObject ret = new RefObject(cPtr, false);
-       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
index 80b5568..379a50e 100755 (executable)
@@ -1,56 +1,86 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
+// Copyright (c) 2017 Samsung Electronics Co., Ltd.
 //
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// 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
 //
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts
+// Some have been manually changed
 
-public class RelayoutContainer : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
 
-  internal RelayoutContainer(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+namespace Tizen.NUI
+{
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RelayoutContainer obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+    /// <summary>
+    /// Interface to encapsulate information required for relayout.
+    /// </summary>
+    public class RelayoutContainer : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  ~RelayoutContainer() {
-    DisposeQueue.Instance.Add(this);
-  }
+        internal RelayoutContainer(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(RelayoutContainer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_RelayoutContainer(swigCPtr);
+        ~RelayoutContainer()
+        {
+            DisposeQueue.Instance.Add(this);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// To make RelayoutContainer instance be disposed.
+        /// </summary>
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-  public virtual void Add(Actor actor, Vector2 size) {
-    NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, Actor.getCPtr(actor), Vector2.getCPtr(size));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_RelayoutContainer(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-}
+        /// <summary>
+        /// Adds relayout information to the container if it doesn't already exist.
+        /// </summary>
+        /// <param name="actor">The actor to relayout</param>
+        /// <param name="size">The size to relayout</param>
+        public virtual void Add(Actor actor, Size2D size)
+        {
+            NDalicPINVOKE.RelayoutContainer_Add(swigCPtr, Actor.getCPtr(actor), Size2D.getCPtr(size));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+    }
 
 }
index 662ccc6..ac16c80 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum RenderBufferFormat {
+    internal enum RenderBufferFormat {
   COLOR,
   COLOR_DEPTH,
   COLOR_STENCIL,
index 418cc37..4f1115e 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum RenderModeType {
+    internal enum RenderModeType {
   NONE,
   AUTO,
   COLOR,
index 27696f0..57ffeda 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class RenderTask : Handle {
+    internal class RenderTask : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal RenderTask(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTask_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -47,7 +47,7 @@ public class RenderTask : Handle {
 
  public static RenderTask GetRenderTaskFromPtr(global::System.IntPtr cPtr) {
     RenderTask ret = new RenderTask(cPtr, false);
-       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -378,7 +378,7 @@ public class RenderTask : Handle {
     }
     set
     {
-      SetProperty( RenderTask.Property.VIEWPORT_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( RenderTask.Property.VIEWPORT_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ViewportSize
@@ -391,7 +391,7 @@ public class RenderTask : Handle {
     }
     set
     {
-      SetProperty( RenderTask.Property.VIEWPORT_SIZE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( RenderTask.Property.VIEWPORT_SIZE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector4 ClearColor
@@ -404,7 +404,7 @@ public class RenderTask : Handle {
     }
     set
     {
-      SetProperty( RenderTask.Property.CLEAR_COLOR, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( RenderTask.Property.CLEAR_COLOR, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool RequiresSync
@@ -417,7 +417,7 @@ public class RenderTask : Handle {
     }
     set
     {
-      SetProperty( RenderTask.Property.REQUIRES_SYNC, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( RenderTask.Property.REQUIRES_SYNC, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 1b761e3..9534e27 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class RenderTaskList : BaseHandle {
+    internal class RenderTaskList : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal RenderTaskList(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTaskList_SWIGUpcast(cPtr), cMemoryOwn) {
index 4e722b2..6d40996 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class RenderTaskSignal : global::System.IDisposable {
+    internal class RenderTaskSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 4ee7f22..21f8482 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Renderer : Handle {
+    internal class Renderer : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Renderer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Renderer_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -190,7 +190,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_INDEX, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.DEPTH_INDEX, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int FaceCullingMode
@@ -203,7 +203,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.FACE_CULLING_MODE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.FACE_CULLING_MODE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendMode
@@ -216,7 +216,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_MODE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_MODE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendEquationRgb
@@ -229,7 +229,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_EQUATION_RGB, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_EQUATION_RGB, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendEquationAlpha
@@ -242,7 +242,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_EQUATION_ALPHA, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_EQUATION_ALPHA, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendFactorSrcRgb
@@ -255,7 +255,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_RGB, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendFactorDestRgb
@@ -268,7 +268,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_RGB, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendFactorSrcAlpha
@@ -281,7 +281,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_FACTOR_SRC_ALPHA, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int BlendFactorDestAlpha
@@ -294,7 +294,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_FACTOR_DEST_ALPHA, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector4 BlendColor
@@ -307,7 +307,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_COLOR, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_COLOR, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool BlendPreMultipliedAlpha
@@ -320,7 +320,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int IndexRangeFirst
@@ -333,7 +333,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.INDEX_RANGE_FIRST, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.INDEX_RANGE_FIRST, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int IndexRangeCount
@@ -346,7 +346,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.INDEX_RANGE_COUNT, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.INDEX_RANGE_COUNT, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int DepthWriteMode
@@ -359,7 +359,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_WRITE_MODE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.DEPTH_WRITE_MODE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int DepthFunction
@@ -372,7 +372,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_FUNCTION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.DEPTH_FUNCTION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int DepthTestMode
@@ -385,7 +385,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.DEPTH_TEST_MODE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.DEPTH_TEST_MODE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int RenderMode
@@ -398,7 +398,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.RENDER_MODE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.RENDER_MODE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilFunction
@@ -411,7 +411,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_FUNCTION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilFunctionMask
@@ -424,7 +424,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_MASK, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_FUNCTION_MASK, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilFunctionReference
@@ -437,7 +437,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_FUNCTION_REFERENCE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilMask
@@ -450,7 +450,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_MASK, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_MASK, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilOperationOnFail
@@ -463,7 +463,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_FAIL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilOperationOnZFail
@@ -476,7 +476,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int StencilOperationOnZPass
@@ -489,7 +489,7 @@ public class Renderer : Handle {
     }
     set
     {
-      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Renderer.Property.STENCIL_OPERATION_ON_Z_PASS, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 601c97d..b2c0f41 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum RenderingType {
+    internal enum RenderingType {
   RENDERING_SHARED_ATLAS,
   RENDERING_VECTOR_BASED
 }
diff --git a/src/Tizen.NUI/devel-src/ResizePolicyType.cs b/src/Tizen.NUI/devel-src/ResizePolicyType.cs
deleted file mode 100755 (executable)
index 4b45e3f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum ResizePolicyType {
-  FIXED,
-  USE_NATURAL_SIZE,
-  FILL_TO_PARENT,
-  SIZE_RELATIVE_TO_PARENT,
-  SIZE_FIXED_OFFSET_FROM_PARENT,
-  FIT_TO_CHILDREN,
-  DIMENSION_DEPENDENCY,
-  USE_ASSIGNED_SIZE
-}
-
-}
index b33bdd4..cbd881f 100755 (executable)
@@ -30,7 +30,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class ResourceImage : Image {
+internal class ResourceImage : Image {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ResourceImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ResourceImage_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -137,7 +137,7 @@ public class LoadingFinishedEventArgs : EventArgs
 
 public static ResourceImage GetResourceImageFromPtr(global::System.IntPtr cPtr) {
     ResourceImage ret = new ResourceImage(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
index f50b72e..0846019 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ResourceImageSignal : global::System.IDisposable {
+    internal class ResourceImageSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
diff --git a/src/Tizen.NUI/devel-src/Rotation.cs b/src/Tizen.NUI/devel-src/Rotation.cs
new file mode 100755 (executable)
index 0000000..b42ab5b
--- /dev/null
@@ -0,0 +1,477 @@
+//------------------------------------------------------------------------------
+// <auto-generated />
+//
+// This file was automatically generated by SWIG (http://www.swig.org).
+// Version 3.0.9
+//
+// Do not make changes to this file unless you know what you are doing--modify
+// the SWIG interface file instead.
+//------------------------------------------------------------------------------
+
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Rotation Class
+    /// </summary>
+    public class Rotation : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Rotation(global::System.IntPtr cPtr, bool cMemoryOwn)
+        {
+            swigCMemOwn = cMemoryOwn;
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Rotation obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Rotation()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Rotation(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">First Rotation</param>
+        /// <param name="arg2">Second Rotation</param>
+        /// <returns>A Rotation containing the result of the Addition</returns>
+        public static Rotation operator +(Rotation arg1, Rotation arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">First Rotation</param>
+        /// <param name="arg2">Second Rotation</param>
+        /// <returns>A Rotation containing the result of the subtract</returns>
+        public static Rotation operator -(Rotation arg1, Rotation arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary Negation operator.
+        /// </summary>
+        /// <param name="arg1">First Rotation</param>
+        /// <returns>A Rotation containing the negated result</returns>
+        public static Rotation operator -(Rotation arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Rotation</param>
+        /// <param name="arg2">Second Rotation</param>
+        /// <returns>A Rotation containing the result of the Multiplication</returns>
+        public static Rotation operator *(Rotation arg1, Rotation arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">Rotation</param>
+        /// <param name="arg2">The vector to multiply</param>
+        /// <returns>A Rotation containing the result of the multiplication</returns>
+        public static Vector3 operator *(Rotation arg1, Vector3 arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Scale operator.
+        /// </summary>
+        /// <param name="arg1">Rotation</param>
+        /// <param name="arg2">A value to scale by</param>
+        /// <returns>A Rotation containing the result of the scaling</returns>
+        public static Rotation operator *(Rotation arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Rotation</param>
+        /// <param name="arg2">Second Rotation</param>
+        /// <returns>A Rotation containing the result of the scaling</returns>
+        public static Rotation operator /(Rotation arg1, Rotation arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Scale operator.
+        /// </summary>
+        /// <param name="arg1">Rotation</param>
+        /// <param name="arg2">A value to scale by</param>
+        /// <returns>A Rotation containing the result of the scaling</returns>
+        public static Rotation operator /(Rotation arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Default Constructor.
+        /// </summary>
+        public Rotation() : this(NDalicPINVOKE.new_Rotation__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor from an axis and angle.
+        /// </summary>
+        /// <param name="angle">The angle around the axis</param>
+        /// <param name="axis">The vector of the axis</param>
+        public Rotation(Radian angle, Vector3 axis) : this(NDalicPINVOKE.new_Rotation__SWIG_1(Radian.getCPtr(angle), Vector3.getCPtr(axis)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// (0.0f,0.0f,0.0f,1.0f)
+        /// </summary>
+        public static Rotation IDENTITY
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Rotation_IDENTITY_get();
+                Rotation ret = (cPtr == global::System.IntPtr.Zero) ? null : new Rotation(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Helper to check if this is an identity quaternion.
+        /// </summary>
+        /// <returns>True if this is identity quaternion</returns>
+        public bool IsIdentity()
+        {
+            bool ret = NDalicPINVOKE.Rotation_IsIdentity(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Converts the quaternion to an axis/angle pair.
+        /// </summary>
+        /// <param name="axis">the result of axis</param>
+        /// <param name="angle">the result of angle Angle in radians</param>
+        /// <returns>True if converted correctly</returns>
+        public bool GetAxisAngle(Vector3 axis, Radian angle)
+        {
+            bool ret = NDalicPINVOKE.Rotation_GetAxisAngle(swigCPtr, Vector3.getCPtr(axis), Radian.getCPtr(angle));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Add(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Add(swigCPtr, Rotation.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Subtract(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Subtract__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Multiply(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Multiply__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Vector3 Multiply(Vector3 other)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Rotation_Multiply__SWIG_1(swigCPtr, Vector3.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Divide(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Divide__SWIG_0(swigCPtr, Rotation.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Multiply(float scale)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Multiply__SWIG_2(swigCPtr, scale), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Divide(float scale)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Divide__SWIG_1(swigCPtr, scale), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation Subtract()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation AddAssign(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_AddAssign(swigCPtr, Rotation.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation SubtractAssign(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_SubtractAssign(swigCPtr, Rotation.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation MultiplyAssign(Rotation other)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_MultiplyAssign__SWIG_0(swigCPtr, Rotation.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation MultiplyAssign(float scale)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_MultiplyAssign__SWIG_1(swigCPtr, scale), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Rotation DivideAssign(float scale)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_DivideAssign(swigCPtr, scale), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private bool EqualTo(Rotation rhs)
+        {
+            bool ret = NDalicPINVOKE.Rotation_EqualTo(swigCPtr, Rotation.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private bool NotEqualTo(Rotation rhs)
+        {
+            bool ret = NDalicPINVOKE.Rotation_NotEqualTo(swigCPtr, Rotation.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the rotation
+        /// </summary>
+        /// <returns>The length of the rotation</returns>
+        public float Length()
+        {
+            float ret = NDalicPINVOKE.Rotation_Length(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the squared length of the rotation
+        /// </summary>
+        /// <returns>The squared length of the rotation</returns>
+        public float LengthSquared()
+        {
+            float ret = NDalicPINVOKE.Rotation_LengthSquared(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Normalizes this to unit length.
+        /// </summary>
+        public void Normalize()
+        {
+            NDalicPINVOKE.Rotation_Normalize(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Normalized.
+        /// </summary>
+        /// <returns>A normalized version of this rotation</returns>
+        public Rotation Normalized()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Normalized(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Conjugates this rotation.
+        /// </summary>
+        public void Conjugate()
+        {
+            NDalicPINVOKE.Rotation_Conjugate(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Inverts this rotation.
+        /// </summary>
+        public void Invert()
+        {
+            NDalicPINVOKE.Rotation_Invert(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Performs the logarithm of a rotation
+        /// </summary>
+        /// <returns>A rotation representing the logarithm</returns>
+        public Rotation Log()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Log(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Performs an exponent
+        /// </summary>
+        /// <returns>A rotation representing the exponent</returns>
+        public Rotation Exp()
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Exp(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the dot product of two rotations.
+        /// </summary>
+        /// <param name="q1">The first rotation</param>
+        /// <param name="q2">The second rotation</param>
+        /// <returns>The dot product of the two rotations</returns>
+        public static float Dot(Rotation q1, Rotation q2)
+        {
+            float ret = NDalicPINVOKE.Rotation_Dot(Rotation.getCPtr(q1), Rotation.getCPtr(q2));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Linear Interpolation (using a straight line between the two rotations).
+        /// </summary>
+        /// <param name="q1">The start rotation</param>
+        /// <param name="q2">The end rotation</param>
+        /// <param name="t">A progress value between 0 and 1</param>
+        /// <returns>The interpolated rotation</returns>
+        public static Rotation Lerp(Rotation q1, Rotation q2, float t)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Lerp(Rotation.getCPtr(q1), Rotation.getCPtr(q2), t), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Spherical Linear Interpolation (using the shortest arc of a great circle between the two rotations).
+        /// </summary>
+        /// <param name="q1">The start rotation</param>
+        /// <param name="q2">The end rotation</param>
+        /// <param name="progress">A progress value between 0 and 1</param>
+        /// <returns>The interpolated rotation</returns>
+        public static Rotation Slerp(Rotation q1, Rotation q2, float progress)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Slerp(Rotation.getCPtr(q1), Rotation.getCPtr(q2), progress), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// This version of Slerp, used by Squad, does not check for theta > 90.
+        /// </summary>
+        /// <param name="q1">The start rotation</param>
+        /// <param name="q2">The end rotation</param>
+        /// <param name="t">A progress value between 0 and 1</param>
+        /// <returns>The interpolated rotation</returns>
+        public static Rotation SlerpNoInvert(Rotation q1, Rotation q2, float t)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_SlerpNoInvert(Rotation.getCPtr(q1), Rotation.getCPtr(q2), t), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Spherical Cubic Interpolation.
+        /// </summary>
+        /// <param name="start">The start rotation</param>
+        /// <param name="end">The end rotation</param>
+        /// <param name="ctrl1">The control rotation for q1</param>
+        /// <param name="ctrl2">The control rotation for q2</param>
+        /// <param name="t">A progress value between 0 and 1</param>
+        /// <returns>The interpolated rotation</returns>
+        public static Rotation Squad(Rotation start, Rotation end, Rotation ctrl1, Rotation ctrl2, float t)
+        {
+            Rotation ret = new Rotation(NDalicPINVOKE.Rotation_Squad(Rotation.getCPtr(start), Rotation.getCPtr(end), Rotation.getCPtr(ctrl1), Rotation.getCPtr(ctrl2), t), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the shortest angle between two rotations in Radians.
+        /// </summary>
+        /// <param name="q1">The first rotation</param>
+        /// <param name="q2">The second rotation</param>
+        /// <returns>The angle between the two rotation</returns>
+        public static float AngleBetween(Rotation q1, Rotation q2)
+        {
+            float ret = NDalicPINVOKE.Rotation_AngleBetween(Rotation.getCPtr(q1), Rotation.getCPtr(q2));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
+
+}
index 9c598e0..c1a5300 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Ruler : RefObject {
+    public class Ruler : RefObject {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Ruler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Ruler_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -121,7 +121,7 @@ public class Ruler : RefObject {
     return ret;
   }
 
-  public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
+  internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
     float ret = NDalicPINVOKE.Ruler_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -151,7 +151,7 @@ public class Ruler : RefObject {
     return ret;
   }
 
-  public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
+  internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
     float ret = NDalicPINVOKE.Ruler_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 8560e8b..67e1d1a 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class RulerDomain : global::System.IDisposable {
+    public class RulerDomain : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -102,7 +102,7 @@ public class RulerDomain : global::System.IDisposable {
     return ret;
   }
 
-  public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
+  internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
     float ret = NDalicPINVOKE.RulerDomain_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 09a2211..22029ca 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class RulerPtr : global::System.IDisposable {
+    public class RulerPtr : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -193,7 +193,7 @@ public class RulerPtr : global::System.IDisposable {
     return ret;
   }
 
-  public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
+  internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
     float ret = NDalicPINVOKE.RulerPtr_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -223,7 +223,7 @@ public class RulerPtr : global::System.IDisposable {
     return ret;
   }
 
-  public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
+  internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) {
     float ret = NDalicPINVOKE.RulerPtr_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 8728a7a..40a42a6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_CallbackBase {
+    internal class SWIGTYPE_p_CallbackBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_CallbackBase(global::System.IntPtr cPtr, bool futureUse) {
index 2493069..ae11b70 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Configuration__ContextLoss {
+    internal class SWIGTYPE_p_Configuration__ContextLoss {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Configuration__ContextLoss(global::System.IntPtr cPtr, bool futureUse) {
index f4a8e52..6a0c4ad 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__CallbackBase {
+    internal class SWIGTYPE_p_Dali__CallbackBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__CallbackBase(global::System.IntPtr cPtr, bool futureUse) {
index 51c260b..7a7334a 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Constraint {
+    internal class SWIGTYPE_p_Dali__Constraint {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Constraint(global::System.IntPtr cPtr, bool futureUse) {
index ddd0486..94525a1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__CustomActorImpl__Extension {
+    internal class SWIGTYPE_p_Dali__CustomActorImpl__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__CustomActorImpl__Extension(global::System.IntPtr cPtr, bool futureUse) {
index abc378a..94ed159 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__FunctorDelegate {
+    internal class SWIGTYPE_p_Dali__FunctorDelegate {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) {
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f___bool {
+public class SWIGTYPE_p_Dali__Internal__Texture {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal SWIGTYPE_p_f___bool(global::System.IntPtr cPtr, bool futureUse) {
+  internal SWIGTYPE_p_Dali__Internal__Texture(global::System.IntPtr cPtr, bool futureUse) {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  protected SWIGTYPE_p_f___bool() {
+  protected SWIGTYPE_p_Dali__Internal__Texture() {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
   }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_f___bool obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__Internal__Texture obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 }
index e1ed5b3..d27bcac 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Internal__TypeRegistry {
+    internal class SWIGTYPE_p_Dali__Internal__TypeRegistry {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Internal__TypeRegistry(global::System.IntPtr cPtr, bool futureUse) {
index 74d9503..4e2c6f4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t {
+    internal class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t(global::System.IntPtr cPtr, bool futureUse) {
index 1d0a8fa..b2891ec 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__RectT_unsigned_int_t {
+    internal class SWIGTYPE_p_Dali__RectT_unsigned_int_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__RectT_unsigned_int_t(global::System.IntPtr cPtr, bool futureUse) {
index b10d6f9..2357f6c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) {
index 7ae3407..fc1ca1b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) {
index 36072cc..57029c3 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(global::System.IntPtr cPtr, bool futureUse) {
index 94fb6ec..042ec17 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(global::System.IntPtr cPtr, bool futureUse) {
index dc9220f..756209a 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) {
index 0e75eed..4872674 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) {
index 28b5a57..c1b1a5b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fboolF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fboolF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fboolF_t(global::System.IntPtr cPtr, bool futureUse) {
index b3f62fe..dcdea98 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t {
+    internal class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t(global::System.IntPtr cPtr, bool futureUse) {
index fd8fa8e..799ffc5 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__ClampState {
+    internal class SWIGTYPE_p_Dali__Toolkit__ClampState {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__ClampState(global::System.IntPtr cPtr, bool futureUse) {
index 899a03a..d3c6e9b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader {
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader(global::System.IntPtr cPtr, bool futureUse) {
index 86fbe25..818ade1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension {
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension(global::System.IntPtr cPtr, bool futureUse) {
index bb53e48..8a8df45 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData {
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData(global::System.IntPtr cPtr, bool futureUse) {
index e59846f..607fd3a 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base {
+    internal class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base(global::System.IntPtr cPtr, bool futureUse) {
index 1cf719a..2b51b2c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension {
+    internal class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension(global::System.IntPtr cPtr, bool futureUse) {
index 0f22c5e..e2f8af1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__TouchEvent {
+    internal class SWIGTYPE_p_Dali__TouchEvent {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_Dali__TouchEvent(global::System.IntPtr cPtr, bool futureUse) {
index f2fe1a4..50cd233 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_FunctorDelegate {
+    internal class SWIGTYPE_p_FunctorDelegate {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) {
@@ -2,7 +2,7 @@
 // <auto-generated />
 //
 // This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// Version 3.0.12
 //
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t {
+internal class SWIGTYPE_p_KeyboardFocusManager {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t(global::System.IntPtr cPtr, bool futureUse) {
+  internal SWIGTYPE_p_KeyboardFocusManager(global::System.IntPtr cPtr, bool futureUse) {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
-  protected SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t() {
+  protected SWIGTYPE_p_KeyboardFocusManager() {
     swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
   }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__ProgressBar_float_floatF_t obj) {
+  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(SWIGTYPE_p_KeyboardFocusManager obj) {
     return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
   }
 }
index 8a36b7d..84751d9 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_PropertyInputContainer {
+    internal class SWIGTYPE_p_PropertyInputContainer {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_PropertyInputContainer(global::System.IntPtr cPtr, bool futureUse) {
index 8d9c59f..bd172b1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_double {
+    internal class SWIGTYPE_p_double {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_double(global::System.IntPtr cPtr, bool futureUse) {
index 0a2c70a..7ea1c03 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_float__float {
+    internal class SWIGTYPE_p_f_float__float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_float__float(global::System.IntPtr cPtr, bool futureUse) {
index b16ce93..99130ff 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value {
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value(global::System.IntPtr cPtr, bool futureUse) {
index ce3edd9..78f2bc4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void {
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void(global::System.IntPtr cPtr, bool futureUse) {
index ae01122..fe04fa1 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool {
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool(global::System.IntPtr cPtr, bool futureUse) {
index 08cfa4a..f2aac12 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool {
+    internal class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool(global::System.IntPtr cPtr, bool futureUse) {
index 8cd7c95..be71387 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void {
+    internal class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void(global::System.IntPtr cPtr, bool futureUse) {
index 0bee9ba..3a3cb01 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_r_Dali__Vector2__bool {
+    internal class SWIGTYPE_p_f_r_Dali__Vector2__bool {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_Dali__Vector2__bool(global::System.IntPtr cPtr, bool futureUse) {
index 2bf37c9..c49d792 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase {
+    internal class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase(global::System.IntPtr cPtr, bool futureUse) {
index 283e8ed..9cf7aa3 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float {
+    internal class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_f_r_q_const__Dali__Vector3__float(global::System.IntPtr cPtr, bool futureUse) {
index 981023a..9194428 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_float {
+    internal class SWIGTYPE_p_float {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_float(global::System.IntPtr cPtr, bool futureUse) {
index 0a6ca69..f8c3942 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_int {
+    internal class SWIGTYPE_p_int {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_int(global::System.IntPtr cPtr, bool futureUse) {
index 85f511d..592b899 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_std__type_info {
+    internal class SWIGTYPE_p_std__type_info {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_std__type_info(global::System.IntPtr cPtr, bool futureUse) {
index 66cac48..33792e6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_uint8_t {
+    internal class SWIGTYPE_p_uint8_t {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_uint8_t(global::System.IntPtr cPtr, bool futureUse) {
index c36cc87..119e8d4 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_unsigned_char {
+    internal class SWIGTYPE_p_unsigned_char {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_char(global::System.IntPtr cPtr, bool futureUse) {
index 4919f69..f002151 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_unsigned_int {
+    internal class SWIGTYPE_p_unsigned_int {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_int(global::System.IntPtr cPtr, bool futureUse) {
index 704f281..826d4ce 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SWIGTYPE_p_unsigned_short {
+    internal class SWIGTYPE_p_unsigned_short {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal SWIGTYPE_p_unsigned_short(global::System.IntPtr cPtr, bool futureUse) {
index b4f6196..59eec57 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Sampler : BaseHandle {
+    internal class Sampler : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Sampler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Sampler_SWIGUpcast(cPtr), cMemoryOwn) {
index 5fe99e9..df9400b 100755 (executable)
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
+/* moved to VisualMaps.cs
 public enum SamplingModeType {
   BOX,
   NEAREST,
@@ -19,5 +19,5 @@ public enum SamplingModeType {
   NO_FILTER,
   DONT_CARE
 }
-
+*/
 }
index 59470f7..0324903 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
+    /// <summary>
+    /// ScrollBar is a UI component that can be linked to the scrollable objects
+    /// indicating the current scroll position of the scrollable object.
+    /// </summary>
+    public class ScrollBar : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class ScrollBar : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal ScrollBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollBar_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal ScrollBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollBar_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ScrollBar obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ScrollBar obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~ScrollBar()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~ScrollBar() {
-    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_ScrollBar(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Event arguments that passed via PanFinished event
+        /// </summary>
+        public class PanFinishedEventArgs : EventArgs
+        {
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_ScrollBar(swigCPtr);
+        /// <summary>
+        /// Event arguments that passed via ScrollPositionIntervalReached event
+        /// </summary>
+        public class ScrollPositionIntervalReachedEventArgs : EventArgs
+        {
+            private float _currentScrollPosition;
+
+            /// <summary>
+            /// current scroll position of the scrollable content
+            /// </summary>
+            public float CurrentScrollPosition
+            {
+                get
+                {
+                    return _currentScrollPosition;
+                }
+                set
+                {
+                    _currentScrollPosition = value;
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void PanFinishedEventCallbackDelegate();
+        private EventHandler<PanFinishedEventArgs> _scrollBarPanFinishedEventHandler;
+        private PanFinishedEventCallbackDelegate _scrollBarPanFinishedEventCallbackDelegate;
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void ScrollPositionIntervalReachedEventCallbackDelegate();
+        private EventHandler<ScrollPositionIntervalReachedEventArgs> _scrollBarScrollPositionIntervalReachedEventHandler;
+        private ScrollPositionIntervalReachedEventCallbackDelegate _scrollBarScrollPositionIntervalReachedEventCallbackDelegate;
 
+        /// <summary>
+        /// Event emitted when panning is finished on the scroll indicator.
+        /// </summary>
+        public event EventHandler<PanFinishedEventArgs> PanFinished
+        {
+            add
+            {
+                if (_scrollBarPanFinishedEventHandler == null)
+                {
+                    _scrollBarPanFinishedEventCallbackDelegate = (OnScrollBarPanFinished);
+                    PanFinishedSignal().Connect(_scrollBarPanFinishedEventCallbackDelegate);
+                }
+                _scrollBarPanFinishedEventHandler += value;
+            }
+            remove
+            {
+                _scrollBarPanFinishedEventHandler -= value;
+                if (_scrollBarPanFinishedEventHandler == null && _scrollBarPanFinishedEventCallbackDelegate != null)
+                {
+                    PanFinishedSignal().Disconnect(_scrollBarPanFinishedEventCallbackDelegate);
+                }
+            }
+        }
 
-public class PanFinishedEventArgs : EventArgs
-{
-}
+        // Callback for ScrollBar PanFinishedSignal
+        private void OnScrollBarPanFinished()
+        {
+            PanFinishedEventArgs e = new PanFinishedEventArgs();
 
-public class ScrollPositionIntervalReachedEventArgs : EventArgs
-{
-   private float _currentScrollPosition;
-
-   public float CurrentScrollPosition
-   {
-      get
-      {
-         return _currentScrollPosition;
-      }
-      set
-      {
-         _currentScrollPosition = value;
-      }
-   }
-}
+            if (_scrollBarPanFinishedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _scrollBarPanFinishedEventHandler(this, e);
+            }
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void PanFinishedEventCallbackDelegate();
-  private DaliEventHandler<object,PanFinishedEventArgs> _scrollBarPanFinishedEventHandler;
-  private PanFinishedEventCallbackDelegate _scrollBarPanFinishedEventCallbackDelegate;
-  
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void ScrollPositionIntervalReachedEventCallbackDelegate();
-  private DaliEventHandler<object,ScrollPositionIntervalReachedEventArgs> _scrollBarScrollPositionIntervalReachedEventHandler;
-  private ScrollPositionIntervalReachedEventCallbackDelegate _scrollBarScrollPositionIntervalReachedEventCallbackDelegate;
-
-  public event DaliEventHandler<object,PanFinishedEventArgs> PanFinished
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_scrollBarPanFinishedEventHandler == null)
-           {
-              _scrollBarPanFinishedEventHandler += value;
-
-              _scrollBarPanFinishedEventCallbackDelegate = new PanFinishedEventCallbackDelegate(OnScrollBarPanFinished);
-              this.PanFinishedSignal().Connect(_scrollBarPanFinishedEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_scrollBarPanFinishedEventHandler != null)
-           {
-              this.PanFinishedSignal().Disconnect(_scrollBarPanFinishedEventCallbackDelegate);
-           }
-
-           _scrollBarPanFinishedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for ScrollBar PanFinishedSignal
-  private void OnScrollBarPanFinished()
-  {
-     PanFinishedEventArgs e = new PanFinishedEventArgs();
-
-     if (_scrollBarPanFinishedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _scrollBarPanFinishedEventHandler(this, e);
-     }
-  }
-
-
-  public event DaliEventHandler<object,ScrollPositionIntervalReachedEventArgs> ScrollPositionIntervalReached
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_scrollBarScrollPositionIntervalReachedEventHandler == null)
-           {
-              _scrollBarScrollPositionIntervalReachedEventHandler += value;
-
-              _scrollBarScrollPositionIntervalReachedEventCallbackDelegate = new ScrollPositionIntervalReachedEventCallbackDelegate(OnScrollBarScrollPositionIntervalReached);
-              this.ScrollPositionIntervalReachedSignal().Connect(_scrollBarScrollPositionIntervalReachedEventCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_scrollBarScrollPositionIntervalReachedEventHandler != null)
-           {
-              this.ScrollPositionIntervalReachedSignal().Disconnect(_scrollBarScrollPositionIntervalReachedEventCallbackDelegate);
-           }
-
-           _scrollBarScrollPositionIntervalReachedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for ScrollBar ScrollPositionIntervalReachedSignal
-  private void OnScrollBarScrollPositionIntervalReached()
-  {
-     ScrollPositionIntervalReachedEventArgs e = new ScrollPositionIntervalReachedEventArgs();
-
-     if (_scrollBarScrollPositionIntervalReachedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _scrollBarScrollPositionIntervalReachedEventHandler(this, e);
-     }
-  }
-
-
-  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_ScrollBar_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_ScrollBar_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int SCROLL_DIRECTION = NDalicPINVOKE.ScrollBar_Property_SCROLL_DIRECTION_get();
-    public static readonly int INDICATOR_HEIGHT_POLICY = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get();
-    public static readonly int INDICATOR_FIXED_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get();
-    public static readonly int INDICATOR_SHOW_DURATION = NDalicPINVOKE.ScrollBar_Property_INDICATOR_SHOW_DURATION_get();
-    public static readonly int INDICATOR_HIDE_DURATION = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HIDE_DURATION_get();
-    public static readonly int SCROLL_POSITION_INTERVALS = NDalicPINVOKE.ScrollBar_Property_SCROLL_POSITION_INTERVALS_get();
-    public static readonly int INDICATOR_MINIMUM_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get();
-    public static readonly int INDICATOR_START_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_START_PADDING_get();
-    public static readonly int INDICATOR_END_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_END_PADDING_get();
-  
-  }
-
-  public ScrollBar (ScrollBar.Direction direction) : this (NDalicPINVOKE.ScrollBar_New__SWIG_0((int)direction), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ScrollBar () : this (NDalicPINVOKE.ScrollBar_New__SWIG_1(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public ScrollBar(ScrollBar scrollBar) : this(NDalicPINVOKE.new_ScrollBar__SWIG_1(ScrollBar.getCPtr(scrollBar)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ScrollBar Assign(ScrollBar scrollBar) {
-    ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_Assign(swigCPtr, ScrollBar.getCPtr(scrollBar)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static ScrollBar DownCast(BaseHandle handle) {
-    ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetScrollPropertySource(Handle handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) {
-    NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Handle.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetScrollIndicator(Actor indicator) {
-    NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, Actor.getCPtr(indicator));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Actor GetScrollIndicator() {
-    Actor ret = new Actor(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetScrollPositionIntervals(VectorFloat positions) {
-    NDalicPINVOKE.ScrollBar_SetScrollPositionIntervals(swigCPtr, VectorFloat.getCPtr(positions));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VectorFloat GetScrollPositionIntervals() {
-    VectorFloat ret = new VectorFloat(NDalicPINVOKE.ScrollBar_GetScrollPositionIntervals(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetScrollDirection(ScrollBar.Direction direction) {
-    NDalicPINVOKE.ScrollBar_SetScrollDirection(swigCPtr, (int)direction);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ScrollBar.Direction GetScrollDirection() {
-    ScrollBar.Direction ret = (ScrollBar.Direction)NDalicPINVOKE.ScrollBar_GetScrollDirection(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetIndicatorHeightPolicy(ScrollBar.IndicatorHeightPolicyType policy) {
-    NDalicPINVOKE.ScrollBar_SetIndicatorHeightPolicy(swigCPtr, (int)policy);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ScrollBar.IndicatorHeightPolicyType GetIndicatorHeightPolicy() {
-    ScrollBar.IndicatorHeightPolicyType ret = (ScrollBar.IndicatorHeightPolicyType)NDalicPINVOKE.ScrollBar_GetIndicatorHeightPolicy(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetIndicatorFixedHeight(float height) {
-    NDalicPINVOKE.ScrollBar_SetIndicatorFixedHeight(swigCPtr, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetIndicatorFixedHeight() {
-    float ret = NDalicPINVOKE.ScrollBar_GetIndicatorFixedHeight(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetIndicatorShowDuration(float durationSeconds) {
-    NDalicPINVOKE.ScrollBar_SetIndicatorShowDuration(swigCPtr, durationSeconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetIndicatorShowDuration() {
-    float ret = NDalicPINVOKE.ScrollBar_GetIndicatorShowDuration(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetIndicatorHideDuration(float durationSeconds) {
-    NDalicPINVOKE.ScrollBar_SetIndicatorHideDuration(swigCPtr, durationSeconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetIndicatorHideDuration() {
-    float ret = NDalicPINVOKE.ScrollBar_GetIndicatorHideDuration(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ShowIndicator() {
-    NDalicPINVOKE.ScrollBar_ShowIndicator(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void HideIndicator() {
-    NDalicPINVOKE.ScrollBar_HideIndicator(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VoidSignal PanFinishedSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.ScrollBar_PanFinishedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public FloatSignal ScrollPositionIntervalReachedSignal() {
-    FloatSignal ret = new FloatSignal(NDalicPINVOKE.ScrollBar_ScrollPositionIntervalReachedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public enum Direction {
-    Vertical = 0,
-    Horizontal
-  }
-
-  public enum IndicatorHeightPolicyType {
-    Variable = 0,
-    Fixed
-  }
-
-  public string ScrollDirection
-  {
-    get
-    {
-      string temp;
-      GetProperty( ScrollBar.Property.SCROLL_DIRECTION).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.SCROLL_DIRECTION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string IndicatorHeightPolicy
-  {
-    get
-    {
-      string temp;
-      GetProperty( ScrollBar.Property.INDICATOR_HEIGHT_POLICY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_HEIGHT_POLICY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorFixedHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorShowDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorHideDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array ScrollPositionIntervals
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( ScrollBar.Property.SCROLL_POSITION_INTERVALS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.SCROLL_POSITION_INTERVALS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorMinimumHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorStartPadding
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_START_PADDING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_START_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float IndicatorEndPadding
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( ScrollBar.Property.INDICATOR_END_PADDING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( ScrollBar.Property.INDICATOR_END_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
 
-}
+        /// <summary>
+        /// Event emitted when the current scroll position of the scrollable content
+        /// </summary>
+        public event EventHandler<ScrollPositionIntervalReachedEventArgs> ScrollPositionIntervalReached
+        {
+            add
+            {
+                if (_scrollBarScrollPositionIntervalReachedEventHandler == null)
+                {
+                    _scrollBarScrollPositionIntervalReachedEventCallbackDelegate = (OnScrollBarScrollPositionIntervalReached);
+                    ScrollPositionIntervalReachedSignal().Connect(_scrollBarScrollPositionIntervalReachedEventCallbackDelegate);
+                }
+                _scrollBarScrollPositionIntervalReachedEventHandler += value;
+            }
+            remove
+            {
+                _scrollBarScrollPositionIntervalReachedEventHandler -= value;
+                if (_scrollBarScrollPositionIntervalReachedEventHandler == null && _scrollBarScrollPositionIntervalReachedEventCallbackDelegate != null)
+                {
+                    ScrollPositionIntervalReachedSignal().Disconnect(_scrollBarScrollPositionIntervalReachedEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for ScrollBar ScrollPositionIntervalReachedSignal
+        private void OnScrollBarScrollPositionIntervalReached()
+        {
+            ScrollPositionIntervalReachedEventArgs e = new ScrollPositionIntervalReachedEventArgs();
+
+            if (_scrollBarScrollPositionIntervalReachedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _scrollBarScrollPositionIntervalReachedEventHandler(this, e);
+            }
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_ScrollBar_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_ScrollBar_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int SCROLL_DIRECTION = NDalicPINVOKE.ScrollBar_Property_SCROLL_DIRECTION_get();
+            internal static readonly int INDICATOR_HEIGHT_POLICY = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get();
+            internal static readonly int INDICATOR_FIXED_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get();
+            internal static readonly int INDICATOR_SHOW_DURATION = NDalicPINVOKE.ScrollBar_Property_INDICATOR_SHOW_DURATION_get();
+            internal static readonly int INDICATOR_HIDE_DURATION = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HIDE_DURATION_get();
+            internal static readonly int SCROLL_POSITION_INTERVALS = NDalicPINVOKE.ScrollBar_Property_SCROLL_POSITION_INTERVALS_get();
+            internal static readonly int INDICATOR_MINIMUM_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get();
+            internal static readonly int INDICATOR_START_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_START_PADDING_get();
+            internal static readonly int INDICATOR_END_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_END_PADDING_get();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized ScrollBar.
+        /// </summary>
+        /// <param name="direction">The direction of scroll bar (either vertically or horizontally)</param>
+        public ScrollBar(ScrollBar.Direction direction) : this(NDalicPINVOKE.ScrollBar_New__SWIG_0((int)direction), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Creates an uninitialized ScrollBar
+        /// </summary>
+        public ScrollBar() : this(NDalicPINVOKE.ScrollBar_New__SWIG_1(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal ScrollBar(ScrollBar scrollBar) : this(NDalicPINVOKE.new_ScrollBar__SWIG_1(ScrollBar.getCPtr(scrollBar)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ScrollBar Assign(ScrollBar scrollBar)
+        {
+            ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_Assign(swigCPtr, ScrollBar.getCPtr(scrollBar)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to ScrollBar handle.
+        /// If handle points to a ScrollBar, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a ScrollBar or an uninitialized handle</returns>
+        public new static ScrollBar DownCast(BaseHandle handle)
+        {
+            ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetScrollPropertySource(Handle handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize)
+        {
+            NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Handle.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetScrollIndicator(Actor indicator)
+        {
+            NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, Actor.getCPtr(indicator));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Actor GetScrollIndicator()
+        {
+            Actor ret = new Actor(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetScrollPositionIntervals(VectorFloat positions)
+        {
+            NDalicPINVOKE.ScrollBar_SetScrollPositionIntervals(swigCPtr, VectorFloat.getCPtr(positions));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VectorFloat GetScrollPositionIntervals()
+        {
+            VectorFloat ret = new VectorFloat(NDalicPINVOKE.ScrollBar_GetScrollPositionIntervals(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetScrollDirection(ScrollBar.Direction direction)
+        {
+            NDalicPINVOKE.ScrollBar_SetScrollDirection(swigCPtr, (int)direction);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ScrollBar.Direction GetScrollDirection()
+        {
+            ScrollBar.Direction ret = (ScrollBar.Direction)NDalicPINVOKE.ScrollBar_GetScrollDirection(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetIndicatorHeightPolicy(ScrollBar.IndicatorHeightPolicyType policy)
+        {
+            NDalicPINVOKE.ScrollBar_SetIndicatorHeightPolicy(swigCPtr, (int)policy);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ScrollBar.IndicatorHeightPolicyType GetIndicatorHeightPolicy()
+        {
+            ScrollBar.IndicatorHeightPolicyType ret = (ScrollBar.IndicatorHeightPolicyType)NDalicPINVOKE.ScrollBar_GetIndicatorHeightPolicy(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetIndicatorFixedHeight(float height)
+        {
+            NDalicPINVOKE.ScrollBar_SetIndicatorFixedHeight(swigCPtr, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetIndicatorFixedHeight()
+        {
+            float ret = NDalicPINVOKE.ScrollBar_GetIndicatorFixedHeight(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetIndicatorShowDuration(float durationSeconds)
+        {
+            NDalicPINVOKE.ScrollBar_SetIndicatorShowDuration(swigCPtr, durationSeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetIndicatorShowDuration()
+        {
+            float ret = NDalicPINVOKE.ScrollBar_GetIndicatorShowDuration(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetIndicatorHideDuration(float durationSeconds)
+        {
+            NDalicPINVOKE.ScrollBar_SetIndicatorHideDuration(swigCPtr, durationSeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetIndicatorHideDuration()
+        {
+            float ret = NDalicPINVOKE.ScrollBar_GetIndicatorHideDuration(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void ShowIndicator()
+        {
+            NDalicPINVOKE.ScrollBar_ShowIndicator(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void HideIndicator()
+        {
+            NDalicPINVOKE.ScrollBar_HideIndicator(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VoidSignal PanFinishedSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.ScrollBar_PanFinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal FloatSignal ScrollPositionIntervalReachedSignal()
+        {
+            FloatSignal ret = new FloatSignal(NDalicPINVOKE.ScrollBar_ScrollPositionIntervalReachedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Direction of scroll bar
+        /// </summary>
+        public enum Direction
+        {
+            Vertical = 0,
+            Horizontal
+        }
+
+        /// <summary>
+        /// Indicator height policy.
+        /// </summary>
+        public enum IndicatorHeightPolicyType
+        {
+            Variable = 0,
+            Fixed
+        }
+
+        /// <summary>
+        /// Direction of scroll bar
+        /// </summary>
+        public string ScrollDirection
+        {
+            get
+            {
+                string temp;
+                GetProperty(ScrollBar.Property.SCROLL_DIRECTION).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.SCROLL_DIRECTION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Indicator height policy.
+        /// </summary>
+        public string IndicatorHeightPolicy
+        {
+            get
+            {
+                string temp;
+                GetProperty(ScrollBar.Property.INDICATOR_HEIGHT_POLICY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_HEIGHT_POLICY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// the fixed height of scroll indicator.
+        /// </summary>
+        public float IndicatorFixedHeight
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_FIXED_HEIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// the duration in seconds for the scroll indicator to become fully visible.
+        /// </summary>
+        public float IndicatorShowDuration
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_SHOW_DURATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_SHOW_DURATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// the duration in seconds for the scroll indicator to become fully invisible.
+        /// </summary>
+        public float IndicatorHideDuration
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_HIDE_DURATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_HIDE_DURATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// the list of values to get notification when the current scroll position of the scrollable object goes above or below any of these values.
+        /// </summary>
+        public Tizen.NUI.PropertyArray ScrollPositionIntervals
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(ScrollBar.Property.SCROLL_POSITION_INTERVALS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.SCROLL_POSITION_INTERVALS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The minimum height for a variable size indicator.
+        /// </summary>
+        public float IndicatorMinimumHeight
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The padding at the start of the indicator. For example, the top if scrollDirection is Vertical.
+        /// </summary>
+        public float IndicatorStartPadding
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_START_PADDING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_START_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The padding at the end of the indicator. For example, the bottom if scrollDirection is Vertical.
+        /// </summary>
+        public float IndicatorEndPadding
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(ScrollBar.Property.INDICATOR_END_PADDING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(ScrollBar.Property.INDICATOR_END_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 0c0b7df..3f17dcb 100755 (executable)
@@ -30,7 +30,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class ScrollView : Scrollable {
+    public class ScrollView : Scrollable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollView_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -64,8 +64,6 @@ public class ScrollView : Scrollable {
     }
   }
 
-
-
 /**
   * @brief Event arguments that passed via SnapStarted signal
   *
@@ -153,20 +151,20 @@ public class SnapStartedEventArgs : EventArgs
   public class ClampEvent : global::System.IDisposable {
     private global::System.Runtime.InteropServices.HandleRef swigCPtr;
     protected bool swigCMemOwn;
-  
+
     internal ClampEvent(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(ClampEvent obj) {
       return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
     }
-  
+
     ~ClampEvent() {
       Dispose();
     }
-  
+
     public virtual void Dispose() {
       lock(this) {
         if (swigCPtr.Handle != global::System.IntPtr.Zero) {
@@ -179,68 +177,68 @@ public class SnapStartedEventArgs : EventArgs
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
-    public ClampState2D scale {
+
+    internal ClampState2D scale {
       set {
         NDalicPINVOKE.ScrollView_ClampEvent_scale_set(swigCPtr, ClampState2D.getCPtr(value));
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_scale_get(swigCPtr);
         ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
-    public ClampState2D position {
+
+    internal ClampState2D position {
       set {
         NDalicPINVOKE.ScrollView_ClampEvent_position_set(swigCPtr, ClampState2D.getCPtr(value));
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_position_get(swigCPtr);
         ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
-    public ClampState rotation {
+
+    internal ClampState rotation {
       set {
         NDalicPINVOKE.ScrollView_ClampEvent_rotation_set(swigCPtr, (int)value);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         ClampState ret = (ClampState)NDalicPINVOKE.ScrollView_ClampEvent_rotation_get(swigCPtr);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
+
     public ClampEvent() : this(NDalicPINVOKE.new_ScrollView_ClampEvent(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
-  
+
   }
 
   public class SnapEvent : global::System.IDisposable {
     private global::System.Runtime.InteropServices.HandleRef swigCPtr;
     protected bool swigCMemOwn;
-  
+
     internal SnapEvent(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(SnapEvent obj) {
       return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
     }
-  
+
     ~SnapEvent() {
       Dispose();
     }
-  
+
     public virtual void Dispose() {
       lock(this) {
         if (swigCPtr.Handle != global::System.IntPtr.Zero) {
@@ -253,73 +251,73 @@ public class SnapStartedEventArgs : EventArgs
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
+
    public static SnapEvent GetSnapEventFromPtr(global::System.IntPtr cPtr) {
       SnapEvent ret = new SnapEvent(cPtr, false);
-       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     }
-  
-    public SnapType type {
+
+    internal SnapType type {
       set {
         NDalicPINVOKE.ScrollView_SnapEvent_type_set(swigCPtr, (int)value);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         SnapType ret = (SnapType)NDalicPINVOKE.ScrollView_SnapEvent_type_get(swigCPtr);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
+
     public Vector2 position {
       set {
         NDalicPINVOKE.ScrollView_SnapEvent_position_set(swigCPtr, Vector2.getCPtr(value));
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_SnapEvent_position_get(swigCPtr);
         Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
+
     public float duration {
       set {
         NDalicPINVOKE.ScrollView_SnapEvent_duration_set(swigCPtr, value);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
+      }
       get {
         float ret = NDalicPINVOKE.ScrollView_SnapEvent_duration_get(swigCPtr);
         if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         return ret;
-      } 
+      }
     }
-  
+
     public SnapEvent() : this(NDalicPINVOKE.new_ScrollView_SnapEvent(), true) {
       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) {
@@ -332,11 +330,11 @@ public class SnapStartedEventArgs : EventArgs
         global::System.GC.SuppressFinalize(this);
       }
     }
-  
+
     public Property() : this(NDalicPINVOKE.new_ScrollView_Property(), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     }
-  
+
     public static readonly int WRAP_ENABLED = NDalicPINVOKE.ScrollView_Property_WRAP_ENABLED_get();
     public static readonly int PANNING_ENABLED = NDalicPINVOKE.ScrollView_Property_PANNING_ENABLED_get();
     public static readonly int AXIS_AUTO_LOCK_ENABLED = NDalicPINVOKE.ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get();
@@ -362,7 +360,7 @@ public class SnapStartedEventArgs : EventArgs
     public static readonly int SCROLL_DOMAIN_OFFSET = NDalicPINVOKE.ScrollView_Property_SCROLL_DOMAIN_OFFSET_get();
     public static readonly int SCROLL_POSITION_DELTA = NDalicPINVOKE.ScrollView_Property_SCROLL_POSITION_DELTA_get();
     public static readonly int START_PAGE_POSITION = NDalicPINVOKE.ScrollView_Property_START_PAGE_POSITION_get();
-  
+
   }
 
   public ScrollView () : this (NDalicPINVOKE.ScrollView_New(), true) {
@@ -636,7 +634,7 @@ public class SnapStartedEventArgs : EventArgs
     return ret;
   }
 
-  public void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) {
+  internal void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) {
     NDalicPINVOKE.ScrollView_ApplyConstraintToChildren(swigCPtr, SWIGTYPE_p_Dali__Constraint.getCPtr(constraint));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
@@ -686,7 +684,7 @@ public class SnapStartedEventArgs : EventArgs
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public ScrollViewSnapStartedSignal SnapStartedSignal() {
+  internal ScrollViewSnapStartedSignal SnapStartedSignal() {
     ScrollViewSnapStartedSignal ret = new ScrollViewSnapStartedSignal(NDalicPINVOKE.ScrollView_SnapStartedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -709,7 +707,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.WRAP_ENABLED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.WRAP_ENABLED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool PanningEnabled
@@ -722,7 +720,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.PANNING_ENABLED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.PANNING_ENABLED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool AxisAutoLockEnabled
@@ -735,7 +733,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 WheelScrollDistanceStep
@@ -748,7 +746,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.WHEEL_SCROLL_DISTANCE_STEP, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPosition
@@ -761,7 +759,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPrePosition
@@ -774,7 +772,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPrePositionMax
@@ -787,7 +785,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION_MAX, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_PRE_POSITION_MAX, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float OvershootX
@@ -800,7 +798,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.OVERSHOOT_X, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.OVERSHOOT_X, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float OvershootY
@@ -813,7 +811,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.OVERSHOOT_Y, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.OVERSHOOT_Y, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollFinal
@@ -826,7 +824,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_FINAL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_FINAL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool Wrap
@@ -839,7 +837,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.WRAP, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.WRAP, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool Panning
@@ -852,7 +850,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.PANNING, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.PANNING, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool Scrolling
@@ -865,7 +863,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLLING, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLLING, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollDomainSize
@@ -878,7 +876,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_DOMAIN_SIZE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_DOMAIN_SIZE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollDomainOffset
@@ -891,7 +889,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_DOMAIN_OFFSET, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_DOMAIN_OFFSET, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPositionDelta
@@ -904,7 +902,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.SCROLL_POSITION_DELTA, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.SCROLL_POSITION_DELTA, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector3 StartPagePosition
@@ -917,7 +915,7 @@ public class SnapStartedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( ScrollView.Property.START_PAGE_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ScrollView.Property.START_PAGE_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 92f8a21..1b7473c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ScrollViewEffect : BaseHandle {
+    public class ScrollViewEffect : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollViewEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewEffect_SWIGUpcast(cPtr), cMemoryOwn) {
index b47b03b..ccf3e90 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class ScrollViewPagePathEffect : ScrollViewEffect {
+    internal class ScrollViewPagePathEffect : ScrollViewEffect {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal ScrollViewPagePathEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewPagePathEffect_SWIGUpcast(cPtr), cMemoryOwn) {
index 115fcb0..6672bdf 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ScrollViewSnapStartedSignal : global::System.IDisposable {
+    internal class ScrollViewSnapStartedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index e2ead18..4000b90 100755 (executable)
@@ -14,7 +14,7 @@ using System;
 using System.Runtime.InteropServices;
 
 
-public class Scrollable : View {
+    public class Scrollable : View {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -359,19 +359,19 @@ public class CompletedEventArgs : EventArgs
     return ret;
   }
 
-  public ScrollableSignal ScrollStartedSignal() {
+  internal ScrollableSignal ScrollStartedSignal() {
     ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollStartedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public ScrollableSignal ScrollUpdatedSignal() {
+  internal ScrollableSignal ScrollUpdatedSignal() {
     ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollUpdatedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public ScrollableSignal ScrollCompletedSignal() {
+  internal ScrollableSignal ScrollCompletedSignal() {
     ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollCompletedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -394,7 +394,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.OVERSHOOT_EFFECT_COLOR, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.OVERSHOOT_EFFECT_COLOR, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public float OvershootAnimationSpeed
@@ -407,7 +407,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool OvershootEnabled
@@ -420,7 +420,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.OVERSHOOT_ENABLED, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.OVERSHOOT_ENABLED, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 OvershootSize
@@ -433,7 +433,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.OVERSHOOT_SIZE, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.OVERSHOOT_SIZE, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int ScrollToAlphaFunction
@@ -446,7 +446,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollRelativePosition
@@ -459,7 +459,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.SCROLL_RELATIVE_POSITION, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.SCROLL_RELATIVE_POSITION, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPositionMin
@@ -472,7 +472,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.SCROLL_POSITION_MIN, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.SCROLL_POSITION_MIN, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public Vector2 ScrollPositionMax
@@ -485,7 +485,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.SCROLL_POSITION_MAX, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.SCROLL_POSITION_MAX, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool CanScrollVertical
@@ -498,7 +498,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public bool CanScrollHorizontal
@@ -511,7 +511,7 @@ public class CompletedEventArgs : EventArgs
     }
     set
     {
-      SetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index a0fd91a..4bbfcd6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ScrollableSignal : global::System.IDisposable {
+    internal class ScrollableSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 831b983..556a497 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Shader : Handle {
+    internal class Shader : Handle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Shader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Shader_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -165,17 +165,17 @@ public class Shader : Handle {
     return ret;
   }
 
-  public Tizen.NUI.Property.Map Program
+  public Tizen.NUI.PropertyMap Program
   {
     get
     {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
+      Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
       GetProperty( Shader.Property.PROGRAM).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( Shader.Property.PROGRAM, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( Shader.Property.PROGRAM, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 6723267..8833f2b 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SignalConnectorType : global::System.IDisposable {
+    internal class SignalConnectorType : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5025d79..abaad2c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SignalObserver : global::System.IDisposable {
+    internal class SignalObserver : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 23d3310..395302d 100755 (executable)
+/*
+ * 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.
+ *
+ */
+
 namespace Tizen.NUI
 {
-  using System;
-
-  public class Size
-  {
-    private float width;
-    private float height;
-
-    /**
-     * @brief constructor
-     *
-     * @since 1.0.0
-     * @param [in] a Width value .
-     * @param [in] b Height value.
-     */
-    public Size(float a, float b)
-    {
-      width = a;
-      height = b;
-    }
-    /**
-     * @brief default constructor
-     *
-     * @since 1.0.0
-     */
-    public Size()
-    {
-      width = 0.0f;
-      height = 0.0f;
-    }
-
-    /**
-     * @brief constructor with base class object
-     *
-     * @since 1.0.0
-     * @param [in] o The Vector2 with Width, Height values.
-     */
-    public Size(Vector2 o)
-    {
-      width = o.X;
-      height = o.Y;
-    }
-
-    /**
-     * @brief Copy constructor
-     *
-     * @since 1.0.0
-     * @param [in] o The Size having Width & Y.
-     */
-    public Size(Size a)
-    {
-      width = a.width;
-      height = a.height;
-    }
-
-    ///< name "W", type float (Size Width value)
-    //@since 1.0.0
-    public float W
-    {
-      get { return width; }
-      set { width = value; }
-    }
 
-    ///< name "H", type float (Size Height value)
-    //@since 1.0.0
-    public float H
-    {
-      get { return height; }
-      set { height = value; }
-    }
+    /// <summary>
+    /// Three dimensional size
+    /// </summary>
+    public class Size : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Size(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(Size obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Size()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Vector3(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Addition operator for A+B
+        /// </summary>
+        /// <param name="arg1">Size, A</param>
+        /// <param name="arg2">Size to assign, B</param>
+        /// <returns>A Size containing the result of the addition</returns>
+        public static Size operator +(Size arg1, Size arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator for A-B
+        /// </summary>
+        /// <param name="arg1">Size, A</param>
+        /// <param name="arg2">Size to subtract, B</param>
+        /// <returns>A Size containing the result of the subtraction</returns>
+        public static Size operator -(Size arg1, Size arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Size for unary negation</param>
+        /// <returns>A Size containg the negation</returns>
+        public static Size operator -(Size arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">Size for multiplication</param>
+        /// <param name="arg2">The Size to multipl</param>
+        /// <returns>A Size containing the result of the multiplication</returns>
+        public static Size operator *(Size arg1, Size arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">Size for multiplication</param>
+        /// <param name="arg2">The float value to scale the Size</param>
+        /// <returns>A Size containing the result of the scaling</returns>
+        public static Size operator *(Size arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">Size for division</param>
+        /// <param name="arg2">The Size to divide</param>
+        /// <returns>A Size containing the result of the division></returns>
+        public static Size operator /(Size arg1, Size arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">Size for division</param>
+        /// <param name="arg2">The float value to scale the Size by</param>
+        /// <returns>A Size containing the result of the scaling</returns>
+        public static Size operator /(Size arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Array subscript operator.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        internal static Size GetSizeFromPtr(global::System.IntPtr cPtr)
+        {
+            Size ret = new Size(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public Size() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="x">x (or width) component</param>
+        /// <param name="y">y (or height) component</param>
+        /// <param name="z">z (or depth) component</param>
+        public Size(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="size2d">Size2D with x (width) and y (height)</param>
+        public Size(Size2D size2d) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Size2D.getCPtr(size2d)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Zero constant, (0.0f, 0.0f, 0.0f).
+        /// </summary>
+        public static Size Zero
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get();
+                Size ret = (cPtr == global::System.IntPtr.Zero) ? null : new Size(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Size Add(Size rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Add(swigCPtr, Size.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Subtract(Size rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Size.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Multiply(Size rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Size.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Multiply(float rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Divide(Size rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Size.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Divide(float rhs)
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size Subtract()
+        {
+            Size ret = new Size(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check equality.
+        /// Utilizes appropriate machine epsilon values.
+        /// </summary>
+        /// <param name="rhs">The Size to test against</param>
+        /// <returns>True if the Sizes are equal</returns>
+        public bool EqualTo(Size rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Size.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check inequality.
+        /// Utilizes appropriate machine epsilon values.
+        /// </summary>
+        /// <param name="rhs">The Size to test against</param>
+        /// <returns>True if the Sizes are not equal</returns>
+        public bool NotEqualTo(Size rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Size.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Width property for width component of Siz
+        /// </summary>
+        public float Width
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Width_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Width_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Height property for height component of Size
+        /// </summary>
+        public float Height
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Height_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Height_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Depth property for depth component of Size
+        /// </summary>
+        public float Depth
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Depth_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Depth_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Type cast operator, Size to Vector3.
+        /// </summary>
+        /// <param name="size">Object of Size type</param>
+        public static implicit operator Vector3(Size size)
+        {
+            return new Vector3(size.Width, size.Height, size.Depth);
+        }
+
+        /// <summary>
+        /// Type cast operator, Vector3 to Size type.
+        /// </summary>
+        /// <param name="vec">Object of Vector3 type</param>
+        public static implicit operator Size(Vector3 vec)
+        {
+            return new Size(vec.Width, vec.Height, vec.Depth);
+        }
 
-    public float Width
-    {
-      get { return width; }
-      set { width = value; }
-    }
-
-    public float Height
-    {
-      get { return height; }
-      set { height = value; }
-    }
-
-    /**
-     * @brief operator+
-     *
-     * @since 1.0.0
-     * @param [in] l The Size to add.
-     * @param [in] r The Size to add
-     * @return A reference to this
-     */
-    public static Size operator +(Size l, Size r)
-    {
-      return new Size(l.W + r.W, l.H + r.H);
-    }
-
-    /**
-     * @brief operator-
-     *
-     * @since 1.0.0
-     * @param [in] l The Size to substract.
-     * @param [in] r The Size to substract
-     * @return A reference to this
-     */
-    public static Size operator -(Size l, Size r)
-    {
-      return new Size(l.W - r.W, l.H - r.H);
     }
 
-    /**
-     * @brief operator*
-     *
-     * @since 1.0.0
-     * @param [in] a The Size to multiply
-     * @param [in] b The constant to multiply of type double.
-     * @return A reference to this
-     */
-    public static Size operator *(Size a, double b)
-    {
-      return new Size((float)(a.W * b), (float)(a.H * b));
-    }
-
-    /**
-     * @brief operator/
-     *
-     * @since 1.0.0
-     * @param [in] a The Size to divide.
-     * @param [in] b The Size to divide
-     * @return float of the size division
-     */
-    public static float operator /(Size a, Size b)
-    {
-      return (float)System.Math.Sqrt((a.W / b.W) * (a.H / b.H));
-    }
-
-    /**
-     * @brief Operator ==
-     *
-     * @since 1.0.0
-     * @param [in] a The Size object to compare.
-     * @param [in] b The Size object to compare.
-     * @return bool, whether Size are equal or not
-     */
-    public static bool operator == (Size a, Size b)
-    {
-      return a.W == b.W && a.H == b.H ;
-    }
-
-    /**
-     * @brief Operator !=
-     *
-     * @since 1.0.0
-     * @param [in] a The Size object to compare.
-     * @param [in] b The Size object to compare.
-     * @return bool, whether Size are equal or not
-     */
-    public static bool operator != (Size a, Size b)
-    {
-      return a.W != b.W || a.H != b.H;
-    }
-
-    /**
-     * @brief GetHashCode
-     *
-     * @since 1.0.0
-     * @return int, hascode of Size
-     */
-    public override int GetHashCode()
-    {
-      return (int)(W + H);
-    }
-
-    /**
-     * @brief Clone
-     *
-     * @since 1.0.0
-     * @return returns a copy of Size object
-     */
-    public Size Clone()
-    {
-      Size copy = new Size(W, H);
-      return copy;
-    }
-
-    // User-defined conversion from Position to Vector2
-    public static implicit operator Vector2(Size size)
-    {
-      return new Vector2(size.width, size.height);
-    }
-
-    public static implicit operator Size(Vector2 vec)
-    {
-      return new Size(vec.X, vec.Y);
-    }
-  }
-
-  public class Size3D
-  {
-    private float width;
-    private float height;
-    private float depth;
-
-    public Size3D(float a, float b, float c)
-    {
-      width = a;
-      height = b;
-      depth = c;
-    }
-
-    public Size3D()
-    {
-      width = 0.0f;
-      height = 0.0f;
-      depth = 0.0f;
-    }
-
-    public Size3D(Vector3 o)
-    {
-      width = o.X;
-      height = o.Y;
-      depth = o.Z;
-    }
-
-    public Size3D(Vector2 o)
-    {
-      width = o.X;
-      height = o.Y;
-      depth = 0.0f;
-    }
-
-    public Size3D(Size3D a)
-    {
-      width = a.width;
-      height = a.height;
-      depth = a.depth;
-    }
-
-    public float W
-    {
-      get { return width; }
-      set { width = value; }
-    }
-
-    public float H
-    {
-      get { return height; }
-      set { height = value; }
-    }
-
-    public float D
-    {
-      get { return depth; }
-      set { depth = value; }
-    }
-
-    public float Width
-    {
-      get { return width; }
-      set { width = value; }
-    }
-
-    public float Height
-    {
-      get { return height; }
-      set { height = value; }
-    }
-
-    public float Depth
-    {
-      get { return depth; }
-      set { depth = value; }
-    }
-
-    public float X
-    {
-      get { return width; }
-      set { width = value; }
-    }
-
-    public float Y
-    {
-      get { return height; }
-      set { height = value; }
-    }
-
-    public float Z
-    {
-      get { return depth; }
-      set { depth = value; }
-    }
-
-    // User-defined conversion from Position to Vector3
-    public static implicit operator Vector3(Size3D size)
-    {
-      return new Vector3(size.width, size.height, size.depth);
-    }
-
-    public static implicit operator Size3D(Vector3 vec)
-    {
-      return new Size3D(vec.X, vec.Y, vec.Z);
-    }
-
-  }
-
 }
+
diff --git a/src/Tizen.NUI/devel-src/Size2D.cs b/src/Tizen.NUI/devel-src/Size2D.cs
new file mode 100755 (executable)
index 0000000..abb45eb
--- /dev/null
@@ -0,0 +1,341 @@
+/*
+ * 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.
+ *
+ */
+
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// A two dimensional size
+    /// </summary>
+    public class Size2D : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
+
+        internal Size2D(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(Size2D obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~Size2D()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        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_Vector2(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
+
+        /// <summary>
+        /// Addition operator for A+B
+        /// </summary>
+        /// <param name="arg1">Size, A</param>
+        /// <param name="arg2">Size to assign, B</param>
+        /// <returns>A Size containing the result of the addition</returns>
+        public static Size2D operator +(Size2D arg1, Size2D arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator for A-B
+        /// </summary>
+        /// <param name="arg1">Size, A</param>
+        /// <param name="arg2">Size to subtract, B</param>
+        /// <returns>A Size containing the result of the subtraction</returns>
+        public static Size2D operator -(Size2D arg1, Size2D arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Size for unary negation</param>
+        /// <returns>A Size containg the negation</returns>
+        public static Size2D operator -(Size2D arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">Size for multiplication</param>
+        /// <param name="arg2">The Size to multipl</param>
+        /// <returns>A Size containing the result of the multiplication</returns>
+        public static Size2D operator *(Size2D arg1, Size2D arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">Size for multiplication</param>
+        /// <param name="arg2">The int value to scale the Size</param>
+        /// <returns>A Size containing the result of the scaling</returns>
+
+        public static Size2D operator *(Size2D arg1, int arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">Size for division</param>
+        /// <param name="arg2">The Size to divide</param>
+        /// <returns>A Size containing the result of the division></returns>
+        public static Size2D operator /(Size2D arg1, Size2D arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">Size for division</param>
+        /// <param name="arg2">The int value to scale the Size by</param>
+        /// <returns>A Size containing the result of the scaling</returns>
+        public static Size2D operator /(Size2D arg1, int arg2)
+        {
+            return arg1.Divide(arg2);
+        }
+
+        /// <summary>
+        /// Array subscript operator.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        /// <summary>
+        /// Get Size from pointer.
+        /// </summary>
+        /// <param name="cPtr">Pointer of the Size</param>
+        /// <returns>Size</returns>
+        internal static Size2D GetSize2DFromPtr(global::System.IntPtr cPtr)
+        {
+            Size2D ret = new Size2D(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public Size2D() : this(NDalicPINVOKE.new_Vector2__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="x">x (or width) component</param>
+        /// <param name="y">y (or height) component</param>
+        public Size2D(int x, int y) : this(NDalicPINVOKE.new_Vector2__SWIG_1((float)x, (float)y), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="size">Size with x (width), y (height), and z (depth)</param>
+        public Size2D(Size size) : this(NDalicPINVOKE.new_Vector2__SWIG_3(Size.getCPtr(size)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private Size2D Add(Size2D rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Add(swigCPtr, Size2D.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size2D Subtract(Size2D rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Size2D.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        private Size2D Multiply(Size2D rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Size2D.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size2D Multiply(int rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, (float)rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        private Size2D Divide(Size2D rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Size2D.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size2D Divide(int rhs)
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, (float)rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Size2D Subtract()
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check equality.
+        /// Utilizes appropriate machine epsilon values.
+        /// </summary>
+        /// <param name="rhs">The Size to test against</param>
+        /// <returns>True if the Sizes are equal</returns>
+        public bool EqualTo(Size2D rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Size2D.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Check inequality.
+        /// Utilizes appropriate machine epsilon values.
+        /// </summary>
+        /// <param name="rhs">The Size to test against</param>
+        /// <returns>True if the Sizes are not equal</returns>
+        public bool NotEqualTo(Size2D rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Size2D.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private int ValueOfIndex(uint index)
+        {
+            int ret = (int)NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Property for width component of Size
+        /// </summary>
+        public int Width
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_Width_set(swigCPtr, (float)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_Width_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return (int)ret;
+            }
+        }
+
+        /// <summary>
+        /// Property for height component of Size
+        /// </summary>
+        public int Height
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_Height_set(swigCPtr, (float)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_Height_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return (int)ret;
+            }
+        }
+
+        /// <summary>
+        /// Type cast operator, Size2D to Vector2.
+        /// </summary>
+        /// <param name="size">Object of Size2D type</param>
+        public static implicit operator Vector2(Size2D size)
+        {
+            return new Vector2((float)size.Width, (float)size.Height);
+        }
+
+        /// <summary>
+        /// Type cast operator, Vector2 to Size2D type.
+        /// </summary>
+        /// <param name="vec">Object of Vector2 type</param>
+        public static implicit operator Size2D(Vector2 vec)
+        {
+            return new Size2D((int)vec.X, (int)vec.Y);
+        }
+
+    }
+
+}
+
diff --git a/src/Tizen.NUI/devel-src/SizeScalePolicyType.cs b/src/Tizen.NUI/devel-src/SizeScalePolicyType.cs
deleted file mode 100755 (executable)
index d2f6f9f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum SizeScalePolicyType {
-  USE_SIZE_SET,
-  FIT_WITH_ASPECT_RATIO,
-  FILL_WITH_ASPECT_RATIO
-}
-
-}
index 9b93f37..06ba997 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
 
-using System;
-using System.Runtime.InteropServices;
+    /// <summary>
+    /// Slider is a control to enable sliding an indicator between two values.
+    /// </summary>
+    public class Slider : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
+        internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class Slider : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Slider obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~Slider()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Slider obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        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_Slider(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~Slider() {
-    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_Slider(swigCPtr);
+        /// <summary>
+        /// Value changed event arguments.
+        /// </summary>
+        public class ValueChangedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private float _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public float SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Sliding finished event arguments.
+        /// </summary>
+        public class SlidingFinishedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private float _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public float SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
+        }
 
+        /// <summary>
+        /// Mark reached event arguments.
+        /// </summary>
+        public class MarkReachedEventArgs : EventArgs
+        {
+            private Slider _slider;
+            private int _slideValue;
+
+            /// <summary>
+            /// Slider.
+            /// </summary>
+            public Slider Slider
+            {
+                get
+                {
+                    return _slider;
+                }
+                set
+                {
+                    _slider = value;
+                }
+            }
+
+            /// <summary>
+            /// Slider value.
+            /// </summary>
+            public int SlideValue
+            {
+                get
+                {
+                    return _slideValue;
+                }
+                set
+                {
+                    _slideValue = value;
+                }
+            }
+        }
 
-public class ValueChangedEventArgs : EventArgs
-{
-   private Slider _slider;
-   private float _slideValue;
-
-   public Slider Slider
-   {
-      get
-      {
-         return _slider;
-      }
-      set
-      {
-         _slider = value;
-      }
-   }
-
-   public float SlideValue
-   {
-      get
-      {
-         return _slideValue;
-      }
-      set
-      {
-         _slideValue = value;
-      }
-   }
-}
 
-public class SlidingFinishedEventArgs : EventArgs
-{
-   private Slider _slider;
-   private float _slideValue;
-
-   public Slider Slider
-   {
-      get
-      {
-         return _slider;
-      }
-      set
-      {
-         _slider = value;
-      }
-   }
-
-   public float SlideValue
-   {
-      get
-      {
-         return _slideValue;
-      }
-      set
-      {
-         _slideValue = value;
-      }
-   }
-}
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool ValueChangedCallbackDelegate(IntPtr slider, float slideValue);
+        private EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> _sliderValueChangedEventHandler;
+        private ValueChangedCallbackDelegate _sliderValueChangedCallbackDelegate;
 
-public class MarkReachedEventArgs : EventArgs
-{
-   private Slider _slider;
-   private int _slideValue;
-
-   public Slider Slider
-   {
-      get
-      {
-         return _slider;
-      }
-      set
-      {
-         _slider = value;
-      }
-   }
-
-   public int SlideValue
-   {
-      get
-      {
-         return _slideValue;
-      }
-      set
-      {
-         _slideValue = value;
-      }
-   }
-}
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool SlidingFinishedCallbackDelegate(IntPtr slider, float slideValue);
+        private EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> _sliderSlidingFinishedEventHandler;
+        private SlidingFinishedCallbackDelegate _sliderSlidingFinishedCallbackDelegate;
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool MarkReachedCallbackDelegate(IntPtr slider, int slideValue);
+        private EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> _sliderMarkReachedEventHandler;
+        private MarkReachedCallbackDelegate _sliderMarkReachedCallbackDelegate;
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool ValueChangedCallbackDelegate(IntPtr slider, float slideValue);
-  private DaliEventHandlerWithReturnType<object,ValueChangedEventArgs,bool> _sliderValueChangedEventHandler;
-  private ValueChangedCallbackDelegate _sliderValueChangedCallbackDelegate;
+        /// <summary>
+        /// Event emitted when the slider value changes.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, ValueChangedEventArgs, bool> ValueChanged
+        {
+            add
+            {
+                if (_sliderValueChangedEventHandler == null)
+                {
+                    _sliderValueChangedCallbackDelegate = (OnValueChanged);
+                    ValueChangedSignal().Connect(_sliderValueChangedCallbackDelegate);
+                }
+                _sliderValueChangedEventHandler += value;
+            }
+            remove
+            {
+                _sliderValueChangedEventHandler -= value;
+                if (_sliderValueChangedEventHandler == null && _sliderValueChangedCallbackDelegate != null)
+                {
+                    ValueChangedSignal().Disconnect(_sliderValueChangedCallbackDelegate);
+                }
+            }
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool SlidingFinishedCallbackDelegate(IntPtr slider, float slideValue);
-  private DaliEventHandlerWithReturnType<object,SlidingFinishedEventArgs,bool> _sliderSlidingFinishedEventHandler;
-  private SlidingFinishedCallbackDelegate _sliderSlidingFinishedCallbackDelegate;
-
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate bool MarkReachedCallbackDelegate(IntPtr slider, int slideValue);
-  private DaliEventHandlerWithReturnType<object,MarkReachedEventArgs,bool> _sliderMarkReachedEventHandler;
-  private MarkReachedCallbackDelegate _sliderMarkReachedCallbackDelegate;
-
-  public event DaliEventHandlerWithReturnType<object,ValueChangedEventArgs,bool> ValueChanged
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_sliderValueChangedEventHandler == null)
-           {
-              _sliderValueChangedEventHandler += value;
-
-              _sliderValueChangedCallbackDelegate = new ValueChangedCallbackDelegate(OnValueChanged);
-              this.ValueChangedSignal().Connect(_sliderValueChangedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_sliderValueChangedEventHandler != null)
-           {
-              this.ValueChangedSignal().Disconnect(_sliderValueChangedCallbackDelegate);
-           }
-
-           _sliderValueChangedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Slider ValueChanged signal
-  private bool OnValueChanged(IntPtr slider, float slideValue)
-  {
-     ValueChangedEventArgs e = new ValueChangedEventArgs();
-
-     // Populate all members of "e" (ValueChangedEventArgs) with real page
-     e.Slider = Slider.GetSliderFromPtr( slider );
-     e.SlideValue = slideValue;
-
-     if (_sliderValueChangedEventHandler != null)
-     {
-        //here we send all page to user event handlers
-      return _sliderValueChangedEventHandler(this, e);
-     }
-     return false;
-  }
-
-  public event DaliEventHandlerWithReturnType<object,SlidingFinishedEventArgs,bool> SlidingFinished
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_sliderSlidingFinishedEventHandler == null)
-           {
-              _sliderSlidingFinishedEventHandler += value;
-
-              _sliderSlidingFinishedCallbackDelegate = new SlidingFinishedCallbackDelegate(OnSlidingFinished);
-              this.SlidingFinishedSignal().Connect(_sliderSlidingFinishedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_sliderSlidingFinishedEventHandler != null)
-           {
-              this.SlidingFinishedSignal().Disconnect(_sliderSlidingFinishedCallbackDelegate);
-           }
-
-           _sliderSlidingFinishedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Slider SlidingFinished signal
-  private bool OnSlidingFinished(IntPtr slider, float slideValue)
-  {
-     SlidingFinishedEventArgs e = new SlidingFinishedEventArgs();
-
-     // Populate all members of "e" (SlidingFinishedEventArgs) with real page
-     e.Slider = Slider.GetSliderFromPtr( slider );
-     e.SlideValue = slideValue;
-
-     if (_sliderSlidingFinishedEventHandler != null)
-     {
-        //here we send all page to user event handlers
-      return _sliderSlidingFinishedEventHandler(this, e);
-     }
-     return false;
-  }
-
-  public event DaliEventHandlerWithReturnType<object,MarkReachedEventArgs,bool> MarkReached
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_sliderMarkReachedEventHandler == null)
-           {
-              _sliderMarkReachedEventHandler += value;
-
-              _sliderMarkReachedCallbackDelegate = new MarkReachedCallbackDelegate(OnMarkReached);
-              this.MarkReachedSignal().Connect(_sliderMarkReachedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_sliderMarkReachedEventHandler != null)
-           {
-              this.MarkReachedSignal().Disconnect(_sliderMarkReachedCallbackDelegate);
-           }
-
-           _sliderMarkReachedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Slider MarkReached signal
-  private bool OnMarkReached(IntPtr slider, int slideValue)
-  {
-     MarkReachedEventArgs e = new MarkReachedEventArgs();
-
-     // Populate all members of "e" (MarkReachedEventArgs) with real page
-     e.Slider = Slider.GetSliderFromPtr( slider );
-     e.SlideValue = slideValue;
-
-     if (_sliderMarkReachedEventHandler != null)
-     {
-        //here we send all page to user event handlers
-      return _sliderMarkReachedEventHandler(this, e);
-     }
-     return false;
-  }
-
-  public static Slider GetSliderFromPtr(global::System.IntPtr cPtr) {
-    Slider ret = new Slider(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_Slider_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_Slider_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int LOWER_BOUND = NDalicPINVOKE.Slider_Property_LOWER_BOUND_get();
-    public static readonly int UPPER_BOUND = NDalicPINVOKE.Slider_Property_UPPER_BOUND_get();
-    public static readonly int VALUE = NDalicPINVOKE.Slider_Property_VALUE_get();
-    public static readonly int TRACK_VISUAL = NDalicPINVOKE.Slider_Property_TRACK_VISUAL_get();
-    public static readonly int HANDLE_VISUAL = NDalicPINVOKE.Slider_Property_HANDLE_VISUAL_get();
-    public static readonly int PROGRESS_VISUAL = NDalicPINVOKE.Slider_Property_PROGRESS_VISUAL_get();
-    public static readonly int POPUP_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_VISUAL_get();
-    public static readonly int POPUP_ARROW_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_ARROW_VISUAL_get();
-    public static readonly int DISABLED_COLOR = NDalicPINVOKE.Slider_Property_DISABLED_COLOR_get();
-    public static readonly int VALUE_PRECISION = NDalicPINVOKE.Slider_Property_VALUE_PRECISION_get();
-    public static readonly int SHOW_POPUP = NDalicPINVOKE.Slider_Property_SHOW_POPUP_get();
-    public static readonly int SHOW_VALUE = NDalicPINVOKE.Slider_Property_SHOW_VALUE_get();
-    public static readonly int MARKS = NDalicPINVOKE.Slider_Property_MARKS_get();
-    public static readonly int SNAP_TO_MARKS = NDalicPINVOKE.Slider_Property_SNAP_TO_MARKS_get();
-    public static readonly int MARK_TOLERANCE = NDalicPINVOKE.Slider_Property_MARK_TOLERANCE_get();
-  
-  }
-
-  public Slider () : this (NDalicPINVOKE.Slider_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Slider(Slider handle) : this(NDalicPINVOKE.new_Slider__SWIG_1(Slider.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Slider Assign(Slider handle) {
-    Slider ret = new Slider(NDalicPINVOKE.Slider_Assign(swigCPtr, Slider.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static Slider DownCast(BaseHandle handle) {
-    Slider ret = new Slider(NDalicPINVOKE.Slider_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SliderValueChangedSignal ValueChangedSignal() {
-    SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_ValueChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SliderValueChangedSignal SlidingFinishedSignal() {
-    SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_SlidingFinishedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SliderMarkReachedSignal MarkReachedSignal() {
-    SliderMarkReachedSignal ret = new SliderMarkReachedSignal(NDalicPINVOKE.Slider_MarkReachedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public float LowerBound
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.LOWER_BOUND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.LOWER_BOUND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float UpperBound
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.UPPER_BOUND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.UPPER_BOUND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float Value
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.VALUE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map TrackVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Slider.Property.TRACK_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.TRACK_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map HandleVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Slider.Property.HANDLE_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.HANDLE_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map ProgressVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Slider.Property.PROGRESS_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.PROGRESS_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map PopupVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Slider.Property.POPUP_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.POPUP_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map PopupArrowVisual
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( Slider.Property.POPUP_ARROW_VISUAL).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.POPUP_ARROW_VISUAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 DisabledColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( Slider.Property.DISABLED_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.DISABLED_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int ValuePrecision
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( Slider.Property.VALUE_PRECISION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.VALUE_PRECISION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool ShowPopup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SHOW_POPUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SHOW_POPUP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool ShowValue
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SHOW_VALUE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SHOW_VALUE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Array Marks
-  {
-    get
-    {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
-      GetProperty( Slider.Property.MARKS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.MARKS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool SnapToMarks
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( Slider.Property.SNAP_TO_MARKS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.SNAP_TO_MARKS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float MarkTolerance
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( Slider.Property.MARK_TOLERANCE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( Slider.Property.MARK_TOLERANCE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        // Callback for Slider ValueChanged signal
+        private bool OnValueChanged(IntPtr slider, float slideValue)
+        {
+            ValueChangedEventArgs e = new ValueChangedEventArgs();
+
+            // Populate all members of "e" (ValueChangedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderValueChangedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderValueChangedEventHandler(this, e);
+            }
+            return false;
+        }
 
-}
+        /// <summary>
+        /// Event emitted when the sliding is finished.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, SlidingFinishedEventArgs, bool> SlidingFinished
+        {
+            add
+            {
+                if (_sliderSlidingFinishedEventHandler == null)
+                {
+                    _sliderSlidingFinishedCallbackDelegate = (OnSlidingFinished);
+                    SlidingFinishedSignal().Connect(_sliderSlidingFinishedCallbackDelegate);
+                }
+                _sliderSlidingFinishedEventHandler += value;
+            }
+            remove
+            {
+                _sliderSlidingFinishedEventHandler -= value;
+                if (_sliderSlidingFinishedEventHandler == null && _sliderSlidingFinishedCallbackDelegate != null)
+                {
+                    SlidingFinishedSignal().Disconnect(_sliderSlidingFinishedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Slider SlidingFinished signal
+        private bool OnSlidingFinished(IntPtr slider, float slideValue)
+        {
+            SlidingFinishedEventArgs e = new SlidingFinishedEventArgs();
+
+            // Populate all members of "e" (SlidingFinishedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderSlidingFinishedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderSlidingFinishedEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Event emitted when the slider handle reaches a mark.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, MarkReachedEventArgs, bool> MarkReached
+        {
+            add
+            {
+                if (_sliderMarkReachedEventHandler == null)
+                {
+                    _sliderMarkReachedCallbackDelegate = (OnMarkReached);
+                    MarkReachedSignal().Connect(_sliderMarkReachedCallbackDelegate);
+                }
+                _sliderMarkReachedEventHandler += value;
+            }
+            remove
+            {
+                _sliderMarkReachedEventHandler -= value;
+                if (_sliderMarkReachedEventHandler == null && _sliderMarkReachedCallbackDelegate != null)
+                {
+                    MarkReachedSignal().Disconnect(_sliderMarkReachedCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Slider MarkReached signal
+        private bool OnMarkReached(IntPtr slider, int slideValue)
+        {
+            MarkReachedEventArgs e = new MarkReachedEventArgs();
+
+            // Populate all members of "e" (MarkReachedEventArgs) with real page
+            e.Slider = Slider.GetSliderFromPtr(slider);
+            e.SlideValue = slideValue;
+
+            if (_sliderMarkReachedEventHandler != null)
+            {
+                //here we send all page to user event handlers
+                return _sliderMarkReachedEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Get Slider from the pointer.
+        /// </summary>
+        /// <param name="cPtr">The pointer of Slider</param>
+        /// <returns>Object of Slider type</returns>
+        internal static Slider GetSliderFromPtr(global::System.IntPtr cPtr)
+        {
+            Slider ret = new Slider(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_Slider_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_Slider_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int LOWER_BOUND = NDalicPINVOKE.Slider_Property_LOWER_BOUND_get();
+            internal static readonly int UPPER_BOUND = NDalicPINVOKE.Slider_Property_UPPER_BOUND_get();
+            internal static readonly int VALUE = NDalicPINVOKE.Slider_Property_VALUE_get();
+            internal static readonly int TRACK_VISUAL = NDalicPINVOKE.Slider_Property_TRACK_VISUAL_get();
+            internal static readonly int HANDLE_VISUAL = NDalicPINVOKE.Slider_Property_HANDLE_VISUAL_get();
+            internal static readonly int PROGRESS_VISUAL = NDalicPINVOKE.Slider_Property_PROGRESS_VISUAL_get();
+            internal static readonly int POPUP_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_VISUAL_get();
+            internal static readonly int POPUP_ARROW_VISUAL = NDalicPINVOKE.Slider_Property_POPUP_ARROW_VISUAL_get();
+            internal static readonly int DISABLED_COLOR = NDalicPINVOKE.Slider_Property_DISABLED_COLOR_get();
+            internal static readonly int VALUE_PRECISION = NDalicPINVOKE.Slider_Property_VALUE_PRECISION_get();
+            internal static readonly int SHOW_POPUP = NDalicPINVOKE.Slider_Property_SHOW_POPUP_get();
+            internal static readonly int SHOW_VALUE = NDalicPINVOKE.Slider_Property_SHOW_VALUE_get();
+            internal static readonly int MARKS = NDalicPINVOKE.Slider_Property_MARKS_get();
+            internal static readonly int SNAP_TO_MARKS = NDalicPINVOKE.Slider_Property_SNAP_TO_MARKS_get();
+            internal static readonly int MARK_TOLERANCE = NDalicPINVOKE.Slider_Property_MARK_TOLERANCE_get();
+
+        }
+
+        /// <summary>
+        /// Creates the Slider control.
+        /// </summary>
+        public Slider() : this(NDalicPINVOKE.Slider_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal Slider(Slider handle) : this(NDalicPINVOKE.new_Slider__SWIG_1(Slider.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Slider Assign(Slider handle)
+        {
+            Slider ret = new Slider(NDalicPINVOKE.Slider_Assign(swigCPtr, Slider.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts an Object handle to Slider.
+        /// If handle points to a Slider, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a Slider or an uninitialized handle</returns>
+        public new static Slider DownCast(BaseHandle handle)
+        {
+            Slider ret = new Slider(NDalicPINVOKE.Slider_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderValueChangedSignal ValueChangedSignal()
+        {
+            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_ValueChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderValueChangedSignal SlidingFinishedSignal()
+        {
+            SliderValueChangedSignal ret = new SliderValueChangedSignal(NDalicPINVOKE.Slider_SlidingFinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SliderMarkReachedSignal MarkReachedSignal()
+        {
+            SliderMarkReachedSignal ret = new SliderMarkReachedSignal(NDalicPINVOKE.Slider_MarkReachedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Lower bound property
+        /// </summary>
+        public float LowerBound
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.LOWER_BOUND).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.LOWER_BOUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Upper bound property
+        /// </summary>
+        public float UpperBound
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.UPPER_BOUND).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.UPPER_BOUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Value property
+        /// </summary>
+        public float Value
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.VALUE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Track visual property
+        /// </summary>
+        public PropertyMap TrackVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.TRACK_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.TRACK_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Handle visual property
+        /// </summary>
+        public PropertyMap HandleVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.HANDLE_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.HANDLE_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Progress visual property
+        /// </summary>
+        public PropertyMap ProgressVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.PROGRESS_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.PROGRESS_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Popup visual property
+        /// </summary>
+        public PropertyMap PopupVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.POPUP_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.POPUP_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Popup arrow visual property
+        /// </summary>
+        public PropertyMap PopupArrowVisual
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(Slider.Property.POPUP_ARROW_VISUAL).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.POPUP_ARROW_VISUAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Disable color property
+        /// </summary>
+        public Vector4 DisabledColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(Slider.Property.DISABLED_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.DISABLED_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Value presicion property
+        /// </summary>
+        public int ValuePrecision
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(Slider.Property.VALUE_PRECISION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.VALUE_PRECISION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Show popup property
+        /// </summary>
+        public bool ShowPopup
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SHOW_POPUP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SHOW_POPUP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Show value property
+        /// </summary>
+        public bool ShowValue
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SHOW_VALUE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SHOW_VALUE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Marks property
+        /// </summary>
+        public Tizen.NUI.PropertyArray Marks
+        {
+            get
+            {
+                Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
+                GetProperty(Slider.Property.MARKS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.MARKS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Snap to marks property
+        /// </summary>
+        public bool SnapToMarks
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(Slider.Property.SNAP_TO_MARKS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.SNAP_TO_MARKS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Mark tolerance property
+        /// </summary>
+        public float MarkTolerance
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(Slider.Property.MARK_TOLERANCE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(Slider.Property.MARK_TOLERANCE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index beed0ea..366bcb6 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SliderMarkReachedSignal : global::System.IDisposable {
+    internal class SliderMarkReachedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index e3082a0..67f5763 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SliderValueChangedSignal : global::System.IDisposable {
+    internal class SliderValueChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 1212582..e00d8e9 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class SlotObserver : global::System.IDisposable {
+    internal class SlotObserver : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 8b4a060..83b3413 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum SnapType {
+    internal enum SnapType {
   Snap,
   Flick
 }
index 4fe51d9..727c724 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// The Stage is a top-level object used for displaying a tree of Actors.
+    /// Stage is a top-level object that represents the entire screen.
+    /// It is used for displaying a hierarchy of actors managed by the scene graph structure,
+    /// which means an actor inherits a position relative to its parent,
+    /// and can be moved in relation to this point.
+    /// The stage instance is a singleton object (the only instance of its class during the
+    /// lifetime of the program). You can get it using a static function.
+    /// To display the contents of an actor, it must be added to a stage.
+    /// </summary>
+    public class Stage : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Stage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Stage_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-using System;
-using System.Runtime.InteropServices;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Stage obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
+        ~Stage()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        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_Stage(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-public class Stage : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        /// <summary>
+        /// Touch event argument.
+        /// </summary>
+        public class TouchEventArgs : EventArgs
+        {
+            private Touch _touch;
+
+            /// <summary>
+            /// Touch.
+            /// </summary>
+            public Touch Touch
+            {
+                get
+                {
+                    return _touch;
+                }
+                set
+                {
+                    _touch = value;
+                }
+            }
+        }
 
-  internal Stage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Stage_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        private event EventHandler<TouchEventArgs> _stageTouchHandler;
+        private EventCallbackDelegateType1 _stageTouchCallbackDelegate;
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Stage obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// This is emitted when the screen is touched and when the touch ends.
+        /// If there are multiple touch points, then this will be emitted when the first touch occurs and
+        /// then when the last finger is lifted.
+        /// An interrupted event will also be emitted (if it occurs).
+        /// </summary>
+        public event EventHandler<TouchEventArgs> Touch
+        {
+            add
+            {
+                if (_stageTouchHandler == null)
+                {
+                    _stageTouchCallbackDelegate = OnStageTouch;
+                    TouchSignal().Connect(_stageTouchCallbackDelegate);
+                }
+                _stageTouchHandler += value;
+            }
+            remove
+            {
+                _stageTouchHandler -= value;
+                if (_stageTouchHandler == null && _stageTouchCallbackDelegate != null)
+                {
+                    TouchSignal().Disconnect(_stageTouchCallbackDelegate);
+                }
+            }
+        }
 
-  ~Stage() {
-    DisposeQueue.Instance.Add(this);
-  }
+        private void OnStageTouch(IntPtr data)
+        {
+            TouchEventArgs e = new TouchEventArgs();
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+            if (data != null)
+            {
+                e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(data);
+            }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Stage(swigCPtr);
+            if (_stageTouchHandler != null)
+            {
+                _stageTouchHandler(this, e);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Wheel event arguments.
+        /// </summary>
+        public class WheelEventArgs : EventArgs
+        {
+            private Wheel _wheel;
+
+            /// <summary>
+            /// Wheel.
+            /// </summary>
+            public Wheel Wheel
+            {
+                get
+                {
+                    return _wheel;
+                }
+                set
+                {
+                    _wheel = value;
+                }
+            }
+        }
 
+        private event EventHandler<WheelEventArgs> _stageWheelHandler;
+        private EventCallbackDelegateType1 _stageWheelCallbackDelegate;
 
+        /// <summary>
+        /// Event emitted when wheel event is received.
+        /// </summary>
+        public event EventHandler<WheelEventArgs> Wheel
+        {
+            add
+            {
+                if (_stageWheelHandler == null)
+                {
+                    _stageWheelCallbackDelegate = OnStageWheel;
+                    WheelEventSignal().Connect(_stageWheelCallbackDelegate);
+                }
+                _stageWheelHandler += value;
+            }
+            remove
+            {
+                _stageWheelHandler -= value;
+                if (_stageWheelHandler == null && _stageWheelCallbackDelegate != null)
+                {
+                    WheelEventSignal().Disconnect(_stageWheelCallbackDelegate);
+                }
+            }
+        }
 
-  /**
-    * @brief Event arguments that passed via Touch signal
-    *
-    */
-  public class TouchEventArgs : EventArgs
-  {
-     private Touch _touch;
+        private void OnStageWheel(IntPtr data)
+        {
+            WheelEventArgs e = new WheelEventArgs();
+
+            if (data != null)
+            {
+                e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(data);
+            }
+
+            if (_stageWheelHandler != null)
+            {
+                _stageWheelHandler(this, e);
+            }
+        }
 
-     /**
-       * @brief Touch - contains the information of touch points
-       *
-       */
-     public Touch Touch
-     {
-        get
+        /// <summary>
+        /// Key event arguments.
+        /// </summary>
+        public class KeyEventArgs : EventArgs
         {
-           return _touch;
+            private Key _key;
+
+            /// <summary>
+            /// Key
+            /// </summary>
+            public Key Key
+            {
+                get
+                {
+                    return _key;
+                }
+                set
+                {
+                    _key = value;
+                }
+            }
         }
-        set
+
+        private event EventHandler<KeyEventArgs> _stageKeyHandler;
+        private EventCallbackDelegateType1 _stageKeyCallbackDelegate;
+
+        /// <summary>
+        /// Event emitted when key event is received.
+        /// </summary>
+        public event EventHandler<KeyEventArgs> Key
         {
-           _touch = value;
+            add
+            {
+                if (_stageKeyHandler == null)
+                {
+                    _stageKeyCallbackDelegate = OnStageKey;
+                    KeyEventSignal().Connect(_stageKeyCallbackDelegate);
+                }
+                _stageKeyHandler += value;
+            }
+            remove
+            {
+                _stageKeyHandler -= value;
+                if (_stageKeyHandler == null && _stageKeyCallbackDelegate != null)
+                {
+                    KeyEventSignal().Disconnect(_stageKeyCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Stage KeyEventsignal
+        private void OnStageKey(IntPtr data)
+        {
+            KeyEventArgs e = new KeyEventArgs();
+
+            if (data != null)
+            {
+                e.Key = Tizen.NUI.Key.GetKeyFromPtr(data);
+            }
+
+            if (_stageKeyHandler != null)
+            {
+                //here we send all data to user event handlers
+                _stageKeyHandler(this, e);
+            }
         }
-     }
-  }
 
-  private event EventHandler<TouchEventArgs> _stageTouchHandler;
-  private EventCallbackDelegateType1 _stageTouchCallbackDelegate;
 
-  /**
-    * @brief Event for TouchEvent signal which can be used to subscribe/unsubscribe the event handler
-    * TouchEvent signal is emitted when the screen is touched and when the touch ends
-    * (i.e. the down & up touch events only).
-    *
-    */
-  public event EventHandler<TouchEventArgs> Touch
-  {
-     add
-     {
-        lock(this)
+        private event EventHandler _stageEventProcessingFinishedEventHandler;
+        private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate;
+
+        internal event EventHandler EventProcessingFinished
         {
-          _stageTouchHandler += value;
-          _stageTouchCallbackDelegate = OnStageTouch;
-          this.TouchSignal().Connect(_stageTouchCallbackDelegate);
+            add
+            {
+                if (_stageEventProcessingFinishedEventHandler == null)
+                {
+                    _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished;
+                    EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate);
+                }
+                _stageEventProcessingFinishedEventHandler += value;
+
+            }
+            remove
+            {
+                _stageEventProcessingFinishedEventHandler -= value;
+                if (_stageEventProcessingFinishedEventHandler == null && _stageEventProcessingFinishedEventCallbackDelegate != null)
+                {
+                    EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
+                }
+            }
         }
-     }
-     remove
-     {
-        lock(this)
+
+        // Callback for Stage EventProcessingFinishedSignal
+        private void OnEventProcessingFinished()
         {
-           if (_stageTouchHandler != null)
-           {
-              this.TouchSignal().Disconnect(_stageTouchCallbackDelegate);
-           }
-           _stageTouchHandler -= value;
+            if (_stageEventProcessingFinishedEventHandler != null)
+            {
+                _stageEventProcessingFinishedEventHandler(this, null);
+            }
         }
-     }
-  }
 
-  private void OnStageTouch(IntPtr data)
-  {
-    TouchEventArgs e = new TouchEventArgs();
 
-    if( data != null )
-    {
-      e.Touch = Tizen.NUI.Touch.GetTouchFromPtr( data );
-    }
+        private EventHandler _stageContextLostEventHandler;
+        private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate;
 
-    if (_stageTouchHandler != null)
-    {
-      _stageTouchHandler(this, e);
-    }
-  }
-
-  /**
-    * @brief Wheel arguments that passed via Wheel signal
-    *
-    */
-  public class WheelEventArgs : EventArgs
-  {
-     private Wheel _wheel;
-
-     /**
-       * @brief Wheel - store a wheel rolling type MOUSE_WHEEL or CUSTOM_WHEEL
-       *
-       */
-     public Wheel Wheel
-     {
-        get
-        {
-           return _wheel;
-        }
-        set
-        {
-           _wheel = value;
-        }
-     }
-  }
-
-  private event EventHandler<WheelEventArgs> _stageWheelHandler;
-  private EventCallbackDelegateType1 _stageWheelCallbackDelegate;
-
-  /**
-    * @brief Event for Wheel signal which can be used to subscribe/unsubscribe the event handler
-    * Wheel signal is emitted is emitted when wheel event is received.
-    *
-    */
-  public event EventHandler<WheelEventArgs> Wheel
-  {
-     add
-     {
-        lock(this)
-        {
-          _stageWheelHandler += value;
-          _stageWheelCallbackDelegate = OnStageWheel;
-          this.WheelEventSignal().Connect(_stageWheelCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageWheelHandler != null)
-           {
-              this.WheelEventSignal().Disconnect(_stageWheelCallbackDelegate);
-           }
-           _stageWheelHandler -= value;
-        }
-     }
-  }
-
-  private void OnStageWheel(IntPtr data)
-  {
-    WheelEventArgs e = new WheelEventArgs();
-
-    if( data != null )
-    {
-      e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr( data );
-    }
+        internal event EventHandler ContextLost
+        {
+            add
+            {
+                if (_stageContextLostEventHandler == null)
+                {
+                    _stageContextLostEventCallbackDelegate = OnContextLost;
+                    ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate);
+                }
+                _stageContextLostEventHandler += value;
+            }
+            remove
+            {
+                _stageContextLostEventHandler -= value;
+                if (_stageContextLostEventHandler == null && _stageContextLostEventCallbackDelegate != null)
+                {
+                    ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate);
+                }
+            }
+        }
 
-    if (_stageWheelHandler != null)
-    {
-      _stageWheelHandler(this, e);
-    }
-  }
-
-  /**
-    * @brief Event arguments that passed via Key signal
-    *
-    */
-  public class KeyEventArgs : EventArgs
-  {
-     private Key _key;
-
-     /**
-       * @brief Key - is the keyevent sent to Stage.
-       *
-       */
-     public Key Key
-     {
-        get
-        {
-           return _key;
-        }
-        set
-        {
-           _key = value;
-        }
-     }
-  }
-
-  private event EventHandler<KeyEventArgs> _stageKeyHandler;
-  private EventCallbackDelegateType1 _stageKeyCallbackDelegate;
-
-  /**
-    * @brief Event for Key signal which can be used to subscribe/unsubscribe the event handler
-    * Key signal is emitted is emitted when key event is received.
-    *
-    */
-  public event EventHandler<KeyEventArgs> Key
-  {
-     add
-     {
-        lock(this)
-        {
-            _stageKeyHandler += value;
-            _stageKeyCallbackDelegate = OnStageKey;
-            this.KeyEventSignal().Connect(_stageKeyCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageKeyHandler != null)
-           {
-              this.KeyEventSignal().Disconnect(_stageKeyCallbackDelegate);
-           }
-           _stageKeyHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Stage KeyEventsignal
-  private void OnStageKey(IntPtr data)
-  {
-    KeyEventArgs e = new KeyEventArgs();
-
-    if( data != null )
-    {
-      e.Key = Tizen.NUI.Key.GetKeyFromPtr( data );
-    }
+        // Callback for Stage ContextLostSignal
+        private void OnContextLost()
+        {
+            if (_stageContextLostEventHandler != null)
+            {
+                _stageContextLostEventHandler(this, null);
+            }
+        }
 
-    if (_stageKeyHandler != null)
-    {
-      //here we send all data to user event handlers
-      _stageKeyHandler(this, e);
-    }
-  }
-
-
-  private event EventHandler _stageEventProcessingFinishedEventHandler;
-  private EventCallbackDelegateType0 _stageEventProcessingFinishedEventCallbackDelegate;
-
-  /**
-    * @brief Event for EventProcessingFinished signal which can be used to subscribe/unsubscribe the event handler
-    * provided by the user. EventProcessingFinished signal is emitted just after the event processing is finished.
-    *
-    */
-  public event EventHandler EventProcessingFinished
-  {
-     add
-     {
-        lock(this)
-        {
-          _stageEventProcessingFinishedEventHandler += value;
-          _stageEventProcessingFinishedEventCallbackDelegate = OnEventProcessingFinished;
-          this.EventProcessingFinishedSignal().Connect(_stageEventProcessingFinishedEventCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageEventProcessingFinishedEventHandler != null)
-           {
-              this.EventProcessingFinishedSignal().Disconnect(_stageEventProcessingFinishedEventCallbackDelegate);
-           }
-           _stageEventProcessingFinishedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Stage EventProcessingFinishedSignal
-  private void OnEventProcessingFinished()
-  {
-     if (_stageEventProcessingFinishedEventHandler != null)
-     {
-        _stageEventProcessingFinishedEventHandler(this, null);
-     }
-  }
-
-
-  private EventHandler _stageContextLostEventHandler;
-  private EventCallbackDelegateType0 _stageContextLostEventCallbackDelegate;
-
-  /**
-    * @brief Event for ContextLost signal which can be used to subscribe/unsubscribe the event handler
-    * ContextLost signal is emitted when the GL context is lost (Platform specific behaviour).
-    *
-    */
-  public event EventHandler ContextLost
-  {
-     add
-     {
-        lock(this)
-        {
-            _stageContextLostEventHandler += value;
-            _stageContextLostEventCallbackDelegate = OnContextLost;
-            this.ContextLostSignal().Connect(_stageContextLostEventCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageContextLostEventHandler != null)
-           {
-              this.ContextLostSignal().Disconnect(_stageContextLostEventCallbackDelegate);
-           }
-
-           _stageContextLostEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Stage ContextLostSignal
-  private void OnContextLost()
-  {
-     if (_stageContextLostEventHandler != null)
-     {
-        _stageContextLostEventHandler(this, null);
-     }
-  }
-
-
-  private EventHandler _stageContextRegainedEventHandler;
-  private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate;
-
-  /**
-    * @brief Event for ContextRegained signal which can be used to subscribe/unsubscribe the event handler
-    * provided by the user. ContextRegained signal is emitted when the GL context is regained (Platform specific
-    * behaviour).
-    *
-    */
-  public event EventHandler ContextRegained
-  {
-     add
-     {
-        lock(this)
-        {
-            _stageContextRegainedEventHandler += value;
-            _stageContextRegainedEventCallbackDelegate = OnContextRegained;
-            this.ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageContextRegainedEventHandler != null)
-           {
-              this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate);
-           }
-
-           _stageContextRegainedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Stage ContextRegainedSignal
-  private void OnContextRegained()
-  {
-     if (_stageContextRegainedEventHandler != null)
-     {
-        _stageContextRegainedEventHandler(this, null);
-     }
-  }
-
-
-  private EventHandler _stageSceneCreatedEventHandler;
-  private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate;
-
-  /**
-    * @brief Event for SceneCreated signal which can be used to subscribe/unsubscribe the event handler
-    * SceneCreated signal is emitted after the initial scene is created.
-    *
-    */
-  public event EventHandler SceneCreated
-  {
-     add
-     {
-        lock(this)
-        {
-            _stageSceneCreatedEventHandler += value;
-            _stageSceneCreatedEventCallbackDelegate = OnSceneCreated;
-            this.SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate);
-        }
-     }
-     remove
-     {
-        lock(this)
-        {
-           if (_stageSceneCreatedEventHandler != null)
-           {
-              this.SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate);
-           }
-
-           _stageSceneCreatedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for Stage SceneCreatedSignal
-  private void OnSceneCreated()
-  {
-     if (_stageSceneCreatedEventHandler != null)
-     {
-        _stageSceneCreatedEventHandler(this, null);
-     }
-  }
-
-
-  public Vector2 Size
-  {
-     get
-     {
-        Vector2 ret = GetSize();
-        return ret;
-     }
-  }
-
-  public Vector4 BackgroundColor
-  {
-     set
-     {
-        SetBackgroundColor(value);
-     }
-     get
-     {
-        Vector4 ret = GetBackgroundColor();
-        return ret;
-     }
-   }
-
-  private static readonly Stage instance = Stage.GetCurrent();
-
-  public static Stage Instance
-  {
-      get
-      {
-          return instance;
-      }
-  }
-
-  public Layer GetDefaultLayer()
-  {
-    return this.GetRootLayer();
-  }
-
-  public void AddLayer(Layer layer)
-  {
-    this.Add( (Actor)layer );
-  }
-
-  public void RemoveLayer(Layer layer)
-  {
-    this.Remove( (Actor)layer );
-  }
-
-
-
-  public static Vector4 DEFAULT_BACKGROUND_COLOR {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector4 DEBUG_BACKGROUND_COLOR {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public Stage() : this(NDalicPINVOKE.new_Stage__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Stage GetCurrent() {
-    Stage ret = new Stage(NDalicPINVOKE.Stage_GetCurrent(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static bool IsInstalled() {
-    bool ret = NDalicPINVOKE.Stage_IsInstalled();
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Stage(Stage handle) : this(NDalicPINVOKE.new_Stage__SWIG_1(Stage.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Stage Assign(Stage rhs) {
-    Stage ret = new Stage(NDalicPINVOKE.Stage_Assign(swigCPtr, Stage.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Add(Actor actor) {
-    NDalicPINVOKE.Stage_Add(swigCPtr, Actor.getCPtr(actor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Remove(Actor actor) {
-    NDalicPINVOKE.Stage_Remove(swigCPtr, Actor.getCPtr(actor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 GetSize() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetSize(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public RenderTaskList GetRenderTaskList() {
-    RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetLayerCount() {
-    uint ret = NDalicPINVOKE.Stage_GetLayerCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Layer GetLayer(uint depth) {
-    Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(swigCPtr, depth), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Layer GetRootLayer() {
-    Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundColor(Vector4 color) {
-    NDalicPINVOKE.Stage_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetBackgroundColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Stage_GetBackgroundColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetDpi() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public ObjectRegistry GetObjectRegistry() {
-    ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void KeepRendering(float durationSeconds) {
-    NDalicPINVOKE.Stage_KeepRendering(swigCPtr, durationSeconds);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public KeyEventSignal KeyEventSignal() {
-    KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal EventProcessingFinishedSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TouchSignal TouchSignal() {
-    TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public StageWheelSignal WheelEventSignal() {
-    StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal ContextLostSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal ContextRegainedSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VoidSignal SceneCreatedSignal() {
-    VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
 
-}
+        private EventHandler _stageContextRegainedEventHandler;
+        private EventCallbackDelegateType0 _stageContextRegainedEventCallbackDelegate;
+
+        internal event EventHandler ContextRegained
+        {
+            add
+            {
+                if (_stageContextRegainedEventHandler == null)
+                {
+                    _stageContextRegainedEventCallbackDelegate = OnContextRegained;
+                    ContextRegainedSignal().Connect(_stageContextRegainedEventCallbackDelegate);
+                }
+                _stageContextRegainedEventHandler += value;
+            }
+            remove
+            {
+                _stageContextRegainedEventHandler -= value;
+                if (_stageContextRegainedEventHandler == null && _stageContextRegainedEventCallbackDelegate != null)
+                {
+                    this.ContextRegainedSignal().Disconnect(_stageContextRegainedEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Stage ContextRegainedSignal
+        private void OnContextRegained()
+        {
+            if (_stageContextRegainedEventHandler != null)
+            {
+                _stageContextRegainedEventHandler(this, null);
+            }
+        }
+
+
+        private EventHandler _stageSceneCreatedEventHandler;
+        private EventCallbackDelegateType0 _stageSceneCreatedEventCallbackDelegate;
+
+        internal event EventHandler SceneCreated
+        {
+            add
+            {
+                if (_stageSceneCreatedEventHandler == null)
+                {
+                    _stageSceneCreatedEventCallbackDelegate = OnSceneCreated;
+                    SceneCreatedSignal().Connect(_stageSceneCreatedEventCallbackDelegate);
+                }
+                _stageSceneCreatedEventHandler += value;
+            }
+            remove
+            {
+                _stageSceneCreatedEventHandler -= value;
+                if (_stageSceneCreatedEventHandler == null && _stageSceneCreatedEventCallbackDelegate != null)
+                {
+                    SceneCreatedSignal().Disconnect(_stageSceneCreatedEventCallbackDelegate);
+                }
+            }
+        }
+
+        // Callback for Stage SceneCreatedSignal
+        private void OnSceneCreated()
+        {
+            if (_stageSceneCreatedEventHandler != null)
+            {
+                _stageSceneCreatedEventHandler(this, null);
+            }
+        }
+
+        /// <summary>
+        /// Stage size property (read-only).
+        /// </summary>
+        public Size2D Size
+        {
+            get
+            {
+                Size2D ret = GetSize();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Background color property.
+        /// </summary>
+        public Color BackgroundColor
+        {
+            set
+            {
+                SetBackgroundColor(value);
+            }
+            get
+            {
+                Color ret = GetBackgroundColor();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Dpi property (read-only).
+        /// Retrieves the DPI of the display device to which the stage is connected.
+        /// </summary>
+        public Vector2 Dpi
+        {
+            get
+            {
+                return GetDpi();
+            }
+        }
+
+        /// <summary>
+        /// Layer count property (read-only).
+        /// Queries the number of on-stage layers.
+        /// </summary>
+        public uint LayerCount
+        {
+            get
+            {
+                return GetLayerCount();
+            }
+        }
+
+        private static readonly Stage instance = Stage.GetCurrent();
+
+        /// <summary>
+        /// Stage instance property (read-only).
+        /// Gets the current Stage.
+        /// </summary>
+        public static Stage Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+        /// <summary>
+        /// Get default ( root ) layer.
+        /// </summary>
+        /// <returns>The root layer</returns>
+        public Layer GetDefaultLayer()
+        {
+            return this.GetRootLayer();
+        }
+
+        /// <summary>
+        /// Add layer to the Stage.
+        /// </summary>
+        /// <param name="layer">Layer to add</param>
+        public void AddLayer(Layer layer)
+        {
+            this.Add((Actor)layer);
+        }
+
+        /// <summary>
+        /// Remove layer from the Stage.
+        /// </summary>
+        /// <param name="layer">Layer to remove</param>
+        public void RemoveLayer(Layer layer)
+        {
+            this.Remove((Actor)layer);
+        }
+
+        internal static Vector4 DEFAULT_BACKGROUND_COLOR
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal static Vector4 DEBUG_BACKGROUND_COLOR
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal Stage() : this(NDalicPINVOKE.new_Stage__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal static Stage GetCurrent()
+        {
+            Stage ret = new Stage(NDalicPINVOKE.Stage_GetCurrent(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal static bool IsInstalled()
+        {
+            bool ret = NDalicPINVOKE.Stage_IsInstalled();
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Stage(Stage handle) : this(NDalicPINVOKE.new_Stage__SWIG_1(Stage.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Stage Assign(Stage rhs)
+        {
+            Stage ret = new Stage(NDalicPINVOKE.Stage_Assign(swigCPtr, Stage.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void Add(Actor actor)
+        {
+            NDalicPINVOKE.Stage_Add(swigCPtr, Actor.getCPtr(actor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void Remove(Actor actor)
+        {
+            NDalicPINVOKE.Stage_Remove(swigCPtr, Actor.getCPtr(actor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Size2D GetSize()
+        {
+            Size2D ret = new Size2D(NDalicPINVOKE.Stage_GetSize(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal RenderTaskList GetRenderTaskList()
+        {
+            RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal uint GetLayerCount()
+        {
+            uint ret = NDalicPINVOKE.Stage_GetLayerCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the layer at a specified depth.
+        /// </summary>
+        /// <param name="depth">The depth</param>
+        /// <returns>The layer found at the given depth</returns>
+        public Layer GetLayer(uint depth)
+        {
+            Layer ret = new Layer(NDalicPINVOKE.Stage_GetLayer(swigCPtr, depth), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Layer GetRootLayer()
+        {
+            Layer ret = new Layer(NDalicPINVOKE.Stage_GetRootLayer(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetBackgroundColor(Color color)
+        {
+            NDalicPINVOKE.Stage_SetBackgroundColor(swigCPtr, Color.getCPtr(color));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Color GetBackgroundColor()
+        {
+            Color ret = new Color(NDalicPINVOKE.Stage_GetBackgroundColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 GetDpi()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Stage_GetDpi(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal ObjectRegistry GetObjectRegistry()
+        {
+            ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Keep rendering for at least the given amount of time.
+        /// </summary>
+        /// <param name="durationSeconds">Time to keep rendering, 0 means render at least one more frame</param>
+        public void KeepRendering(float durationSeconds)
+        {
+            NDalicPINVOKE.Stage_KeepRendering(swigCPtr, durationSeconds);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal KeyEventSignal KeyEventSignal()
+        {
+            KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal EventProcessingFinishedSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal TouchSignal TouchSignal()
+        {
+            TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal StageWheelSignal WheelEventSignal()
+        {
+            StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal ContextLostSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal ContextRegainedSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VoidSignal SceneCreatedSignal()
+        {
+            VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
 
 }
index 009b598..0e45c1c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class StageWheelSignal : global::System.IDisposable {
+    internal class StageWheelSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index de74f13..613a778 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum StencilFunctionType {
+    internal enum StencilFunctionType {
   NEVER,
   LESS,
   EQUAL,
index 5c3431c..c78dbcf 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum StencilOperationType {
+    internal enum StencilOperationType {
   ZERO,
   KEEP,
   REPLACE,
index 4f83a6b..93fbcc3 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class StringValuePair : global::System.IDisposable {
+    internal class StringValuePair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -44,7 +44,7 @@ public class StringValuePair : global::System.IDisposable {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public StringValuePair(string t, Property.Value u) : this(NDalicPINVOKE.new_StringValuePair__SWIG_1(t, Property.Value.getCPtr(u)), true) {
+  public StringValuePair(string t, PropertyValue u) : this(NDalicPINVOKE.new_StringValuePair__SWIG_1(t, PropertyValue.getCPtr(u)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
@@ -64,14 +64,14 @@ public class StringValuePair : global::System.IDisposable {
     } 
   }
 
-  public Property.Value second {
+  public PropertyValue second {
     set {
-      NDalicPINVOKE.StringValuePair_second_set(swigCPtr, Property.Value.getCPtr(value));
+      NDalicPINVOKE.StringValuePair_second_set(swigCPtr, PropertyValue.getCPtr(value));
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     } 
     get {
       global::System.IntPtr cPtr = NDalicPINVOKE.StringValuePair_second_get(swigCPtr);
-      Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false);
+      PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
       return ret;
     } 
diff --git a/src/Tizen.NUI/devel-src/StyleChangeType.cs b/src/Tizen.NUI/devel-src/StyleChangeType.cs
deleted file mode 100755 (executable)
index cbef57b..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum StyleChangeType {
-  DEFAULT_FONT_CHANGE,
-  DEFAULT_FONT_SIZE_CHANGE,
-  THEME_CHANGE
-}
-
-}
index df28f69..4453263 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class StyleChangedSignal : global::System.IDisposable {
+    internal class StyleChangedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 1df4895..17ac80e 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// StyleManager informs applications of system theme change,
+    /// and supports application theme change at runtime.
+    /// Applies various styles to Controls using the properties system.
+    /// On theme change, it automatically updates all controls, then raises
+    /// a event to inform the application.
+    ///
+    /// If the application wants to customize the theme, RequestThemeChange
+    /// needs to be called.
+    /// It provides the path to the  application resource root folder, 
+    /// from there the filename can an be specified along with
+    /// any sub folders, e.g Images, Models etc.
+    /// </summary>
+    public class StyleManager : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal StyleManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.StyleManager_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class StyleManager : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(StyleManager obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal StyleManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.StyleManager_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~StyleManager()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(StyleManager obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        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_StyleManager(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~StyleManager() {
-    DisposeQueue.Instance.Add(this);
-  }
+        /// <summary>
+        /// Style changed event arguments
+        /// </summary>
+        public class StyleChangedEventArgs : EventArgs
+        {
+            private StyleManager _styleManager;
+            private StyleChangeType _styleChange;
+
+            /// <summary>
+            /// StyleManager.
+            /// </summary>
+            public StyleManager StyleManager
+            {
+                get
+                {
+                    return _styleManager;
+                }
+                set
+                {
+                    _styleManager = value;
+                }
+            }
+
+            /// <summary>
+            /// StyleChange - contains Style change information (default font changed or
+            /// default font size changed or theme has changed)
+            /// </summary>
+            public StyleChangeType StyleChange
+            {
+                get
+                {
+                    return _styleChange;
+                }
+                set
+                {
+                    _styleChange = value;
+                }
+            }
 
-  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_StyleManager(swigCPtr);
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void StyleChangedCallbackDelegate(IntPtr styleManager, Tizen.NUI.StyleChangeType styleChange);
+        private EventHandler<StyleChangedEventArgs> _styleManagerStyleChangedEventHandler;
+        private StyleChangedCallbackDelegate _styleManagerStyleChangedCallbackDelegate;
+
+        /// <summary>
+        /// Event for StyleChanged signal which can be used to subscribe/unsubscribe the
+        /// event handler provided by the user. 
+        /// StyleChanged signal is is emitted after the style (e.g. theme/font change) has changed
+        /// and the controls have been informed.
+        /// </summary>
+        public event EventHandler<StyleChangedEventArgs> StyleChanged
+        {
+            add
+            {
+                if (_styleManagerStyleChangedEventHandler == null)
+                {
+                    _styleManagerStyleChangedCallbackDelegate = (OnStyleChanged);
+                    StyleChangedSignal().Connect(_styleManagerStyleChangedCallbackDelegate);
+                }
+                _styleManagerStyleChangedEventHandler += value;
+            }
+            remove
+            {
+                _styleManagerStyleChangedEventHandler -= value;
+                if (_styleManagerStyleChangedEventHandler == null && _styleManagerStyleChangedCallbackDelegate != null)
+                {
+                    StyleChangedSignal().Disconnect(_styleManagerStyleChangedCallbackDelegate);
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        // Callback for StyleManager StyleChangedsignal
+        private void OnStyleChanged(IntPtr styleManager, StyleChangeType styleChange)
+        {
+            StyleChangedEventArgs e = new StyleChangedEventArgs();
 
+            // Populate all members of "e" (StyleChangedEventArgs) with real data
+            e.StyleManager = StyleManager.GetStyleManagerFromPtr(styleManager);
+            e.StyleChange = styleChange;
 
+            if (_styleManagerStyleChangedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _styleManagerStyleChangedEventHandler(this, e);
+            }
+        }
 
-/**
-  * @brief Event arguments that passed via StyleChanged signal
-  *
-  */
-public class StyleChangedEventArgs : EventArgs
-{
-   private StyleManager _styleManager;
-   private Tizen.NUI.StyleChangeType _styleChange;
-
-   /**
-     * @brief StyleManager - is the StyleManager that informs applications of system theme change,
-     * and supports application theme change at runtime.
-     *
-     */
-   public StyleManager StyleManager
-   {
-      get
-      {
-         return _styleManager;
-      }
-      set
-      {
-         _styleManager = value;
-      }
-   }
-
-   /**
-     * @brief StyleChange - contains Style change information (default font changed or
-     * default font size changed or theme has changed)
-     *
-     */
-   public Tizen.NUI.StyleChangeType StyleChange
-   {
-      get
-      {
-         return _styleChange;
-      }
-      set
-      {
-         _styleChange = value;
-      }
-   }
+        internal static StyleManager GetStyleManagerFromPtr(global::System.IntPtr cPtr)
+        {
+            StyleManager ret = new StyleManager(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        /// <summary>
+        /// Creates a StyleManager handle.
+        /// this can be initialized with StyleManager::Get().
+        /// </summary>
+        public StyleManager() : this(NDalicPINVOKE.new_StyleManager(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets the singleton of StyleManager object.
+        /// </summary>
+        /// <returns>A handle to the StyleManager control</returns>
+        public static StyleManager Get()
+        {
+            StyleManager ret = new StyleManager(NDalicPINVOKE.StyleManager_Get(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void StyleChangedCallbackDelegate(IntPtr styleManager, Tizen.NUI.StyleChangeType styleChange);
-  private DaliEventHandler<object,StyleChangedEventArgs> _styleManagerStyleChangedEventHandler;
-  private StyleChangedCallbackDelegate _styleManagerStyleChangedCallbackDelegate;
-
-  /**
-    * @brief Event for StyleChanged signal which can be used to subscribe/unsubscribe the
-    * event handler (in the type of StyleChangedEventHandler-DaliEventHandler<object,StyleChangedEventArgs>) 
-    * provided by the user. StyleChanged signal is is emitted after the style (e.g. theme/font change) has changed
-    * and the controls have been informed.
-    */
-  public event DaliEventHandler<object,StyleChangedEventArgs> StyleChanged
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_styleManagerStyleChangedEventHandler == null)
-           {
-              _styleManagerStyleChangedEventHandler += value;
-
-              _styleManagerStyleChangedCallbackDelegate = new StyleChangedCallbackDelegate(OnStyleChanged);
-              this.StyleChangedSignal().Connect(_styleManagerStyleChangedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_styleManagerStyleChangedEventHandler != null)
-           {
-              this.StyleChangedSignal().Disconnect(_styleManagerStyleChangedCallbackDelegate);
-           }
-
-           _styleManagerStyleChangedEventHandler -= value;
-        }
-     }
-  }
-
-  // Callback for StyleManager StyleChangedsignal
-  private void OnStyleChanged(IntPtr styleManager, Tizen.NUI.StyleChangeType styleChange)
-  {
-     StyleChangedEventArgs e = new StyleChangedEventArgs();
-
-     // Populate all members of "e" (StyleChangedEventArgs) with real data
-     e.StyleManager = StyleManager.GetStyleManagerFromPtr( styleManager );
-     e.StyleChange = styleChange;
-
-     if (_styleManagerStyleChangedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _styleManagerStyleChangedEventHandler(this, e);
-     }
-  }
-
-   public static StyleManager GetStyleManagerFromPtr(global::System.IntPtr cPtr) {
-      StyleManager ret = new StyleManager(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-   }
-
-
-  public StyleManager() : this(NDalicPINVOKE.new_StyleManager(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static StyleManager Get() {
-    StyleManager ret = new StyleManager(NDalicPINVOKE.StyleManager_Get(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ApplyTheme(string themeFile) {
-    NDalicPINVOKE.StyleManager_ApplyTheme(swigCPtr, themeFile);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void ApplyDefaultTheme() {
-    NDalicPINVOKE.StyleManager_ApplyDefaultTheme(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetStyleConstant(string key, Property.Value value) {
-    NDalicPINVOKE.StyleManager_SetStyleConstant(swigCPtr, key, Property.Value.getCPtr(value));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool GetStyleConstant(string key, Property.Value valueOut) {
-    bool ret = NDalicPINVOKE.StyleManager_GetStyleConstant(swigCPtr, key, Property.Value.getCPtr(valueOut));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ApplyStyle(View control, string jsonFileName, string styleName) {
-    NDalicPINVOKE.StyleManager_ApplyStyle(swigCPtr, View.getCPtr(control), jsonFileName, styleName);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public StyleChangedSignal StyleChangedSignal() {
-    StyleChangedSignal ret = new StyleChangedSignal(NDalicPINVOKE.StyleManager_StyleChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Applies a new theme to the application. 
+        /// This will be merged on top of the default Toolkit theme.
+        /// If the application theme file doesn't style all controls that the
+        /// application uses, then the default Toolkit theme will be used
+        /// instead for those controls.
+        /// </summary>
+        /// <param name="themeFile">A relative path is specified for style theme</param>
+        public void ApplyTheme(string themeFile)
+        {
+            NDalicPINVOKE.StyleManager_ApplyTheme(swigCPtr, themeFile);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Applies the default Toolkit theme.
+        /// </summary>
+        public void ApplyDefaultTheme()
+        {
+            NDalicPINVOKE.StyleManager_ApplyDefaultTheme(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sets a constant for use when building styles.
+        /// </summary>
+        /// <param name="key">The key of the constant</param>
+        /// <param name="value">The value of the constant</param>
+        public void SetStyleConstant(string key, PropertyValue value)
+        {
+            NDalicPINVOKE.StyleManager_SetStyleConstant(swigCPtr, key, PropertyValue.getCPtr(value));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Returns the style constant set for a specific key.
+        /// </summary>
+        /// <param name="key">The key of the constant</param>
+        /// <param name="valueOut">The value of the constant if it exists</param>
+        /// <returns></returns>
+        public bool GetStyleConstant(string key, PropertyValue valueOut)
+        {
+            bool ret = NDalicPINVOKE.StyleManager_GetStyleConstant(swigCPtr, key, PropertyValue.getCPtr(valueOut));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Applies the specified style to the control.
+        /// </summary>
+        /// <param name="control">The control to which to apply the style</param>
+        /// <param name="jsonFileName">The name of the JSON style file to apply</param>
+        /// <param name="styleName">The name of the style within the JSON file to apply</param>
+        public void ApplyStyle(View control, string jsonFileName, string styleName)
+        {
+            NDalicPINVOKE.StyleManager_ApplyStyle(swigCPtr, View.getCPtr(control), jsonFileName, styleName);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal StyleChangedSignal StyleChangedSignal()
+        {
+            StyleChangedSignal ret = new StyleChangedSignal(NDalicPINVOKE.StyleManager_StyleChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
+
+    /// <summary>
+    /// Types of style change.
+    /// </summary>
+    public enum StyleChangeType
+    {
+        DefaultFontChange,
+        DefaultFontSizeChange,
+        ThemeChange
+    }
 
 }
index 6cbda33..a82bb9e 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// TableView is a layout container for aligning child actors in a grid like layout.
+    /// TableView constrains the x and y position and width and height of the child actors.
+    /// z position and depth are left intact so that 3D model actors can also be laid out
+    /// in a grid without loosing their depth scaling.
+    /// </summary>
+    public class TableView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class TableView : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal TableView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TableView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal TableView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TableView_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TableView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TableView obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~TableView()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~TableView() {
-    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_TableView(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_TableView(swigCPtr);
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TableView_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            public Property() : this(NDalicPINVOKE.new_TableView_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get();
+            internal static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get();
+            internal static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get();
+            internal static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get();
+            internal static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get();
+
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        internal class ChildProperty : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~ChildProperty()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TableView_ChildProperty(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            public ChildProperty() : this(NDalicPINVOKE.new_TableView_ChildProperty(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get();
+            internal static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get();
+            internal static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get();
+            internal static readonly int CELL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get();
+            internal static readonly int CELL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get();
+
+        }
+
+        /// <summary>
+        /// Class to specify layout position for child view.
+        /// </summary>
+        public class CellPosition : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal CellPosition(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(CellPosition obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~CellPosition()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TableView_CellPosition(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            /// <summary>
+            /// Constructor.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            /// <param name="rowSpan">The row span initialized</param>
+            /// <param name="columnSpan">The column span initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan, uint columnSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_0(rowIndex, columnIndex, rowSpan, columnSpan), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            /// <param name="rowSpan">The row span initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_1(rowIndex, columnIndex, rowSpan), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            /// <param name="columnIndex">The column index initialized</param>
+            public CellPosition(uint rowIndex, uint columnIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_2(rowIndex, columnIndex), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Constructor to initialise values to defaults for convenience.
+            /// </summary>
+            /// <param name="rowIndex">The row index initialized</param>
+            public CellPosition(uint rowIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_3(rowIndex), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Default constructor
+            /// </summary>
+            public CellPosition() : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_4(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            /// <summary>
+            /// Index of row
+            /// </summary>
+            public uint rowIndex
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_rowIndex_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowIndex_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Index of column
+            /// </summary>
+            public uint columnIndex
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_columnIndex_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnIndex_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Span of row
+            /// </summary>
+            public uint rowSpan
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_rowSpan_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_rowSpan_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+            /// <summary>
+            /// Span of column
+            /// </summary>
+            public uint columnSpan
+            {
+                set
+                {
+                    NDalicPINVOKE.TableView_CellPosition_columnSpan_set(swigCPtr, value);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                }
+                get
+                {
+                    uint ret = NDalicPINVOKE.TableView_CellPosition_columnSpan_get(swigCPtr);
+                    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                    return ret;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Creates the TableView view.
+        /// </summary>
+        /// <param name="initialRows">initialRows for the table</param>
+        /// <param name="initialColumns">initialColumns for the table</param>
+        public TableView(uint initialRows, uint initialColumns) : this(NDalicPINVOKE.TableView_New(initialRows, initialColumns), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Copy constructor. Creates another handle that points to the same real object.
+        /// </summary>
+        /// <param name="handle">Handle to copy from</param>
+        public TableView(TableView handle) : this(NDalicPINVOKE.new_TableView__SWIG_1(TableView.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Changes this handle to point to another real object.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>A reference to this</returns>
+        public TableView Assign(TableView handle)
+        {
+            TableView ret = new TableView(NDalicPINVOKE.TableView_Assign(swigCPtr, TableView.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to TableView handle.
+        /// If handle points to a TableView, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a TableView or an uninitialized handle</returns>
+        public new static TableView DownCast(BaseHandle handle)
+        {
+            TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Adds a child to the table.
+        /// If the row or column index is outside the table, the table gets resized bigger.
+        /// </summary>
+        /// <param name="child">The child to add</param>
+        /// <param name="position">The position for the child</param>
+        /// <returns>Tue if the addition succeeded and false if the cell is already occupied</returns>
+        public bool AddChild(Actor child, TableView.CellPosition position)
+        {
+            bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns a child from the given layout position.
+        /// </summary>
+        /// <param name="position">The position in the table</param>
+        /// <returns>Child that was in the cell or an uninitialized handle</returns>
+        public Actor GetChildAt(TableView.CellPosition position)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.TableView_GetChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Removes a child from the given layout position.
+        /// </summary>
+        /// <param name="position">The position for the child to remove</param>
+        /// <returns>Child that was removed or an uninitialized handle</returns>
+        public Actor RemoveChildAt(TableView.CellPosition position)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.TableView_RemoveChildAt(swigCPtr, TableView.CellPosition.getCPtr(position)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Finds the child's layout position.
+        /// </summary>
+        /// <param name="child">The child to search for</param>
+        /// <param name="position">The position for the child</param>
+        /// <returns>true if the child was included in this TableView</returns>
+        public bool FindChildPosition(Actor child, TableView.CellPosition position)
+        {
+            bool ret = NDalicPINVOKE.TableView_FindChildPosition(swigCPtr, Actor.getCPtr(child), TableView.CellPosition.getCPtr(position));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Inserts a new row to given index.
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex of the new row</param>
+        public void InsertRow(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_InsertRow(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Deletes a row from the given index.
+        /// Removed elements are deleted.
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex of the row to delete</param>
+        public void DeleteRow(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_DeleteRow__SWIG_0(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void DeleteRow(uint rowIndex, ActorContainer removed)
+        {
+            NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ActorContainer.getCPtr(removed));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Inserts a new column to the given index.
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex of the new column</param>
+        public void InsertColumn(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_InsertColumn(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Deletes a column from the given index.
+        /// Removed elements are deleted.
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex of the column to delete</param>
+        public void DeleteColumn(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_DeleteColumn__SWIG_0(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void DeleteColumn(uint columnIndex, ActorContainer removed)
+        {
+            NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ActorContainer.getCPtr(removed));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Resizes the TableView.
+        /// </summary>
+        /// <param name="rows">The rows for the table</param>
+        /// <param name="columns">The columns for the table</param>
+        public void Resize(uint rows, uint columns)
+        {
+            NDalicPINVOKE.TableView_Resize__SWIG_0(swigCPtr, rows, columns);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void Resize(uint rows, uint columns, ActorContainer removed)
+        {
+            NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ActorContainer.getCPtr(removed));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sets horizontal and vertical padding between cells.
+        /// </summary>
+        /// <param name="padding">Width and height</param>
+        public void SetCellPadding(Size2D padding)
+        {
+            NDalicPINVOKE.TableView_SetCellPadding(swigCPtr, Size2D.getCPtr(padding));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets the current padding as width and height.
+        /// </summary>
+        /// <returns>The current padding as width and height</returns>
+        public Vector2 GetCellPadding()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.TableView_GetCellPadding(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Specifies this row as fitting its height to its children.
+        /// </summary>
+        /// <param name="rowIndex">The row to set</param>
+        public void SetFitHeight(uint rowIndex)
+        {
+            NDalicPINVOKE.TableView_SetFitHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks if the row is a fit row.
+        /// </summary>
+        /// <param name="rowIndex">The row to check</param>
+        /// <returns>true if the row is fit</returns>
+        public bool IsFitHeight(uint rowIndex)
+        {
+            bool ret = NDalicPINVOKE.TableView_IsFitHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Specifies this column as fitting its width to its children.
+        /// </summary>
+        /// <param name="columnIndex">The column to set</param>
+        public void SetFitWidth(uint columnIndex)
+        {
+            NDalicPINVOKE.TableView_SetFitWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks if the column is a fit column.
+        /// </summary>
+        /// <param name="columnIndex">The column to check</param>
+        /// <returns>true if the column is fit</returns>
+        public bool IsFitWidth(uint columnIndex)
+        {
+            bool ret = NDalicPINVOKE.TableView_IsFitWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a row to have fixed height.
+        /// Setting a fixed height of 0 has no effect.
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex for row with fixed height</param>
+        /// <param name="height">The height in world coordinate units</param>
+        public void SetFixedHeight(uint rowIndex, float height)
+        {
+            NDalicPINVOKE.TableView_SetFixedHeight(swigCPtr, rowIndex, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a row's fixed height.
+        /// </summary>
+        /// <param name="rowIndex">The row index with fixed height</param>
+        /// <returns>height The height in world coordinate units</returns>
+        public float GetFixedHeight(uint rowIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetFixedHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a row to have relative height. Relative height means percentage of
+        /// the remainder of the table height after subtracting Padding and Fixed height rows.
+        /// Setting a relative height of 0 has no effect.
+        /// </summary>
+        /// <param name="rowIndex">The rowIndex for row with relative height</param>
+        /// <param name="heightPercentage">The height percentage between 0.0f and 1.0f</param>
+        public void SetRelativeHeight(uint rowIndex, float heightPercentage)
+        {
+            NDalicPINVOKE.TableView_SetRelativeHeight(swigCPtr, rowIndex, heightPercentage);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a row's relative height.
+        /// </summary>
+        /// <param name="rowIndex">The row index with relative height</param>
+        /// <returns>Height in percentage units, between 0.0f and 1.0f</returns>
+        public float GetRelativeHeight(uint rowIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetRelativeHeight(swigCPtr, rowIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a column to have fixed width.
+        /// Setting a fixed width of 0 has no effect.
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
+        /// <param name="width">The width in world coordinate units</param>
+        public void SetFixedWidth(uint columnIndex, float width)
+        {
+            NDalicPINVOKE.TableView_SetFixedWidth(swigCPtr, columnIndex, width);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a column's fixed width.
+        /// </summary>
+        /// <param name="columnIndex">The column index with fixed width</param>
+        /// <returns>Width in world coordinate units</returns>
+        public float GetFixedWidth(uint columnIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetFixedWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets a column to have relative width. Relative width means percentage of
+        /// the remainder of table width after subtracting Padding and Fixed width columns.
+        /// Setting a relative width of 0 has no effect.
+        /// </summary>
+        /// <param name="columnIndex">The columnIndex for column with fixed width</param>
+        /// <param name="widthPercentage">The widthPercentage between 0.0f and 1.0f</param>
+        public void SetRelativeWidth(uint columnIndex, float widthPercentage)
+        {
+            NDalicPINVOKE.TableView_SetRelativeWidth(swigCPtr, columnIndex, widthPercentage);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets a column's relative width.
+        /// </summary>
+        /// <param name="columnIndex">The column index with relative width</param>
+        /// <returns>Width in percentage units, between 0.0f and 1.0f</returns>
+        public float GetRelativeWidth(uint columnIndex)
+        {
+            float ret = NDalicPINVOKE.TableView_GetRelativeWidth(swigCPtr, columnIndex);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets the amount of rows in the table.
+        /// </summary>
+        /// <returns>The amount of rows in the table</returns>
+        public uint GetRows()
+        {
+            uint ret = NDalicPINVOKE.TableView_GetRows(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets the amount of columns in the table.
+        /// </summary>
+        /// <returns>The amount of columns in the table</returns>
+        public uint GetColumns()
+        {
+            uint ret = NDalicPINVOKE.TableView_GetColumns(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the alignment on a cell.
+        /// Cells without calling this function have the default values of LEFT and TOP respectively.
+        /// </summary>
+        /// <param name="position">The cell to set alignment on</param>
+        /// <param name="horizontal">The horizontal alignment</param>
+        /// <param name="vertical">The vertical alignment</param>
+        public void SetCellAlignment(TableView.CellPosition position, HorizontalAlignmentType horizontal, VerticalAlignmentType vertical)
+        {
+            NDalicPINVOKE.TableView_SetCellAlignment(swigCPtr, TableView.CellPosition.getCPtr(position), (int)horizontal, (int)vertical);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000,
+            CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,
+            CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Enumeration for describing how the size of a row / column has been set.
+        /// </summary>
+        public enum LayoutPolicy
+        {
+            Fixed,
+            Relative,
+            Fill,
+            Fit
+        }
+
+        /// <summary>
+        /// the amount of rows in the table.
+        /// </summary>
+        public int Rows
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TableView.Property.ROWS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.ROWS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// the amount of columns in the table.
+        /// </summary>
+        public int Columns
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TableView.Property.COLUMNS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.COLUMNS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+        /// <summary>
+        /// padding between cells.
+        /// </summary>
+        public Vector2 CellPadding
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(TableView.Property.CELL_PADDING).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.CELL_PADDING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The number of layout rows
+        /// </summary>
+        public PropertyMap LayoutRows
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TableView.Property.LAYOUT_ROWS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.LAYOUT_ROWS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// The number of layout columns
+        /// </summary>
+        public PropertyMap LayoutColumns
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TableView.Property.LAYOUT_COLUMNS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.Property.LAYOUT_COLUMNS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-  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_TableView_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_TableView_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get();
-    public static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get();
-    public static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get();
-    public static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get();
-    public static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get();
-  
-  }
-
-  public class ChildProperty : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~ChildProperty() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TableView_ChildProperty(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public ChildProperty() : this(NDalicPINVOKE.new_TableView_ChildProperty(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get();
-    public static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get();
-    public static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get();
-    public static readonly int CELL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get();
-    public static readonly int CELL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get();
-  
-  }
-
-  public class CellPosition : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal CellPosition(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(CellPosition obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~CellPosition() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TableView_CellPosition(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan, uint columnSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_0(rowIndex, columnIndex, rowSpan, columnSpan), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public CellPosition(uint rowIndex, uint columnIndex, uint rowSpan) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_1(rowIndex, columnIndex, rowSpan), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public CellPosition(uint rowIndex, uint columnIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_2(rowIndex, columnIndex), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public CellPosition(uint rowIndex) : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_3(rowIndex), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public CellPosition() : this(NDalicPINVOKE.new_TableView_CellPosition__SWIG_4(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public uint rowIndex {
-      set {
-        NDalicPINVOKE.TableView_CellPosition_rowIndex_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        uint ret = NDalicPINVOKE.TableView_CellPosition_rowIndex_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public uint columnIndex {
-      set {
-        NDalicPINVOKE.TableView_CellPosition_columnIndex_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        uint ret = NDalicPINVOKE.TableView_CellPosition_columnIndex_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public uint rowSpan {
-      set {
-        NDalicPINVOKE.TableView_CellPosition_rowSpan_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        uint ret = NDalicPINVOKE.TableView_CellPosition_rowSpan_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-    public uint columnSpan {
-      set {
-        NDalicPINVOKE.TableView_CellPosition_columnSpan_set(swigCPtr, value);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      } 
-      get {
-        uint ret = NDalicPINVOKE.TableView_CellPosition_columnSpan_get(swigCPtr);
-        if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        return ret;
-      } 
-    }
-  
-  }
-
-  public TableView (uint initialRows, uint initialColumns) : this (NDalicPINVOKE.TableView_New(initialRows, initialColumns), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public TableView(TableView handle) : this(NDalicPINVOKE.new_TableView__SWIG_1(TableView.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TableView Assign(TableView handle) {
-    TableView ret = new TableView(NDalicPINVOKE.TableView_Assign(swigCPtr, TableView.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static TableView DownCast(BaseHandle handle) {
-    TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool AddChild(Actor child, TableView.CellPosition position) {
-    bool ret = NDalicPINVOKE.TableView_AddChild(swigCPtr, Actor.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);
-    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);
-    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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void InsertRow(uint rowIndex) {
-    NDalicPINVOKE.TableView_InsertRow(swigCPtr, rowIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void DeleteRow(uint rowIndex) {
-    NDalicPINVOKE.TableView_DeleteRow__SWIG_0(swigCPtr, rowIndex);
-    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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void InsertColumn(uint columnIndex) {
-    NDalicPINVOKE.TableView_InsertColumn(swigCPtr, columnIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void DeleteColumn(uint columnIndex) {
-    NDalicPINVOKE.TableView_DeleteColumn__SWIG_0(swigCPtr, columnIndex);
-    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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Resize(uint rows, uint columns) {
-    NDalicPINVOKE.TableView_Resize__SWIG_0(swigCPtr, rows, columns);
-    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));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetCellPadding(Vector2 padding) {
-    NDalicPINVOKE.TableView_SetCellPadding(swigCPtr, Vector2.getCPtr(padding));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2 GetCellPadding() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.TableView_GetCellPadding(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFitHeight(uint rowIndex) {
-    NDalicPINVOKE.TableView_SetFitHeight(swigCPtr, rowIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsFitHeight(uint rowIndex) {
-    bool ret = NDalicPINVOKE.TableView_IsFitHeight(swigCPtr, rowIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFitWidth(uint columnIndex) {
-    NDalicPINVOKE.TableView_SetFitWidth(swigCPtr, columnIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsFitWidth(uint columnIndex) {
-    bool ret = NDalicPINVOKE.TableView_IsFitWidth(swigCPtr, columnIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFixedHeight(uint rowIndex, float height) {
-    NDalicPINVOKE.TableView_SetFixedHeight(swigCPtr, rowIndex, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetFixedHeight(uint rowIndex) {
-    float ret = NDalicPINVOKE.TableView_GetFixedHeight(swigCPtr, rowIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetRelativeHeight(uint rowIndex, float heightPercentage) {
-    NDalicPINVOKE.TableView_SetRelativeHeight(swigCPtr, rowIndex, heightPercentage);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetRelativeHeight(uint rowIndex) {
-    float ret = NDalicPINVOKE.TableView_GetRelativeHeight(swigCPtr, rowIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetFixedWidth(uint columnIndex, float width) {
-    NDalicPINVOKE.TableView_SetFixedWidth(swigCPtr, columnIndex, width);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetFixedWidth(uint columnIndex) {
-    float ret = NDalicPINVOKE.TableView_GetFixedWidth(swigCPtr, columnIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetRelativeWidth(uint columnIndex, float widthPercentage) {
-    NDalicPINVOKE.TableView_SetRelativeWidth(swigCPtr, columnIndex, widthPercentage);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetRelativeWidth(uint columnIndex) {
-    float ret = NDalicPINVOKE.TableView_GetRelativeWidth(swigCPtr, columnIndex);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetRows() {
-    uint ret = NDalicPINVOKE.TableView_GetRows(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetColumns() {
-    uint ret = NDalicPINVOKE.TableView_GetColumns(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetCellAlignment(TableView.CellPosition position, HorizontalAlignmentType horizontal, VerticalAlignmentType vertical) {
-    NDalicPINVOKE.TableView_SetCellAlignment(swigCPtr, TableView.CellPosition.getCPtr(position), (int)horizontal, (int)vertical);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000,
-    CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX,
-    CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000
-  }
-
-  public enum LayoutPolicy {
-    FIXED,
-    RELATIVE,
-    FILL,
-    FIT
-  }
-
-  public int Rows
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TableView.Property.ROWS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.ROWS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int Columns
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TableView.Property.COLUMNS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.COLUMNS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector2 CellPadding
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TableView.Property.CELL_PADDING).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.CELL_PADDING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map LayoutRows
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TableView.Property.LAYOUT_ROWS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.Property.LAYOUT_ROWS, new Tizen.NUI.Property.Value( value ) );
     }
-  }
-  public Tizen.NUI.Property.Map LayoutColumns
-  {
-    get
+
+    /// <summary>
+    /// Enumeration for horizontal alignment types.
+    /// </summary>
+    public enum HorizontalAlignmentType
     {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TableView.Property.LAYOUT_COLUMNS).Get(  temp );
-      return temp;
+        Left,
+        Center,
+        Right
     }
-    set
+
+    /// <summary>
+    /// Enumeration for vertical alignment types.
+    /// </summary>
+    public enum VerticalAlignmentType
     {
-      SetProperty( TableView.Property.LAYOUT_COLUMNS, new Tizen.NUI.Property.Value( value ) );
+        Top,
+        Center,
+        Bottom
     }
-  }
-
-}
 
 }
index 017e65f..a164c36 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class TapGesture : Gesture {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// A TapGesture is emitted when the user taps the screen with the stated number of fingers a stated number of times.
+    /// </summary>
+    public class TapGesture : Gesture
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal TapGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TapGesture_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal TapGesture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TapGesture_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TapGesture obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TapGesture obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~TapGesture() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~TapGesture()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        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_TapGesture(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_TapGesture(swigCPtr);
+        /// <summary>
+        /// Get TapGesture from the pointer.
+        /// </summary>
+        /// <param name="cPtr">The pointer to cast</param>
+        /// <returns>TapGesture object</returns>
+        internal static TapGesture GetTapGestureFromPtr(global::System.IntPtr cPtr)
+        {
+            TapGesture ret = new TapGesture(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// Number of taps property (read-only).
+        /// </summary>
+        public uint NumberOfTaps
+        {
+            get
+            {
+                return numberOfTaps;
+            }
+        }
 
-  public static TapGesture GetTapGestureFromPtr(global::System.IntPtr cPtr) {
-    TapGesture ret = new TapGesture(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        /// <summary>
+        /// Number of touches property (read-only).
+        /// </summary>
+        public uint NumberOfTouches
+        {
+            get
+            {
+                return numberOfTouches;
+            }
+        }
 
-  public uint NumberOfTaps
-  {
-    get
-    {
-      return numberOfTaps;
-    }
-  }
+        /// <summary>
+        /// Screen point property (read-only).
+        /// </summary>
+        public Vector2 ScreenPoint
+        {
+            get
+            {
+                return screenPoint;
+            }
+        }
 
-  public uint NumberOfTouches
-  {
-    get
-    {
-      return numberOfTouches;
-    }
-  }
+        /// <summary>
+        /// Local point property (read-only).
+        /// </summary>
+        public Vector2 LocalPoint
+        {
+            get
+            {
+                return localPoint;
+            }
+        }
 
-  public Vector2 ScreenPoint
-  {
-    get
-    {
-      return screenPoint;
-    }
-  }
+        /// <summary>
+        /// Creates a TapGesture.
+        /// </summary>
+        public TapGesture() : this(NDalicPINVOKE.new_TapGesture__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public Vector2 LocalPoint
-  {
-    get
-    {
-      return localPoint;
-    }
-  }
-
-  public TapGesture() : this(NDalicPINVOKE.new_TapGesture__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TapGesture(TapGesture rhs) : this(NDalicPINVOKE.new_TapGesture__SWIG_1(TapGesture.getCPtr(rhs)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TapGesture Assign(TapGesture rhs) {
-    TapGesture ret = new TapGesture(NDalicPINVOKE.TapGesture_Assign(swigCPtr, TapGesture.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private uint numberOfTaps {
-    set {
-      NDalicPINVOKE.TapGesture_numberOfTaps_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.TapGesture_numberOfTaps_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint numberOfTouches {
-    set {
-      NDalicPINVOKE.TapGesture_numberOfTouches_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.TapGesture_numberOfTouches_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 screenPoint {
-    set {
-      NDalicPINVOKE.TapGesture_screenPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.TapGesture_screenPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 localPoint {
-    set {
-      NDalicPINVOKE.TapGesture_localPoint_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.TapGesture_localPoint_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Copy constructor.
+        /// </summary>
+        /// <param name="rhs">TapGesture to copy</param>
+        public TapGesture(TapGesture rhs) : this(NDalicPINVOKE.new_TapGesture__SWIG_1(TapGesture.getCPtr(rhs)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Assignment
+        /// </summary>
+        /// <param name="rhs">A reference to the copied handle</param>
+        /// <returns>A reference to this</returns>
+        public TapGesture Assign(TapGesture rhs)
+        {
+            TapGesture ret = new TapGesture(NDalicPINVOKE.TapGesture_Assign(swigCPtr, TapGesture.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private uint numberOfTaps
+        {
+            set
+            {
+                NDalicPINVOKE.TapGesture_numberOfTaps_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.TapGesture_numberOfTaps_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint numberOfTouches
+        {
+            set
+            {
+                NDalicPINVOKE.TapGesture_numberOfTouches_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.TapGesture_numberOfTouches_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 screenPoint
+        {
+            set
+            {
+                NDalicPINVOKE.TapGesture_screenPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.TapGesture_screenPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 localPoint
+        {
+            set
+            {
+                NDalicPINVOKE.TapGesture_localPoint_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.TapGesture_localPoint_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index edddeb1..9e800a5 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TapGestureDetectedSignal : global::System.IDisposable {
+    internal class TapGestureDetectedSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 3b6067f..d3d9d6f 100755 (executable)
@@ -152,7 +152,7 @@ public class DetectedEventArgs : EventArgs
 
 public static TapGestureDetector GetTapGestureDetectorFromPtr(global::System.IntPtr cPtr) {
     TapGestureDetector ret = new TapGestureDetector(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
@@ -203,7 +203,7 @@ public static TapGestureDetector GetTapGestureDetectorFromPtr(global::System.Int
     return ret;
   }
 
-  public TapGestureDetectedSignal DetectedSignal() {
+  internal TapGestureDetectedSignal DetectedSignal() {
     TapGestureDetectedSignal ret = new TapGestureDetectedSignal(NDalicPINVOKE.TapGestureDetector_DetectedSignal(swigCPtr), false);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
index 9627c79..ceb83b1 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
 
-using System;
-using System.Runtime.InteropServices;
+    /// <summary>
+    /// A control which provides a multi-line editable text editor.
+    /// </summary>
+    public class TextEditor : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
+        internal TextEditor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextEditor_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class TextEditor : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextEditor obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal TextEditor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextEditor_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~TextEditor()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextEditor obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-  ~TextEditor() {
-    DisposeQueue.Instance.Add(this);
-  }
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_TextEditor(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  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_TextEditor(swigCPtr);
+
+        /// <summary>
+        /// Event arguments that passed via TextChanged signal.
+        /// </summary>
+        public class TextChangedEventArgs : EventArgs
+        {
+            private TextEditor _textEditor;
+
+            /// <summary>
+            /// TextEditor - is the texteditor control which has the text contents changed.
+            /// </summary>
+            public TextEditor TextEditor
+            {
+                get
+                {
+                    return _textEditor;
+                }
+                set
+                {
+                    _textEditor = value;
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void TextChangedCallbackDelegate(IntPtr textEditor);
+        private EventHandler<TextChangedEventArgs> _textEditorTextChangedEventHandler;
+        private TextChangedCallbackDelegate _textEditorTextChangedCallbackDelegate;
 
+        /// <summary>
+        /// Event for TextChanged signal which can be used to subscribe/unsubscribe the event handler
+        /// provided by the user. TextChanged signal is emitted when the text changes.
+        /// </summary>
+        public event EventHandler<TextChangedEventArgs> TextChanged
+        {
+            add
+            {
+                if (_textEditorTextChangedEventHandler == null)
+                {
+                    _textEditorTextChangedCallbackDelegate = (OnTextChanged);
+                    TextChangedSignal().Connect(_textEditorTextChangedCallbackDelegate);
+                }
+                _textEditorTextChangedEventHandler += value;
+            }
+            remove
+            {
+                _textEditorTextChangedEventHandler -= value;
+                if (_textEditorTextChangedEventHandler == null && _textEditorTextChangedCallbackDelegate != null)
+                {
+                    TextChangedSignal().Disconnect(_textEditorTextChangedCallbackDelegate);
+                }
+            }
+        }
 
-/**
-  * @brief Event arguments that passed via TextChanged signal
-  *
-  */
-public class TextChangedEventArgs : EventArgs
-{
-   private TextEditor _textEditor;
-   /**
-     * @brief TextEditor - is the texteditor control which has the text contents changed.
-     *
-     */
-   public TextEditor TextEditor
-   {
-      get
-      {
-         return _textEditor;
-      }
-      set
-      {
-         _textEditor = value;
-      }
-   }
-}
+        private void OnTextChanged(IntPtr textEditor)
+        {
+            TextChangedEventArgs e = new TextChangedEventArgs();
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void TextChangedCallbackDelegate(IntPtr textEditor);
-  private DaliEventHandler<object,TextChangedEventArgs> _textEditorTextChangedEventHandler;
-  private TextChangedCallbackDelegate _textEditorTextChangedCallbackDelegate;
-
-  /**
-    * @brief Event for TextChanged signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of TextChangedEventHandler-DaliEventHandler<object,TextChangedEventArgs>) 
-    * provided by the user. TextChanged signal is emitted when the text changes.
-    */
-  public event DaliEventHandler<object,TextChangedEventArgs> TextChanged
-  {
-     add
-     {
-        lock(this)
-        {
-           // Restricted to only one listener
-           if (_textEditorTextChangedEventHandler == null)
-           {
-              _textEditorTextChangedEventHandler += value;
-
-              _textEditorTextChangedCallbackDelegate = new TextChangedCallbackDelegate(OnTextChanged);
-              this.TextChangedSignal().Connect(_textEditorTextChangedCallbackDelegate);
-           }
-        }
-     }
-
-     remove
-     {
-        lock(this)
-        {
-           if (_textEditorTextChangedEventHandler != null)
-           {
-              this.TextChangedSignal().Disconnect(_textEditorTextChangedCallbackDelegate);
-           }
-
-           _textEditorTextChangedEventHandler -= value;
-        }
-     }
-  }
-
- private void OnTextChanged(IntPtr textEditor)
-  {
-   TextChangedEventArgs e = new TextChangedEventArgs();
-
-   // Populate all members of "e" (TextChangedEventArgs) with real data
-   e.TextEditor = Tizen.NUI.TextEditor.GetTextEditorFromPtr(textEditor);
-
-   if (_textEditorTextChangedEventHandler != null)
-   {
-      //here we send all data to user event handlers
-      _textEditorTextChangedEventHandler(this, e);
-   }
-
-  }
-
- public static TextEditor GetTextEditorFromPtr(global::System.IntPtr cPtr) {
-    TextEditor ret = new TextEditor(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TextEditor_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_TextEditor_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get();
-    public static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get();
-    public static readonly int TEXT_COLOR = NDalicPINVOKE.TextEditor_Property_TEXT_COLOR_get();
-    public static readonly int FONT_FAMILY = NDalicPINVOKE.TextEditor_Property_FONT_FAMILY_get();
-    public static readonly int FONT_STYLE = NDalicPINVOKE.TextEditor_Property_FONT_STYLE_get();
-    public static readonly int POINT_SIZE = NDalicPINVOKE.TextEditor_Property_POINT_SIZE_get();
-    public static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextEditor_Property_HORIZONTAL_ALIGNMENT_get();
-    public static readonly int SCROLL_THRESHOLD = NDalicPINVOKE.TextEditor_Property_SCROLL_THRESHOLD_get();
-    public static readonly int SCROLL_SPEED = NDalicPINVOKE.TextEditor_Property_SCROLL_SPEED_get();
-    public static readonly int PRIMARY_CURSOR_COLOR = NDalicPINVOKE.TextEditor_Property_PRIMARY_CURSOR_COLOR_get();
-    public static readonly int SECONDARY_CURSOR_COLOR = NDalicPINVOKE.TextEditor_Property_SECONDARY_CURSOR_COLOR_get();
-    public static readonly int ENABLE_CURSOR_BLINK = NDalicPINVOKE.TextEditor_Property_ENABLE_CURSOR_BLINK_get();
-    public static readonly int CURSOR_BLINK_INTERVAL = NDalicPINVOKE.TextEditor_Property_CURSOR_BLINK_INTERVAL_get();
-    public static readonly int CURSOR_BLINK_DURATION = NDalicPINVOKE.TextEditor_Property_CURSOR_BLINK_DURATION_get();
-    public static readonly int CURSOR_WIDTH = NDalicPINVOKE.TextEditor_Property_CURSOR_WIDTH_get();
-    public static readonly int GRAB_HANDLE_IMAGE = NDalicPINVOKE.TextEditor_Property_GRAB_HANDLE_IMAGE_get();
-    public static readonly int GRAB_HANDLE_PRESSED_IMAGE = NDalicPINVOKE.TextEditor_Property_GRAB_HANDLE_PRESSED_IMAGE_get();
-    public static readonly int SELECTION_HANDLE_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HANDLE_PRESSED_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HANDLE_MARKER_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_MARKER_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HIGHLIGHT_COLOR = NDalicPINVOKE.TextEditor_Property_SELECTION_HIGHLIGHT_COLOR_get();
-    public static readonly int DECORATION_BOUNDING_BOX = NDalicPINVOKE.TextEditor_Property_DECORATION_BOUNDING_BOX_get();
-    public static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextEditor_Property_ENABLE_MARKUP_get();
-    public static readonly int INPUT_COLOR = NDalicPINVOKE.TextEditor_Property_INPUT_COLOR_get();
-    public static readonly int INPUT_FONT_FAMILY = NDalicPINVOKE.TextEditor_Property_INPUT_FONT_FAMILY_get();
-    public static readonly int INPUT_FONT_STYLE = NDalicPINVOKE.TextEditor_Property_INPUT_FONT_STYLE_get();
-    public static readonly int INPUT_POINT_SIZE = NDalicPINVOKE.TextEditor_Property_INPUT_POINT_SIZE_get();
-    public static readonly int LINE_SPACING = NDalicPINVOKE.TextEditor_Property_LINE_SPACING_get();
-    public static readonly int INPUT_LINE_SPACING = NDalicPINVOKE.TextEditor_Property_INPUT_LINE_SPACING_get();
-    public static readonly int UNDERLINE = NDalicPINVOKE.TextEditor_Property_UNDERLINE_get();
-    public static readonly int INPUT_UNDERLINE = NDalicPINVOKE.TextEditor_Property_INPUT_UNDERLINE_get();
-    public static readonly int SHADOW = NDalicPINVOKE.TextEditor_Property_SHADOW_get();
-    public static readonly int INPUT_SHADOW = NDalicPINVOKE.TextEditor_Property_INPUT_SHADOW_get();
-    public static readonly int EMBOSS = NDalicPINVOKE.TextEditor_Property_EMBOSS_get();
-    public static readonly int INPUT_EMBOSS = NDalicPINVOKE.TextEditor_Property_INPUT_EMBOSS_get();
-    public static readonly int OUTLINE = NDalicPINVOKE.TextEditor_Property_OUTLINE_get();
-    public static readonly int INPUT_OUTLINE = NDalicPINVOKE.TextEditor_Property_INPUT_OUTLINE_get();
-  
-  }
-
-  public class InputStyle : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal InputStyle(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(InputStyle obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~InputStyle() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TextEditor_InputStyle(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public InputStyle() : this(NDalicPINVOKE.new_TextEditor_InputStyle(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public enum Mask {
-      NONE = 0x0000,
-      COLOR = 0x0001,
-      FONT_FAMILY = 0x0002,
-      POINT_SIZE = 0x0004,
-      FONT_STYLE = 0x0008,
-      LINE_SPACING = 0x0010,
-      UNDERLINE = 0x0020,
-      SHADOW = 0x0040,
-      EMBOSS = 0x0080,
-      OUTLINE = 0x0100
-    }
-  
-  }
-
-  public TextEditor () : this (NDalicPINVOKE.TextEditor_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public TextEditor(TextEditor handle) : this(NDalicPINVOKE.new_TextEditor__SWIG_1(TextEditor.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TextEditor Assign(TextEditor handle) {
-    TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_Assign(swigCPtr, TextEditor.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static TextEditor DownCast(BaseHandle handle) {
-    TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TextEditorSignal TextChangedSignal() {
-    TextEditorSignal ret = new TextEditorSignal(NDalicPINVOKE.TextEditor_TextChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t InputStyleChangedSignal() {
-    SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(NDalicPINVOKE.TextEditor_InputStyleChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextEditor.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.RENDERING_BACKEND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.TEXT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.TEXT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.TEXT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.FONT_FAMILY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map FontStyle
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.FONT_STYLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.POINT_SIZE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float ScrollThreshold
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.SCROLL_THRESHOLD).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SCROLL_THRESHOLD, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float ScrollSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SCROLL_SPEED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 PrimaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.PRIMARY_CURSOR_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.PRIMARY_CURSOR_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 SecondaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.SECONDARY_CURSOR_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SECONDARY_CURSOR_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableCursorBlink
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkInterval
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.CURSOR_BLINK_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_BLINK_DURATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int CursorWidth
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextEditor.Property.CURSOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.CURSOR_WIDTH, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string GrabHandleImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.GRAB_HANDLE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.GRAB_HANDLE_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string GrabHandlePressedImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandlePressedImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandlePressedImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleMarkerImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleMarkerImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 SelectionHighlightColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.SELECTION_HIGHLIGHT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Rectangle DecorationBoundingBox
-  {
-    get
-    {
-      Rectangle temp = new Rectangle(0,0,0,0);
-      GetProperty( TextEditor.Property.DECORATION_BOUNDING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.DECORATION_BOUNDING_BOX, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextEditor.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.ENABLE_MARKUP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 InputColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextEditor.Property.INPUT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string InputFontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextEditor.Property.INPUT_FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_FONT_FAMILY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputFontStyle
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_FONT_STYLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float InputPointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.INPUT_POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_POINT_SIZE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float LineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.LINE_SPACING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float InputLineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextEditor.Property.INPUT_LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_LINE_SPACING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Underline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.UNDERLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputUnderline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_UNDERLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Shadow
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.SHADOW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputShadow
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_SHADOW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Emboss
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.EMBOSS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputEmboss
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_EMBOSS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Outline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.OUTLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputOutline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextEditor.Property.INPUT_OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextEditor.Property.INPUT_OUTLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+            // Populate all members of "e" (TextChangedEventArgs) with real data
+            e.TextEditor = Tizen.NUI.TextEditor.GetTextEditorFromPtr(textEditor);
 
-}
+            if (_textEditorTextChangedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _textEditorTextChangedEventHandler(this, e);
+            }
+
+        }
+
+        internal static TextEditor GetTextEditorFromPtr(global::System.IntPtr cPtr)
+        {
+            TextEditor ret = new TextEditor(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TextEditor_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_TextEditor_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get();
+            internal static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get();
+            internal static readonly int TEXT_COLOR = NDalicPINVOKE.TextEditor_Property_TEXT_COLOR_get();
+            internal static readonly int FONT_FAMILY = NDalicPINVOKE.TextEditor_Property_FONT_FAMILY_get();
+            internal static readonly int FONT_STYLE = NDalicPINVOKE.TextEditor_Property_FONT_STYLE_get();
+            internal static readonly int POINT_SIZE = NDalicPINVOKE.TextEditor_Property_POINT_SIZE_get();
+            internal static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextEditor_Property_HORIZONTAL_ALIGNMENT_get();
+            internal static readonly int SCROLL_THRESHOLD = NDalicPINVOKE.TextEditor_Property_SCROLL_THRESHOLD_get();
+            internal static readonly int SCROLL_SPEED = NDalicPINVOKE.TextEditor_Property_SCROLL_SPEED_get();
+            internal static readonly int PRIMARY_CURSOR_COLOR = NDalicPINVOKE.TextEditor_Property_PRIMARY_CURSOR_COLOR_get();
+            internal static readonly int SECONDARY_CURSOR_COLOR = NDalicPINVOKE.TextEditor_Property_SECONDARY_CURSOR_COLOR_get();
+            internal static readonly int ENABLE_CURSOR_BLINK = NDalicPINVOKE.TextEditor_Property_ENABLE_CURSOR_BLINK_get();
+            internal static readonly int CURSOR_BLINK_INTERVAL = NDalicPINVOKE.TextEditor_Property_CURSOR_BLINK_INTERVAL_get();
+            internal static readonly int CURSOR_BLINK_DURATION = NDalicPINVOKE.TextEditor_Property_CURSOR_BLINK_DURATION_get();
+            internal static readonly int CURSOR_WIDTH = NDalicPINVOKE.TextEditor_Property_CURSOR_WIDTH_get();
+            internal static readonly int GRAB_HANDLE_IMAGE = NDalicPINVOKE.TextEditor_Property_GRAB_HANDLE_IMAGE_get();
+            internal static readonly int GRAB_HANDLE_PRESSED_IMAGE = NDalicPINVOKE.TextEditor_Property_GRAB_HANDLE_PRESSED_IMAGE_get();
+            internal static readonly int SELECTION_HANDLE_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HANDLE_PRESSED_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HANDLE_MARKER_IMAGE_LEFT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_MARKER_IMAGE_RIGHT = NDalicPINVOKE.TextEditor_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HIGHLIGHT_COLOR = NDalicPINVOKE.TextEditor_Property_SELECTION_HIGHLIGHT_COLOR_get();
+            internal static readonly int DECORATION_BOUNDING_BOX = NDalicPINVOKE.TextEditor_Property_DECORATION_BOUNDING_BOX_get();
+            internal static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextEditor_Property_ENABLE_MARKUP_get();
+            internal static readonly int INPUT_COLOR = NDalicPINVOKE.TextEditor_Property_INPUT_COLOR_get();
+            internal static readonly int INPUT_FONT_FAMILY = NDalicPINVOKE.TextEditor_Property_INPUT_FONT_FAMILY_get();
+            internal static readonly int INPUT_FONT_STYLE = NDalicPINVOKE.TextEditor_Property_INPUT_FONT_STYLE_get();
+            internal static readonly int INPUT_POINT_SIZE = NDalicPINVOKE.TextEditor_Property_INPUT_POINT_SIZE_get();
+            internal static readonly int LINE_SPACING = NDalicPINVOKE.TextEditor_Property_LINE_SPACING_get();
+            internal static readonly int INPUT_LINE_SPACING = NDalicPINVOKE.TextEditor_Property_INPUT_LINE_SPACING_get();
+            internal static readonly int UNDERLINE = NDalicPINVOKE.TextEditor_Property_UNDERLINE_get();
+            internal static readonly int INPUT_UNDERLINE = NDalicPINVOKE.TextEditor_Property_INPUT_UNDERLINE_get();
+            internal static readonly int SHADOW = NDalicPINVOKE.TextEditor_Property_SHADOW_get();
+            internal static readonly int INPUT_SHADOW = NDalicPINVOKE.TextEditor_Property_INPUT_SHADOW_get();
+            internal static readonly int EMBOSS = NDalicPINVOKE.TextEditor_Property_EMBOSS_get();
+            internal static readonly int INPUT_EMBOSS = NDalicPINVOKE.TextEditor_Property_INPUT_EMBOSS_get();
+            internal static readonly int OUTLINE = NDalicPINVOKE.TextEditor_Property_OUTLINE_get();
+            internal static readonly int INPUT_OUTLINE = NDalicPINVOKE.TextEditor_Property_INPUT_OUTLINE_get();
+
+        }
+
+        internal class InputStyle : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal InputStyle(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(InputStyle obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~InputStyle()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TextEditor_InputStyle(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal InputStyle() : this(NDalicPINVOKE.new_TextEditor_InputStyle(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal enum Mask
+            {
+                None = 0x0000,
+                Color = 0x0001,
+                FontFamily = 0x0002,
+                PointSize = 0x0004,
+                FontStyle = 0x0008,
+                LineSpacing = 0x0010,
+                Underline = 0x0020,
+                Shadow = 0x0040,
+                Emboss = 0x0080,
+                Outline = 0x0100
+            }
+
+        }
+
+        /// <summary>
+        /// Creates the TextEditor control.
+        /// </summary>
+        public TextEditor() : this(NDalicPINVOKE.TextEditor_New(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal TextEditor(TextEditor handle) : this(NDalicPINVOKE.new_TextEditor__SWIG_1(TextEditor.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal TextEditor Assign(TextEditor handle)
+        {
+            TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_Assign(swigCPtr, TextEditor.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to TextEditor.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a TextEditor or an empty handle</returns>
+        public new static TextEditor DownCast(BaseHandle handle)
+        {
+            TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal TextEditorSignal TextChangedSignal()
+        {
+            TextEditorSignal ret = new TextEditorSignal(NDalicPINVOKE.TextEditor_TextChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t InputStyleChangedSignal()
+        {
+            SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(NDalicPINVOKE.TextEditor_InputStyleChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// Rendering backend property
+        /// </summary>
+        public int RenderingBackend
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextEditor.Property.RENDERING_BACKEND).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Text property.
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.TEXT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.TEXT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Text color property.
+        /// </summary>
+        public Vector4 TextColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextEditor.Property.TEXT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.TEXT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Font family property.
+        /// </summary>
+        public string FontFamily
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.FONT_FAMILY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.FONT_FAMILY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Font style property.
+        /// </summary>
+        public PropertyMap FontStyle
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.FONT_STYLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.FONT_STYLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Point size property.
+        /// </summary>
+        public float PointSize
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.POINT_SIZE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.POINT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Horizontal alignment property.
+        /// </summary>
+        public string HorizontalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.HORIZONTAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Scroll threshold property.
+        /// </summary>
+        public float ScrollThreshold
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.SCROLL_THRESHOLD).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SCROLL_THRESHOLD, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Scroll speed property.
+        /// </summary>
+        public float ScrollSpeed
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.SCROLL_SPEED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SCROLL_SPEED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Primary cursor color property.
+        /// </summary>
+        public Vector4 PrimaryCursorColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextEditor.Property.PRIMARY_CURSOR_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.PRIMARY_CURSOR_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SecondaryCursorColor property.
+        /// </summary>
+        public Vector4 SecondaryCursorColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextEditor.Property.SECONDARY_CURSOR_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SECONDARY_CURSOR_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableCursorBlink property.
+        /// </summary>
+        public bool EnableCursorBlink
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextEditor.Property.ENABLE_CURSOR_BLINK).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.ENABLE_CURSOR_BLINK, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorBlinkInterval property.
+        /// </summary>
+        public float CursorBlinkInterval
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.CURSOR_BLINK_INTERVAL).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.CURSOR_BLINK_INTERVAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorBlinkDuration property.
+        /// </summary>
+        public float CursorBlinkDuration
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.CURSOR_BLINK_DURATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.CURSOR_BLINK_DURATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorWidth property.
+        /// </summary>
+        public int CursorWidth
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextEditor.Property.CURSOR_WIDTH).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.CURSOR_WIDTH, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// GrabHandleImage property.
+        /// </summary>
+        public string GrabHandleImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.GRAB_HANDLE_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.GRAB_HANDLE_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// GrabHandlePressedImage property.
+        /// </summary>
+        public string GrabHandlePressedImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.GRAB_HANDLE_PRESSED_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandleImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandleImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandlePressedImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandlePressedImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandlePressedImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandlePressedImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleMarkerImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandleMarkerImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleMarkerImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandleMarkerImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHighlightColor property.
+        /// </summary>
+        public Vector4 SelectionHighlightColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextEditor.Property.SELECTION_HIGHLIGHT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// DecorationBoundingBox property.
+        /// </summary>
+        public Rectangle DecorationBoundingBox
+        {
+            get
+            {
+                Rectangle temp = new Rectangle(0, 0, 0, 0);
+                GetProperty(TextEditor.Property.DECORATION_BOUNDING_BOX).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.DECORATION_BOUNDING_BOX, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableMarkup property.
+        /// </summary>
+        public bool EnableMarkup
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextEditor.Property.ENABLE_MARKUP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.ENABLE_MARKUP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputColor property.
+        /// </summary>
+        public Vector4 InputColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextEditor.Property.INPUT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputFontFamily property.
+        /// </summary>
+        public string InputFontFamily
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextEditor.Property.INPUT_FONT_FAMILY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_FONT_FAMILY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputFontStyle property.
+        /// </summary>
+        public PropertyMap InputFontStyle
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.INPUT_FONT_STYLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_FONT_STYLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputPointSize property.
+        /// </summary>
+        public float InputPointSize
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.INPUT_POINT_SIZE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_POINT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// LineSpacing property.
+        /// </summary>
+        public float LineSpacing
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.LINE_SPACING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.LINE_SPACING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputLineSpacing property.
+        /// </summary>
+        public float InputLineSpacing
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextEditor.Property.INPUT_LINE_SPACING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_LINE_SPACING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Underline property.
+        /// </summary>
+        public PropertyMap Underline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.UNDERLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.UNDERLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputUnderline property.
+        /// </summary>
+        public PropertyMap InputUnderline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.INPUT_UNDERLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_UNDERLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Shadow property.
+        /// </summary>
+        public PropertyMap Shadow
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.SHADOW).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.SHADOW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputShadow property.
+        /// </summary>
+        public PropertyMap InputShadow
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.INPUT_SHADOW).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_SHADOW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Emboss property.
+        /// </summary>
+        public PropertyMap Emboss
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.EMBOSS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.EMBOSS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputEmboss property.
+        /// </summary>
+        public PropertyMap InputEmboss
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.INPUT_EMBOSS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_EMBOSS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Outline property.
+        /// </summary>
+        public PropertyMap Outline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.OUTLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.OUTLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputOutline property.
+        /// </summary>
+        public PropertyMap InputOutline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextEditor.Property.INPUT_OUTLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextEditor.Property.INPUT_OUTLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 994845c..c25e4de 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TextEditorSignal : global::System.IDisposable {
+    internal class TextEditorSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 1a87b86..a81f554 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
+    /// <summary>
+    /// A control which provides a single-line editable text field.
+    /// </summary>
+    public class TextField : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class TextField : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal TextField(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextField_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal TextField(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextField_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextField obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextField obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~TextField()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~TextField() {
-    DisposeQueue.Instance.Add(this);
-  }
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
 
-  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_TextField(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Text changed event arguments.
+        /// </summary>
+        public class TextChangedEventArgs : EventArgs
+        {
+            private TextField _textField;
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_TextField(swigCPtr);
+            /// <summary>
+            /// TextField.
+            /// </summary>
+            public TextField TextField
+            {
+                get
+                {
+                    return _textField;
+                }
+                set
+                {
+                    _textField = value;
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        /// <summary>
+        /// MaxLengthReached event arguments.
+        /// </summary>
+        public class MaxLengthReachedEventArgs : EventArgs
+        {
+            private TextField _textField;
 
+            /// <summary>
+            /// TextField.
+            /// </summary>
+            public TextField TextField
+            {
+                get
+                {
+                    return _textField;
+                }
+                set
+                {
+                    _textField = value;
+                }
+            }
+        }
 
-public class TextChangedEventArgs : EventArgs
-{
-   private TextField _textField;
-
-   public TextField TextField
-   {
-      get
-      {
-         return _textField;
-      }
-      set
-      {
-         _textField = value;
-      }
-   }
-}
 
-public class MaxLengthReachedEventArgs : EventArgs
-{
-   private TextField _textField;
-
-   public TextField TextField
-   {
-      get
-      {
-         return _textField;
-      }
-      set
-      {
-         _textField = value;
-      }
-   }
-}
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void TextChangedCallbackDelegate(IntPtr textField);
+        private EventHandler<TextChangedEventArgs> _textFieldTextChangedEventHandler;
+        private TextChangedCallbackDelegate _textFieldTextChangedCallbackDelegate;
 
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void MaxLengthReachedCallbackDelegate(IntPtr textField);
+        private EventHandler<MaxLengthReachedEventArgs> _textFieldMaxLengthReachedEventHandler;
+        private MaxLengthReachedCallbackDelegate _textFieldMaxLengthReachedCallbackDelegate;
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void TextChangedCallbackDelegate(IntPtr textField);
-  private DaliEventHandler<object,TextChangedEventArgs> _textFieldTextChangedEventHandler;
-  private TextChangedCallbackDelegate _textFieldTextChangedCallbackDelegate;
-  
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void MaxLengthReachedCallbackDelegate(IntPtr textField);
-  private DaliEventHandler<object,MaxLengthReachedEventArgs> _textFieldMaxLengthReachedEventHandler;
-  private MaxLengthReachedCallbackDelegate _textFieldMaxLengthReachedCallbackDelegate;
+        /// <summary>
+        /// TextChanged event.
+        /// </summary>
+        public event EventHandler<TextChangedEventArgs> TextChanged
+        {
+            add
+            {
+                if (_textFieldTextChangedEventHandler == null)
+                {
+                    _textFieldTextChangedCallbackDelegate = (OnTextChanged);
+                    TextChangedSignal().Connect(_textFieldTextChangedCallbackDelegate);
+                }
+                _textFieldTextChangedEventHandler += value;
+            }
+            remove
+            {
+                _textFieldTextChangedEventHandler -= value;
+                if (_textFieldTextChangedEventHandler == null && _textFieldTextChangedCallbackDelegate != null)
+                {
+                    TextChangedSignal().Disconnect(_textFieldTextChangedCallbackDelegate);
+                }
+            }
+        }
 
-  public event DaliEventHandler<object,TextChangedEventArgs> TextChanged
-  {
-     add
-     {
-        lock(this)
+        private void OnTextChanged(IntPtr textField)
         {
-           // Restricted to only one listener
-           if (_textFieldTextChangedEventHandler == null)
-           {
-              _textFieldTextChangedEventHandler += value;
+            TextChangedEventArgs e = new TextChangedEventArgs();
+
+            // Populate all members of "e" (TextChangedEventArgs) with real data
+            e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+
+            if (_textFieldTextChangedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _textFieldTextChangedEventHandler(this, e);
+            }
 
-              _textFieldTextChangedCallbackDelegate = new TextChangedCallbackDelegate(OnTextChanged);
-              this.TextChangedSignal().Connect(_textFieldTextChangedCallbackDelegate);
-           }
         }
-     }
 
-     remove
-     {
-        lock(this)
+        /// <summary>
+        /// MaxLengthReached event.
+        /// </summary>
+        public event EventHandler<MaxLengthReachedEventArgs> MaxLengthReached
         {
-           if (_textFieldTextChangedEventHandler != null)
-           {
-              this.TextChangedSignal().Disconnect(_textFieldTextChangedCallbackDelegate);
-           }
+            add
+            {
+                if (_textFieldMaxLengthReachedEventHandler == null)
+                {
+                    _textFieldMaxLengthReachedCallbackDelegate = (OnMaxLengthReached);
+                    MaxLengthReachedSignal().Connect(_textFieldMaxLengthReachedCallbackDelegate);
+                }
+                _textFieldMaxLengthReachedEventHandler += value;
+            }
+            remove
+            {
+                if (_textFieldMaxLengthReachedEventHandler == null && _textFieldMaxLengthReachedCallbackDelegate != null)
+                {
+                    this.MaxLengthReachedSignal().Disconnect(_textFieldMaxLengthReachedCallbackDelegate);
+                }
+                _textFieldMaxLengthReachedEventHandler -= value;
+            }
+        }
+
+        private void OnMaxLengthReached(IntPtr textField)
+        {
+            MaxLengthReachedEventArgs e = new MaxLengthReachedEventArgs();
+
+            // Populate all members of "e" (MaxLengthReachedEventArgs) with real data
+            e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+
+            if (_textFieldMaxLengthReachedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _textFieldMaxLengthReachedEventHandler(this, e);
+            }
 
-           _textFieldTextChangedEventHandler -= value;
         }
-     }
-  }
 
- private void OnTextChanged(IntPtr textField)
-  {
-   TextChangedEventArgs e = new TextChangedEventArgs();
+        internal static TextField GetTextFieldFromPtr(global::System.IntPtr cPtr)
+        {
+            TextField ret = new TextField(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
 
-   // Populate all members of "e" (TextChangedEventArgs) with real data
-   e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
 
-   if (_textFieldTextChangedEventHandler != null)
-   {
-      //here we send all data to user event handlers
-      _textFieldTextChangedEventHandler(this, e);
-   }
+            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_TextField_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_TextField_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextField_Property_RENDERING_BACKEND_get();
+            internal static readonly int TEXT = NDalicPINVOKE.TextField_Property_TEXT_get();
+            internal static readonly int PLACEHOLDER_TEXT = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_get();
+            internal static readonly int PLACEHOLDER_TEXT_FOCUSED = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_FOCUSED_get();
+            internal static readonly int FONT_FAMILY = NDalicPINVOKE.TextField_Property_FONT_FAMILY_get();
+            internal static readonly int FONT_STYLE = NDalicPINVOKE.TextField_Property_FONT_STYLE_get();
+            internal static readonly int POINT_SIZE = NDalicPINVOKE.TextField_Property_POINT_SIZE_get();
+            internal static readonly int MAX_LENGTH = NDalicPINVOKE.TextField_Property_MAX_LENGTH_get();
+            internal static readonly int EXCEED_POLICY = NDalicPINVOKE.TextField_Property_EXCEED_POLICY_get();
+            internal static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextField_Property_HORIZONTAL_ALIGNMENT_get();
+            internal static readonly int VERTICAL_ALIGNMENT = NDalicPINVOKE.TextField_Property_VERTICAL_ALIGNMENT_get();
+            internal static readonly int TEXT_COLOR = NDalicPINVOKE.TextField_Property_TEXT_COLOR_get();
+            internal static readonly int PLACEHOLDER_TEXT_COLOR = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_COLOR_get();
+            internal static readonly int SHADOW_OFFSET = NDalicPINVOKE.TextField_Property_SHADOW_OFFSET_get();
+            internal static readonly int SHADOW_COLOR = NDalicPINVOKE.TextField_Property_SHADOW_COLOR_get();
+            internal static readonly int PRIMARY_CURSOR_COLOR = NDalicPINVOKE.TextField_Property_PRIMARY_CURSOR_COLOR_get();
+            internal static readonly int SECONDARY_CURSOR_COLOR = NDalicPINVOKE.TextField_Property_SECONDARY_CURSOR_COLOR_get();
+            internal static readonly int ENABLE_CURSOR_BLINK = NDalicPINVOKE.TextField_Property_ENABLE_CURSOR_BLINK_get();
+            internal static readonly int CURSOR_BLINK_INTERVAL = NDalicPINVOKE.TextField_Property_CURSOR_BLINK_INTERVAL_get();
+            internal static readonly int CURSOR_BLINK_DURATION = NDalicPINVOKE.TextField_Property_CURSOR_BLINK_DURATION_get();
+            internal static readonly int CURSOR_WIDTH = NDalicPINVOKE.TextField_Property_CURSOR_WIDTH_get();
+            internal static readonly int GRAB_HANDLE_IMAGE = NDalicPINVOKE.TextField_Property_GRAB_HANDLE_IMAGE_get();
+            internal static readonly int GRAB_HANDLE_PRESSED_IMAGE = NDalicPINVOKE.TextField_Property_GRAB_HANDLE_PRESSED_IMAGE_get();
+            internal static readonly int SCROLL_THRESHOLD = NDalicPINVOKE.TextField_Property_SCROLL_THRESHOLD_get();
+            internal static readonly int SCROLL_SPEED = NDalicPINVOKE.TextField_Property_SCROLL_SPEED_get();
+            internal static readonly int SELECTION_HANDLE_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HANDLE_PRESSED_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HANDLE_MARKER_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get();
+            internal static readonly int SELECTION_HANDLE_MARKER_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get();
+            internal static readonly int SELECTION_HIGHLIGHT_COLOR = NDalicPINVOKE.TextField_Property_SELECTION_HIGHLIGHT_COLOR_get();
+            internal static readonly int DECORATION_BOUNDING_BOX = NDalicPINVOKE.TextField_Property_DECORATION_BOUNDING_BOX_get();
+            internal static readonly int INPUT_METHOD_SETTINGS = NDalicPINVOKE.TextField_Property_INPUT_METHOD_SETTINGS_get();
+            internal static readonly int INPUT_COLOR = NDalicPINVOKE.TextField_Property_INPUT_COLOR_get();
+            internal static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextField_Property_ENABLE_MARKUP_get();
+            internal static readonly int INPUT_FONT_FAMILY = NDalicPINVOKE.TextField_Property_INPUT_FONT_FAMILY_get();
+            internal static readonly int INPUT_FONT_STYLE = NDalicPINVOKE.TextField_Property_INPUT_FONT_STYLE_get();
+            internal static readonly int INPUT_POINT_SIZE = NDalicPINVOKE.TextField_Property_INPUT_POINT_SIZE_get();
+            internal static readonly int UNDERLINE = NDalicPINVOKE.TextField_Property_UNDERLINE_get();
+            internal static readonly int INPUT_UNDERLINE = NDalicPINVOKE.TextField_Property_INPUT_UNDERLINE_get();
+            internal static readonly int SHADOW = NDalicPINVOKE.TextField_Property_SHADOW_get();
+            internal static readonly int INPUT_SHADOW = NDalicPINVOKE.TextField_Property_INPUT_SHADOW_get();
+            internal static readonly int EMBOSS = NDalicPINVOKE.TextField_Property_EMBOSS_get();
+            internal static readonly int INPUT_EMBOSS = NDalicPINVOKE.TextField_Property_INPUT_EMBOSS_get();
+            internal static readonly int OUTLINE = NDalicPINVOKE.TextField_Property_OUTLINE_get();
+            internal static readonly int INPUT_OUTLINE = NDalicPINVOKE.TextField_Property_INPUT_OUTLINE_get();
+
+        }
 
-  public event DaliEventHandler<object,MaxLengthReachedEventArgs> MaxLengthReached
-  {
-     add
-     {
-        lock(this)
+        internal class InputStyle : global::System.IDisposable
         {
-           // Restricted to only one listener
-           if (_textFieldMaxLengthReachedEventHandler == null)
-           {
-              _textFieldMaxLengthReachedEventHandler += value;
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal InputStyle(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(InputStyle obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~InputStyle()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TextField_InputStyle(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal InputStyle() : this(NDalicPINVOKE.new_TextField_InputStyle(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal enum Mask
+            {
+                None = 0x0000,
+                Color = 0x0001,
+                FontFamily = 0x0002,
+                PointSize = 0x0004,
+                FontStyle = 0x0008,
+                Underline = 0x0010,
+                Shadow = 0x0020,
+                Emboss = 0x0040,
+                Outline = 0x0080
+            }
 
-              _textFieldMaxLengthReachedCallbackDelegate = new MaxLengthReachedCallbackDelegate(OnMaxLengthReached);
-              this.MaxLengthReachedSignal().Connect(_textFieldMaxLengthReachedCallbackDelegate);
-           }
         }
-     }
 
-     remove
-     {
-        lock(this)
+        /// <summary>
+        /// Creates the TextField control.
+        /// </summary>
+        public TextField() : this(NDalicPINVOKE.TextField_New(), true)
         {
-           if (_textFieldMaxLengthReachedEventHandler != null)
-           {
-              this.MaxLengthReachedSignal().Disconnect(_textFieldMaxLengthReachedCallbackDelegate);
-           }
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-           _textFieldMaxLengthReachedEventHandler -= value;
         }
-     }
-  }
+        internal TextField(TextField handle) : this(NDalicPINVOKE.new_TextField__SWIG_1(TextField.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
- private void OnMaxLengthReached(IntPtr textField)
-  {
-   MaxLengthReachedEventArgs e = new MaxLengthReachedEventArgs();
+        internal TextField Assign(TextField handle)
+        {
+            TextField ret = new TextField(NDalicPINVOKE.TextField_Assign(swigCPtr, TextField.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-   // Populate all members of "e" (MaxLengthReachedEventArgs) with real data
-   e.TextField = Tizen.NUI.TextField.GetTextFieldFromPtr(textField);
+        /// <summary>
+        /// Downcasts a handle to TextField.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a TextField or an empty handle</returns>
+        public new static TextField DownCast(BaseHandle handle)
+        {
+            TextField ret = new TextField(NDalicPINVOKE.TextField_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-   if (_textFieldMaxLengthReachedEventHandler != null)
-   {
-      //here we send all data to user event handlers
-      _textFieldMaxLengthReachedEventHandler(this, e);
-   }
-
-  }
-
- public static TextField GetTextFieldFromPtr(global::System.IntPtr cPtr) {
-   TextField ret = new TextField(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal TextFieldSignal TextChangedSignal()
+        {
+            TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_TextChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
+        internal TextFieldSignal MaxLengthReachedSignal()
+        {
+            TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_MaxLengthReachedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TextField_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_TextField_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextField_Property_RENDERING_BACKEND_get();
-    public static readonly int TEXT = NDalicPINVOKE.TextField_Property_TEXT_get();
-    public static readonly int PLACEHOLDER_TEXT = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_get();
-    public static readonly int PLACEHOLDER_TEXT_FOCUSED = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_FOCUSED_get();
-    public static readonly int FONT_FAMILY = NDalicPINVOKE.TextField_Property_FONT_FAMILY_get();
-    public static readonly int FONT_STYLE = NDalicPINVOKE.TextField_Property_FONT_STYLE_get();
-    public static readonly int POINT_SIZE = NDalicPINVOKE.TextField_Property_POINT_SIZE_get();
-    public static readonly int MAX_LENGTH = NDalicPINVOKE.TextField_Property_MAX_LENGTH_get();
-    public static readonly int EXCEED_POLICY = NDalicPINVOKE.TextField_Property_EXCEED_POLICY_get();
-    public static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextField_Property_HORIZONTAL_ALIGNMENT_get();
-    public static readonly int VERTICAL_ALIGNMENT = NDalicPINVOKE.TextField_Property_VERTICAL_ALIGNMENT_get();
-    public static readonly int TEXT_COLOR = NDalicPINVOKE.TextField_Property_TEXT_COLOR_get();
-    public static readonly int PLACEHOLDER_TEXT_COLOR = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_COLOR_get();
-    public static readonly int SHADOW_OFFSET = NDalicPINVOKE.TextField_Property_SHADOW_OFFSET_get();
-    public static readonly int SHADOW_COLOR = NDalicPINVOKE.TextField_Property_SHADOW_COLOR_get();
-    public static readonly int PRIMARY_CURSOR_COLOR = NDalicPINVOKE.TextField_Property_PRIMARY_CURSOR_COLOR_get();
-    public static readonly int SECONDARY_CURSOR_COLOR = NDalicPINVOKE.TextField_Property_SECONDARY_CURSOR_COLOR_get();
-    public static readonly int ENABLE_CURSOR_BLINK = NDalicPINVOKE.TextField_Property_ENABLE_CURSOR_BLINK_get();
-    public static readonly int CURSOR_BLINK_INTERVAL = NDalicPINVOKE.TextField_Property_CURSOR_BLINK_INTERVAL_get();
-    public static readonly int CURSOR_BLINK_DURATION = NDalicPINVOKE.TextField_Property_CURSOR_BLINK_DURATION_get();
-    public static readonly int CURSOR_WIDTH = NDalicPINVOKE.TextField_Property_CURSOR_WIDTH_get();
-    public static readonly int GRAB_HANDLE_IMAGE = NDalicPINVOKE.TextField_Property_GRAB_HANDLE_IMAGE_get();
-    public static readonly int GRAB_HANDLE_PRESSED_IMAGE = NDalicPINVOKE.TextField_Property_GRAB_HANDLE_PRESSED_IMAGE_get();
-    public static readonly int SCROLL_THRESHOLD = NDalicPINVOKE.TextField_Property_SCROLL_THRESHOLD_get();
-    public static readonly int SCROLL_SPEED = NDalicPINVOKE.TextField_Property_SCROLL_SPEED_get();
-    public static readonly int SELECTION_HANDLE_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HANDLE_PRESSED_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HANDLE_MARKER_IMAGE_LEFT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_LEFT_get();
-    public static readonly int SELECTION_HANDLE_MARKER_IMAGE_RIGHT = NDalicPINVOKE.TextField_Property_SELECTION_HANDLE_MARKER_IMAGE_RIGHT_get();
-    public static readonly int SELECTION_HIGHLIGHT_COLOR = NDalicPINVOKE.TextField_Property_SELECTION_HIGHLIGHT_COLOR_get();
-    public static readonly int DECORATION_BOUNDING_BOX = NDalicPINVOKE.TextField_Property_DECORATION_BOUNDING_BOX_get();
-    public static readonly int INPUT_METHOD_SETTINGS = NDalicPINVOKE.TextField_Property_INPUT_METHOD_SETTINGS_get();
-    public static readonly int INPUT_COLOR = NDalicPINVOKE.TextField_Property_INPUT_COLOR_get();
-    public static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextField_Property_ENABLE_MARKUP_get();
-    public static readonly int INPUT_FONT_FAMILY = NDalicPINVOKE.TextField_Property_INPUT_FONT_FAMILY_get();
-    public static readonly int INPUT_FONT_STYLE = NDalicPINVOKE.TextField_Property_INPUT_FONT_STYLE_get();
-    public static readonly int INPUT_POINT_SIZE = NDalicPINVOKE.TextField_Property_INPUT_POINT_SIZE_get();
-    public static readonly int UNDERLINE = NDalicPINVOKE.TextField_Property_UNDERLINE_get();
-    public static readonly int INPUT_UNDERLINE = NDalicPINVOKE.TextField_Property_INPUT_UNDERLINE_get();
-    public static readonly int SHADOW = NDalicPINVOKE.TextField_Property_SHADOW_get();
-    public static readonly int INPUT_SHADOW = NDalicPINVOKE.TextField_Property_INPUT_SHADOW_get();
-    public static readonly int EMBOSS = NDalicPINVOKE.TextField_Property_EMBOSS_get();
-    public static readonly int INPUT_EMBOSS = NDalicPINVOKE.TextField_Property_INPUT_EMBOSS_get();
-    public static readonly int OUTLINE = NDalicPINVOKE.TextField_Property_OUTLINE_get();
-    public static readonly int INPUT_OUTLINE = NDalicPINVOKE.TextField_Property_INPUT_OUTLINE_get();
-  
-  }
-
-  public class InputStyle : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal InputStyle(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(InputStyle obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~InputStyle() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_TextField_InputStyle(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public InputStyle() : this(NDalicPINVOKE.new_TextField_InputStyle(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public enum Mask {
-      NONE = 0x0000,
-      COLOR = 0x0001,
-      FONT_FAMILY = 0x0002,
-      POINT_SIZE = 0x0004,
-      FONT_STYLE = 0x0008,
-      UNDERLINE = 0x0010,
-      SHADOW = 0x0020,
-      EMBOSS = 0x0040,
-      OUTLINE = 0x0080
-    }
-  
-  }
-
-  public TextField () : this (NDalicPINVOKE.TextField_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public TextField(TextField handle) : this(NDalicPINVOKE.new_TextField__SWIG_1(TextField.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TextField Assign(TextField handle) {
-    TextField ret = new TextField(NDalicPINVOKE.TextField_Assign(swigCPtr, TextField.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static TextField DownCast(BaseHandle handle) {
-    TextField ret = new TextField(NDalicPINVOKE.TextField_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TextFieldSignal TextChangedSignal() {
-    TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_TextChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TextFieldSignal MaxLengthReachedSignal() {
-    TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_MaxLengthReachedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t InputStyleChangedSignal() {
-    SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(NDalicPINVOKE.TextField_InputStyleChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public enum ExceedPolicyType {
-    EXCEED_POLICY_ORIGINAL,
-    EXCEED_POLICY_CLIP
-  }
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.RENDERING_BACKEND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.TEXT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string PlaceholderText
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string PlaceholderTextFocused
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT_FOCUSED).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT_FOCUSED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.FONT_FAMILY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map FontStyle
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.FONT_STYLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.POINT_SIZE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int MaxLength
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.MAX_LENGTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.MAX_LENGTH, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int ExceedPolicy
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.EXCEED_POLICY).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.EXCEED_POLICY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string VerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.VERTICAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.TEXT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.TEXT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 PlaceholderTextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.PLACEHOLDER_TEXT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PLACEHOLDER_TEXT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector2 ShadowOffset
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TextField.Property.SHADOW_OFFSET).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW_OFFSET, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 ShadowColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SHADOW_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 PrimaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.PRIMARY_CURSOR_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.PRIMARY_CURSOR_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 SecondaryCursorColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SECONDARY_CURSOR_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SECONDARY_CURSOR_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableCursorBlink
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextField.Property.ENABLE_CURSOR_BLINK).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.ENABLE_CURSOR_BLINK, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkInterval
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.CURSOR_BLINK_INTERVAL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_BLINK_INTERVAL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float CursorBlinkDuration
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.CURSOR_BLINK_DURATION).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_BLINK_DURATION, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int CursorWidth
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextField.Property.CURSOR_WIDTH).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.CURSOR_WIDTH, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string GrabHandleImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.GRAB_HANDLE_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.GRAB_HANDLE_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string GrabHandlePressedImage
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.GRAB_HANDLE_PRESSED_IMAGE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.GRAB_HANDLE_PRESSED_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float ScrollThreshold
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.SCROLL_THRESHOLD).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SCROLL_THRESHOLD, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float ScrollSpeed
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SCROLL_SPEED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandlePressedImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandlePressedImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleMarkerImageLeft
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map SelectionHandleMarkerImageRight
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 SelectionHighlightColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.SELECTION_HIGHLIGHT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Rectangle DecorationBoundingBox
-  {
-    get
-    {
-      Rectangle temp = new Rectangle(0,0,0,0);
-      GetProperty( TextField.Property.DECORATION_BOUNDING_BOX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.DECORATION_BOUNDING_BOX, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputMethodSettings
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_METHOD_SETTINGS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_METHOD_SETTINGS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 InputColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextField.Property.INPUT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextField.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.ENABLE_MARKUP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string InputFontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextField.Property.INPUT_FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_FONT_FAMILY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputFontStyle
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_FONT_STYLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float InputPointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextField.Property.INPUT_POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_POINT_SIZE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Underline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.UNDERLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputUnderline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_UNDERLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Shadow
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.SHADOW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputShadow
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_SHADOW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Emboss
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.EMBOSS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputEmboss
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_EMBOSS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Outline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.OUTLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map InputOutline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextField.Property.INPUT_OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextField.Property.INPUT_OUTLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t InputStyleChangedSignal()
+        {
+            SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(NDalicPINVOKE.TextField_InputStyleChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-}
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        internal enum ExceedPolicyType
+        {
+            ExceedPolicyOriginal,
+            ExceedPolicyClip
+        }
+
+        /// <summary>
+        /// RenderingBackend property.
+        /// </summary>
+        public int RenderingBackend
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextField.Property.RENDERING_BACKEND).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Text property.
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.TEXT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.TEXT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PlaceholderText property.
+        /// </summary>
+        public string PlaceholderText
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.PLACEHOLDER_TEXT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.PLACEHOLDER_TEXT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PlaceholderTextFocused property.
+        /// </summary>
+        public string PlaceholderTextFocused
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.PLACEHOLDER_TEXT_FOCUSED).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.PLACEHOLDER_TEXT_FOCUSED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// FontFamily property.
+        /// </summary>
+        public string FontFamily
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.FONT_FAMILY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.FONT_FAMILY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// FontStyle property.
+        /// </summary>
+        public PropertyMap FontStyle
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.FONT_STYLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.FONT_STYLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PointSize property.
+        /// </summary>
+        public float PointSize
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.POINT_SIZE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.POINT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// MaxLength property.
+        /// </summary>
+        public int MaxLength
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextField.Property.MAX_LENGTH).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.MAX_LENGTH, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ExceedPolicy property.
+        /// </summary>
+        public int ExceedPolicy
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextField.Property.EXCEED_POLICY).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.EXCEED_POLICY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// HorizontalAlignment property.
+        /// </summary>
+        public string HorizontalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.HORIZONTAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// VerticalAlignment property.
+        /// </summary>
+        public string VerticalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.VERTICAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.VERTICAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// TextColor property.
+        /// </summary>
+        public Color TextColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.TEXT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.TEXT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PlaceholderTextColor property.
+        /// </summary>
+        public Vector4 PlaceholderTextColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.PLACEHOLDER_TEXT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.PLACEHOLDER_TEXT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ShadowOffset property.
+        /// </summary>
+        public Vector2 ShadowOffset
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(TextField.Property.SHADOW_OFFSET).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SHADOW_OFFSET, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ShadowColor property.
+        /// </summary>
+        public Vector4 ShadowColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.SHADOW_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SHADOW_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PrimaryCursorColor property.
+        /// </summary>
+        public Vector4 PrimaryCursorColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.PRIMARY_CURSOR_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.PRIMARY_CURSOR_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SecondaryCursorColor property.
+        /// </summary>
+        public Vector4 SecondaryCursorColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.SECONDARY_CURSOR_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SECONDARY_CURSOR_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableCursorBlink property.
+        /// </summary>
+        public bool EnableCursorBlink
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextField.Property.ENABLE_CURSOR_BLINK).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.ENABLE_CURSOR_BLINK, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorBlinkInterval property.
+        /// </summary>
+        public float CursorBlinkInterval
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.CURSOR_BLINK_INTERVAL).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.CURSOR_BLINK_INTERVAL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorBlinkDuration property.
+        /// </summary>
+        public float CursorBlinkDuration
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.CURSOR_BLINK_DURATION).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.CURSOR_BLINK_DURATION, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// CursorWidth property.
+        /// </summary>
+        public int CursorWidth
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextField.Property.CURSOR_WIDTH).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.CURSOR_WIDTH, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// GrabHandleImage property.
+        /// </summary>
+        public string GrabHandleImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.GRAB_HANDLE_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.GRAB_HANDLE_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// GrabHandlePressedImage property.
+        /// </summary>
+        public string GrabHandlePressedImage
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.GRAB_HANDLE_PRESSED_IMAGE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.GRAB_HANDLE_PRESSED_IMAGE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ScrollThreshold property.
+        /// </summary>
+        public float ScrollThreshold
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.SCROLL_THRESHOLD).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SCROLL_THRESHOLD, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ScrollSpeed property.
+        /// </summary>
+        public float ScrollSpeed
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.SCROLL_SPEED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SCROLL_SPEED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandleImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandleImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandlePressedImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandlePressedImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandlePressedImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandlePressedImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleMarkerImageLeft property.
+        /// </summary>
+        public PropertyMap SelectionHandleMarkerImageLeft
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_LEFT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHandleMarkerImageRight property.
+        /// </summary>
+        public PropertyMap SelectionHandleMarkerImageRight
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HANDLE_MARKER_IMAGE_RIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// SelectionHighlightColor property.
+        /// </summary>
+        public Vector4 SelectionHighlightColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.SELECTION_HIGHLIGHT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SELECTION_HIGHLIGHT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// DecorationBoundingBox property.
+        /// </summary>
+        public Rectangle DecorationBoundingBox
+        {
+            get
+            {
+                Rectangle temp = new Rectangle(0, 0, 0, 0);
+                GetProperty(TextField.Property.DECORATION_BOUNDING_BOX).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.DECORATION_BOUNDING_BOX, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputMethodSettings property.
+        /// </summary>
+        public PropertyMap InputMethodSettings
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_METHOD_SETTINGS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_METHOD_SETTINGS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputColor property.
+        /// </summary>
+        public Vector4 InputColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextField.Property.INPUT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableMarkup property.
+        /// </summary>
+        public bool EnableMarkup
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextField.Property.ENABLE_MARKUP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.ENABLE_MARKUP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputFontFamily property.
+        /// </summary>
+        public string InputFontFamily
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextField.Property.INPUT_FONT_FAMILY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_FONT_FAMILY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputFontStyle property.
+        /// </summary>
+        public PropertyMap InputFontStyle
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_FONT_STYLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_FONT_STYLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputPointSize property.
+        /// </summary>
+        public float InputPointSize
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextField.Property.INPUT_POINT_SIZE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_POINT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Underline property.
+        /// </summary>
+        public PropertyMap Underline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.UNDERLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.UNDERLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputUnderline property.
+        /// </summary>
+        public PropertyMap InputUnderline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_UNDERLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_UNDERLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Shadow property.
+        /// </summary>
+        public PropertyMap Shadow
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.SHADOW).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.SHADOW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputShadow property.
+        /// </summary>
+        public PropertyMap InputShadow
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_SHADOW).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_SHADOW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Emboss property.
+        /// </summary>
+        public PropertyMap Emboss
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.EMBOSS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.EMBOSS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputEmboss property.
+        /// </summary>
+        public PropertyMap InputEmboss
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_EMBOSS).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_EMBOSS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Outline property.
+        /// </summary>
+        public PropertyMap Outline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.OUTLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.OUTLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// InputOutline property.
+        /// </summary>
+        public PropertyMap InputOutline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextField.Property.INPUT_OUTLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextField.Property.INPUT_OUTLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 6b57457..8a2b623 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TextFieldSignal : global::System.IDisposable {
+    internal class TextFieldSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5478596..13b94ed 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class TextLabel : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+    /// <summary>
+    /// A control which renders a short text string.
+    /// Text labels are lightweight, non-editable and do not respond to user input.
+    /// </summary>
+    public class TextLabel : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-  internal TextLabel(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextLabel_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal TextLabel(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextLabel_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextLabel obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextLabel obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~TextLabel() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~TextLabel()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        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_TextLabel(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_TextLabel(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();
-    }
-  }
 
 
-  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_TextLabel_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_TextLabel_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextLabel_Property_RENDERING_BACKEND_get();
-    public static readonly int TEXT = NDalicPINVOKE.TextLabel_Property_TEXT_get();
-    public static readonly int FONT_FAMILY = NDalicPINVOKE.TextLabel_Property_FONT_FAMILY_get();
-    public static readonly int FONT_STYLE = NDalicPINVOKE.TextLabel_Property_FONT_STYLE_get();
-    public static readonly int POINT_SIZE = NDalicPINVOKE.TextLabel_Property_POINT_SIZE_get();
-    public static readonly int MULTI_LINE = NDalicPINVOKE.TextLabel_Property_MULTI_LINE_get();
-    public static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextLabel_Property_HORIZONTAL_ALIGNMENT_get();
-    public static readonly int VERTICAL_ALIGNMENT = NDalicPINVOKE.TextLabel_Property_VERTICAL_ALIGNMENT_get();
-    public static readonly int TEXT_COLOR = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_get();
-    public static readonly int SHADOW_OFFSET = NDalicPINVOKE.TextLabel_Property_SHADOW_OFFSET_get();
-    public static readonly int SHADOW_COLOR = NDalicPINVOKE.TextLabel_Property_SHADOW_COLOR_get();
-    public static readonly int UNDERLINE_ENABLED = NDalicPINVOKE.TextLabel_Property_UNDERLINE_ENABLED_get();
-    public static readonly int UNDERLINE_COLOR = NDalicPINVOKE.TextLabel_Property_UNDERLINE_COLOR_get();
-    public static readonly int UNDERLINE_HEIGHT = NDalicPINVOKE.TextLabel_Property_UNDERLINE_HEIGHT_get();
-    public static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextLabel_Property_ENABLE_MARKUP_get();
-    public static readonly int ENABLE_AUTO_SCROLL = NDalicPINVOKE.TextLabel_Property_ENABLE_AUTO_SCROLL_get();
-    public static readonly int AUTO_SCROLL_SPEED = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_SPEED_get();
-    public static readonly int AUTO_SCROLL_LOOP_COUNT = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_COUNT_get();
-    public static readonly int AUTO_SCROLL_GAP = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_GAP_get();
-    public static readonly int LINE_SPACING = NDalicPINVOKE.TextLabel_Property_LINE_SPACING_get();
-    public static readonly int UNDERLINE = NDalicPINVOKE.TextLabel_Property_UNDERLINE_get();
-    public static readonly int SHADOW = NDalicPINVOKE.TextLabel_Property_SHADOW_get();
-    public static readonly int EMBOSS = NDalicPINVOKE.TextLabel_Property_EMBOSS_get();
-    public static readonly int OUTLINE = NDalicPINVOKE.TextLabel_Property_OUTLINE_get();
-  
-  }
-
-  public TextLabel () : this (NDalicPINVOKE.TextLabel_New__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public TextLabel (string text) : this (NDalicPINVOKE.TextLabel_New__SWIG_1(text), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public TextLabel(TextLabel handle) : this(NDalicPINVOKE.new_TextLabel__SWIG_1(TextLabel.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public TextLabel Assign(TextLabel handle) {
-    TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_Assign(swigCPtr, TextLabel.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static TextLabel DownCast(BaseHandle handle) {
-    TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
-  }
-
-  public int RenderingBackend
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.RENDERING_BACKEND).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.RENDERING_BACKEND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string Text
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.TEXT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.TEXT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string FontFamily
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.FONT_FAMILY).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.FONT_FAMILY, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map FontStyle
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextLabel.Property.FONT_STYLE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.FONT_STYLE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float PointSize
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.POINT_SIZE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.POINT_SIZE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool MultiLine
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.MULTI_LINE).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.MULTI_LINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string HorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string VerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TextLabel.Property.VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.VERTICAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 TextColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.TEXT_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.TEXT_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector2 ShadowOffset
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TextLabel.Property.SHADOW_OFFSET).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW_OFFSET, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 ShadowColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.SHADOW_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool UnderlineEnabled
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.UNDERLINE_ENABLED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_ENABLED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 UnderlineColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( TextLabel.Property.UNDERLINE_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float UnderlineHeight
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.UNDERLINE_HEIGHT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE_HEIGHT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableMarkup
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.ENABLE_MARKUP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.ENABLE_MARKUP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool EnableAutoScroll
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AutoScrollSpeed
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_SPEED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_SPEED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AutoScrollLoopCount
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float AutoScrollGap
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.AUTO_SCROLL_GAP).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.AUTO_SCROLL_GAP, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float LineSpacing
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TextLabel.Property.LINE_SPACING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.LINE_SPACING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Underline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextLabel.Property.UNDERLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.UNDERLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Shadow
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextLabel.Property.SHADOW).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.SHADOW, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Emboss
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextLabel.Property.EMBOSS).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.EMBOSS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Outline
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( TextLabel.Property.OUTLINE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TextLabel.Property.OUTLINE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        internal class Property : global::System.IDisposable
+        {
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
 
-}
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_TextLabel_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_TextLabel_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextLabel_Property_RENDERING_BACKEND_get();
+            internal static readonly int TEXT = NDalicPINVOKE.TextLabel_Property_TEXT_get();
+            internal static readonly int FONT_FAMILY = NDalicPINVOKE.TextLabel_Property_FONT_FAMILY_get();
+            internal static readonly int FONT_STYLE = NDalicPINVOKE.TextLabel_Property_FONT_STYLE_get();
+            internal static readonly int POINT_SIZE = NDalicPINVOKE.TextLabel_Property_POINT_SIZE_get();
+            internal static readonly int MULTI_LINE = NDalicPINVOKE.TextLabel_Property_MULTI_LINE_get();
+            internal static readonly int HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TextLabel_Property_HORIZONTAL_ALIGNMENT_get();
+            internal static readonly int VERTICAL_ALIGNMENT = NDalicPINVOKE.TextLabel_Property_VERTICAL_ALIGNMENT_get();
+            internal static readonly int TEXT_COLOR = NDalicPINVOKE.TextLabel_Property_TEXT_COLOR_get();
+            internal static readonly int SHADOW_OFFSET = NDalicPINVOKE.TextLabel_Property_SHADOW_OFFSET_get();
+            internal static readonly int SHADOW_COLOR = NDalicPINVOKE.TextLabel_Property_SHADOW_COLOR_get();
+            internal static readonly int UNDERLINE_ENABLED = NDalicPINVOKE.TextLabel_Property_UNDERLINE_ENABLED_get();
+            internal static readonly int UNDERLINE_COLOR = NDalicPINVOKE.TextLabel_Property_UNDERLINE_COLOR_get();
+            internal static readonly int UNDERLINE_HEIGHT = NDalicPINVOKE.TextLabel_Property_UNDERLINE_HEIGHT_get();
+            internal static readonly int ENABLE_MARKUP = NDalicPINVOKE.TextLabel_Property_ENABLE_MARKUP_get();
+            internal static readonly int ENABLE_AUTO_SCROLL = NDalicPINVOKE.TextLabel_Property_ENABLE_AUTO_SCROLL_get();
+            internal static readonly int AUTO_SCROLL_SPEED = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_SPEED_get();
+            internal static readonly int AUTO_SCROLL_LOOP_COUNT = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_LOOP_COUNT_get();
+            internal static readonly int AUTO_SCROLL_GAP = NDalicPINVOKE.TextLabel_Property_AUTO_SCROLL_GAP_get();
+            internal static readonly int LINE_SPACING = NDalicPINVOKE.TextLabel_Property_LINE_SPACING_get();
+            internal static readonly int UNDERLINE = NDalicPINVOKE.TextLabel_Property_UNDERLINE_get();
+            internal static readonly int SHADOW = NDalicPINVOKE.TextLabel_Property_SHADOW_get();
+            internal static readonly int EMBOSS = NDalicPINVOKE.TextLabel_Property_EMBOSS_get();
+            internal static readonly int OUTLINE = NDalicPINVOKE.TextLabel_Property_OUTLINE_get();
+
+        }
+
+        /// <summary>
+        /// Creates the TextLabel control.
+        /// </summary>
+        public TextLabel() : this(NDalicPINVOKE.TextLabel_New__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates the TextLabel control.
+        /// </summary>
+        /// <param name="text">The text to display</param>
+        public TextLabel(string text) : this(NDalicPINVOKE.TextLabel_New__SWIG_1(text), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal TextLabel(TextLabel handle) : this(NDalicPINVOKE.new_TextLabel__SWIG_1(TextLabel.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal TextLabel Assign(TextLabel handle)
+        {
+            TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_Assign(swigCPtr, TextLabel.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to TextLabel.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        public new static TextLabel DownCast(BaseHandle handle)
+        {
+            TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000
+        }
+
+        /// <summary>
+        /// RenderingBackend property
+        /// The type of rendering e.g. bitmap-based.
+        /// </summary>
+        public int RenderingBackend
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.RENDERING_BACKEND).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Text property
+        /// The text to display in UTF-8 format.
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.TEXT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.TEXT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// FontFamily property
+        /// The requested font family to use.
+        /// </summary>
+        public string FontFamily
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.FONT_FAMILY).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.FONT_FAMILY, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// FontStyle property
+        /// The requested font style to use.
+        /// </summary>
+        public PropertyMap FontStyle
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextLabel.Property.FONT_STYLE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.FONT_STYLE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// PointSize property
+        /// The size of font in points.
+        /// </summary>
+        public float PointSize
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextLabel.Property.POINT_SIZE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.POINT_SIZE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// MultiLine property
+        /// The single-line or multi-line layout option.
+        /// </summary>
+        public bool MultiLine
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextLabel.Property.MULTI_LINE).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.MULTI_LINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// HorizontalAlignment property
+        /// The line horizontal alignment.
+        /// </summary>
+        public string HorizontalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.HORIZONTAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.HORIZONTAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// VerticalAlignment property
+        /// The line vertical alignment.
+        /// </summary>
+        public string VerticalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.VERTICAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.VERTICAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// TextColor property
+        /// The color of the text.
+        /// </summary>
+        public Color TextColor
+        {
+            get
+            {
+                Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextLabel.Property.TEXT_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.TEXT_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ShadowOffset property
+        /// The drop shadow offset 0 indicates no shadow.
+        /// </summary>
+        public Vector2 ShadowOffset
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(TextLabel.Property.SHADOW_OFFSET).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.SHADOW_OFFSET, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// ShadowColor property
+        /// The color of a drop shadow.
+        /// </summary>
+        public Vector4 ShadowColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextLabel.Property.SHADOW_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.SHADOW_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// UnderlineEnabled property
+        /// The underline enabled flag.
+        /// </summary>
+        public bool UnderlineEnabled
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextLabel.Property.UNDERLINE_ENABLED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.UNDERLINE_ENABLED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// UnderlineColor property
+        /// Overrides the underline height from font metrics.
+        /// </summary>
+        public Vector4 UnderlineColor
+        {
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(TextLabel.Property.UNDERLINE_COLOR).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.UNDERLINE_COLOR, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// UnderlineHeight property
+        /// Overrides the underline height from font metrics.
+        /// </summary>
+        public float UnderlineHeight
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextLabel.Property.UNDERLINE_HEIGHT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.UNDERLINE_HEIGHT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableMarkup property
+        /// Whether the mark-up processing is enabled.
+        /// </summary>
+        public bool EnableMarkup
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextLabel.Property.ENABLE_MARKUP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.ENABLE_MARKUP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// EnableAutoScroll property
+        /// Starts or stops auto scrolling.
+        /// </summary>
+        public bool EnableAutoScroll
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(TextLabel.Property.ENABLE_AUTO_SCROLL).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.ENABLE_AUTO_SCROLL, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// AutoScrollSpeed property
+        /// Sets the speed of scrolling in pixels per second.
+        /// </summary>
+        public int AutoScrollSpeed
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.AUTO_SCROLL_SPEED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.AUTO_SCROLL_SPEED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// AutoScrollLoopCount property
+        /// Number of complete loops when scrolling enabled.
+        /// </summary>
+        public int AutoScrollLoopCount
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_COUNT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// AutoScrollGap property
+        /// Gap before scrolling wraps.
+        /// </summary>
+        public float AutoScrollGap
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextLabel.Property.AUTO_SCROLL_GAP).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.AUTO_SCROLL_GAP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// LineSpacing property
+        /// The default extra space between lines in points.
+        /// </summary>
+        public float LineSpacing
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TextLabel.Property.LINE_SPACING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.LINE_SPACING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Underline property
+        /// The default underline parameters.
+        /// </summary>
+        public PropertyMap Underline
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextLabel.Property.UNDERLINE).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.UNDERLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Shadow property
+        /// The default shadow parameters.
+        /// </summary>
+        public PropertyMap Shadow
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(TextLabel.Property.SHADOW).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.SHADOW, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Emboss property
+        /// The default emboss parameters.
+        /// </summary>
+        public string Emboss
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.EMBOSS).Get( out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.EMBOSS, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// Outline property
+        /// The default outline parameters.
+        /// </summary>
+        public string Outline
+        {
+            get
+            {
+                string temp;
+                GetProperty(TextLabel.Property.OUTLINE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TextLabel.Property.OUTLINE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 0c8e2ec..6d6efaf 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class Texture : BaseHandle {
+    internal class Texture : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal Texture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Texture_SWIGUpcast(cPtr), cMemoryOwn) {
@@ -114,6 +114,10 @@ public class Texture : BaseHandle {
     return ret;
   }
 
+  public Texture(SWIGTYPE_p_Dali__Internal__Texture pointer) : this(NDalicPINVOKE.new_Texture__SWIG_2(SWIGTYPE_p_Dali__Internal__Texture.getCPtr(pointer)), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
 }
 
 }
index 260d759..a80a16a 100755 (executable)
@@ -26,7 +26,7 @@
 
 namespace Tizen.NUI {
 
-public class TextureSet : BaseHandle {
+    internal class TextureSet : BaseHandle {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
   internal TextureSet(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextureSet_SWIGUpcast(cPtr), cMemoryOwn) {
index b3a2d81..651c177 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum TextureType {
+    internal enum TextureType {
   TEXTURE_2D,
   TEXTURE_CUBE
 }
index b6b04da..91d5fe8 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TimePeriod : global::System.IDisposable {
+    internal class TimePeriod : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index b05ce1f..fbe2abe 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Mechanism to issue simple periodic or one-shot events.
+    /// Timer is provided for application developers to be able to issue
+    /// simple periodic or one-shot events.  Please note that timer
+    /// callback functions should return as soon as possible, because they
+    /// block the next SignalTick.  Please note that timer signals are not
+    /// in sync with Dali's render timer.
+    /// This class is a handle class so it can be stack allocated and used
+    /// as a member.
+    /// </summary>
+    public class Timer : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Timer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Timer_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class Timer : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Timer obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal Timer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Timer_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~Timer()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Timer 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;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Timer(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~Timer() {
-    DisposeQueue.Instance.Add(this);
-  }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Event arguments that passed via Tick event
+        /// </summary>
+        public class TickEventArgs : EventArgs
+        {
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Timer(swigCPtr);
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool TickCallbackDelegate(IntPtr data);
+        private EventHandlerWithReturnType<object, TickEventArgs, bool> _timerTickEventHandler;
+        private TickCallbackDelegate _timerTickCallbackDelegate;
+
+        /// <summary>
+        /// brief Event for Ticked signal which can be used to subscribe/unsubscribe the event handler
+        /// (in the type of TickEventHandler-DaliEventHandlerWithReturnType<object,TickEventArgs,bool>) 
+        /// provided by the user. Ticked signal is emitted after specified time interval.
+        /// </summary>
+        public event EventHandlerWithReturnType<object, TickEventArgs, bool> Tick
+        {
+            add
+            {
+                if (_timerTickEventHandler == null)
+                {
+                    _timerTickCallbackDelegate = (OnTick);
+                    TickSignal().Connect(_timerTickCallbackDelegate);
+                }
+                _timerTickEventHandler += value;
+            }
+            remove
+            {
+                _timerTickEventHandler -= value;
+                if (_timerTickEventHandler == null && _timerTickCallbackDelegate != null)
+                {
+                    TickSignal().Disconnect(_timerTickCallbackDelegate);
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-  public Timer (uint milliSec) : this (NDalicPINVOKE.Timer_New(milliSec), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Timer(Timer timer) : this(NDalicPINVOKE.new_Timer__SWIG_1(Timer.getCPtr(timer)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Timer Assign(Timer timer) {
-    Timer ret = new Timer(NDalicPINVOKE.Timer_Assign(swigCPtr, Timer.getCPtr(timer)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public static Timer DownCast(BaseHandle handle) {
-    Timer ret = new Timer(NDalicPINVOKE.Timer_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Start() {
-    NDalicPINVOKE.Timer_Start(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Stop() {
-    NDalicPINVOKE.Timer_Stop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetInterval(uint milliSec) {
-    NDalicPINVOKE.Timer_SetInterval(swigCPtr, milliSec);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public uint GetInterval() {
-    uint ret = NDalicPINVOKE.Timer_GetInterval(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsRunning() {
-    bool ret = NDalicPINVOKE.Timer_IsRunning(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public BoolSignal TickSignal() {
-    BoolSignal ret = new BoolSignal(NDalicPINVOKE.Timer_TickSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
 
-}
+        private bool OnTick(IntPtr data)
+        {
+            TickEventArgs e = new TickEventArgs();
+
+            if (_timerTickEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                return _timerTickEventHandler(this, e);
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a tick Timer that emits periodic signal.
+        /// </summary>
+        /// <param name="millSec">Interval in milliseconds</param>
+        /// <returns>A new timer</returns>
+        public Timer(uint milliSec) : this(NDalicPINVOKE.Timer_New(milliSec), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal Timer(Timer timer) : this(NDalicPINVOKE.new_Timer__SWIG_1(Timer.getCPtr(timer)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Timer Assign(Timer timer)
+        {
+            Timer ret = new Timer(NDalicPINVOKE.Timer_Assign(swigCPtr, Timer.getCPtr(timer)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to Timer handle.
+        /// </summary>
+        /// <param name="handle">handle to An object</param>
+        /// <returns>handle to a Timer object or an uninitialized handle</returns>
+        public static Timer DownCast(BaseHandle handle)
+        {
+            Timer ret = new Timer(NDalicPINVOKE.Timer_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Starts timer
+        /// In case a Timer is already running, its time is reset and timer is restarted.
+        /// </summary>
+        public void Start()
+        {
+            NDalicPINVOKE.Timer_Start(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Stops timer.
+        /// </summary>
+        public void Stop()
+        {
+            NDalicPINVOKE.Timer_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Sets a new interval on the timer and starts the timer.
+        /// Cancels the previous timer.
+        /// </summary>
+        /// <param name="milliSec">milliSec Interval in milliseconds</param>
+        internal void SetInterval(uint milliSec)
+        {
+            NDalicPINVOKE.Timer_SetInterval(swigCPtr, milliSec);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal uint GetInterval()
+        {
+            uint ret = NDalicPINVOKE.Timer_GetInterval(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Tells whether timer is running.
+        /// </summary>
+        /// <returns>Whether Timer is started or not</returns>
+        public bool IsRunning()
+        {
+            bool ret = NDalicPINVOKE.Timer_IsRunning(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal TimerSignalType TickSignal()
+        {
+            TimerSignalType ret = new TimerSignalType(NDalicPINVOKE.Timer_TickSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+    }
 
 }
index 427ebf3..6b31a11 100755 (executable)
 
 namespace Tizen.NUI {
 
-public class TimerSignalType : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    internal class TimerSignalType : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
   internal TimerSignalType(global::System.IntPtr cPtr, bool cMemoryOwn) {
     swigCMemOwn = cMemoryOwn;
@@ -40,10 +41,6 @@ public class TimerSignalType : global::System.IDisposable {
     }
   }
 
-  public TimerSignalType() : this(NDalicPINVOKE.new_TimerSignalType(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
   public bool Empty() {
     bool ret = NDalicPINVOKE.TimerSignalType_Empty(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -56,19 +53,20 @@ public class TimerSignalType : global::System.IDisposable {
     return ret;
   }
 
-  public void Connect(SWIGTYPE_p_f___bool func) {
-    NDalicPINVOKE.TimerSignalType_Connect__SWIG_0(swigCPtr, SWIGTYPE_p_f___bool.getCPtr(func));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Disconnect(SWIGTYPE_p_f___bool func) {
-    NDalicPINVOKE.TimerSignalType_Disconnect(swigCPtr, SWIGTYPE_p_f___bool.getCPtr(func));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public void Connect(System.Delegate func) {
+System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
+    {
+      NDalicPINVOKE.TimerSignalType_Connect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
   }
 
-  public void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) {
-    NDalicPINVOKE.TimerSignalType_Connect__SWIG_4(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), SWIGTYPE_p_Dali__FunctorDelegate.getCPtr(arg1));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  public void Disconnect(System.Delegate func) {
+System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(func); 
+    {
+      NDalicPINVOKE.TimerSignalType_Disconnect(swigCPtr, new System.Runtime.InteropServices.HandleRef(this, ip));
+      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+    }
   }
 
   public bool Emit() {
@@ -77,6 +75,10 @@ public class TimerSignalType : global::System.IDisposable {
     return ret;
   }
 
+  public TimerSignalType() : this(NDalicPINVOKE.new_TimerSignalType(), true) {
+    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+  }
+
 }
 
 }
index 5bad9d2..ad8697a 100755 (executable)
@@ -120,30 +120,30 @@ public class ToggleButton : Button {
     PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000
   }
 
-  public Tizen.NUI.Property.Array StateVisuals
+  public Tizen.NUI.PropertyArray StateVisuals
   {
     get
     {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
+      Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
       GetProperty( ToggleButton.Property.STATE_VISUALS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( ToggleButton.Property.STATE_VISUALS, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ToggleButton.Property.STATE_VISUALS, new Tizen.NUI.PropertyValue( value ) );
     }
   }
-  public Tizen.NUI.Property.Array Tooltips
+  public Tizen.NUI.PropertyArray Tooltips
   {
     get
     {
-      Tizen.NUI.Property.Array temp = new Tizen.NUI.Property.Array();
+      Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
       GetProperty( ToggleButton.Property.TOOLTIPS).Get(  temp );
       return temp;
     }
     set
     {
-      SetProperty( ToggleButton.Property.TOOLTIPS, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ToggleButton.Property.TOOLTIPS, new Tizen.NUI.PropertyValue( value ) );
     }
   }
   public int CurrentStateIndex
@@ -156,7 +156,7 @@ public class ToggleButton : Button {
     }
     set
     {
-      SetProperty( ToggleButton.Property.CURRENT_STATE_INDEX, new Tizen.NUI.Property.Value( value ) );
+      SetProperty( ToggleButton.Property.CURRENT_STATE_INDEX, new Tizen.NUI.PropertyValue( value ) );
     }
   }
 
index 31186d7..a5b4810 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum ToolkitPropertyRange {
+    internal enum ToolkitPropertyRange {
   VISUAL_PROPERTY_BASE_START_INDEX = PropertyRanges.CORE_PROPERTY_MAX_INDEX+1,
   VISUAL_PROPERTY_BASE_END_INDEX = VISUAL_PROPERTY_BASE_START_INDEX+100,
   VISUAL_PROPERTY_START_INDEX = VISUAL_PROPERTY_BASE_END_INDEX+1,
index 9cf68b6..f014cb7 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum TooltipPositionType {
+    internal enum TooltipPositionType {
   ABOVE,
   BELOW,
   HOVER_POINT
index 1aa282e..6118a84 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// Touch events are a collection of points at a specific moment in time.
+    /// When a multi-touch event occurs, each point represents the points that are currently being
+    /// touched or the points where a touch has stopped.
+    /// </summary>
+    public class Touch : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Touch(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Touch_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class Touch : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Touch obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal Touch(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Touch_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~Touch()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Touch obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Touch(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~Touch() {
-    DisposeQueue.Instance.Add(this);
-  }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        internal static Touch GetTouchFromPtr(global::System.IntPtr cPtr)
+        {
+            Touch ret = new Touch(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// An uninitialized Touch instance.
+        /// Calling member functions with an uninitialized Touch handle is not allowed.
+        /// </summary>
+        public Touch() : this(NDalicPINVOKE.new_Touch__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Touch(Touch other) : this(NDalicPINVOKE.new_Touch__SWIG_1(Touch.getCPtr(other)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Touch Assign(Touch other)
+        {
+            Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the time (in ms) that the touch event occurred.
+        /// </summary>
+        /// <returns>The time (in ms) that the touch event occurred</returns>
+        public uint GetTime()
+        {
+            uint ret = NDalicPINVOKE.Touch_GetTime(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the total number of points in this TouchData.
+        /// </summary>
+        /// <returns>Total number of Points</returns>
+        public uint GetPointCount()
+        {
+            uint ret = NDalicPINVOKE.Touch_GetPointCount(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the ID of the device used for the Point specified.
+        /// Each point has a unique device ID which specifies the device used for that
+        /// point. This is returned by this method.
+        /// If point is greater than GetPointCount() then this method will return -1.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The Device ID of this point</returns>
+        public int GetDeviceId(uint point)
+        {
+            int ret = NDalicPINVOKE.Touch_GetDeviceId(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Touch(swigCPtr);
+        /// <summary>
+        /// Retrieves the State of the point specified.
+        /// If point is greater than GetPointCount() then this method will return PointState.Finished.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The state of the point specified</returns>
+        public PointStateType GetState(uint point)
+        {
+            PointStateType ret = (PointStateType)NDalicPINVOKE.Touch_GetState(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
+
+        /// <summary>
+        /// Retrieves the actor that was underneath the point specified.
+        /// If point is greater than GetPointCount() then this method will return an empty handle.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The actor that was underneath the point specified</returns>
+        public Actor GetHitActor(uint point)
+        {
+            Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the co-ordinates relative to the top-left of the hit-actor at the point specified.
+        /// The top-left of an actor is (0.0, 0.0, 0.5).
+        /// If you require the local coordinates of another actor (e.g the parent of the hit actor),
+        /// then you should use Actor::ScreenToLocal().
+        /// If point is greater than GetPointCount() then this method will return Vector2.Zero.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The co-ordinates relative to the top-left of the hit-actor of the point specified</returns>
+        public Vector2 GetLocalPosition(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetLocalPosition(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the co-ordinates relative to the top-left of the screen of the point specified.
+        /// If point is greater than GetPointCount() then this method will return Vector2.Zero.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The co-ordinates relative to the top-left of the screen of the point specified</returns>
+        public Vector2 GetScreenPosition(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetScreenPosition(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the radius of the press point.
+        /// This is the average of both the horizontal and vertical radii of the press point.
+        /// If point is greater than GetPointCount() then this method will return 0.0f.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The radius of the press point</returns>
+        public float GetRadius(uint point)
+        {
+            float ret = NDalicPINVOKE.Touch_GetRadius(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves BOTH the horizontal and the vertical radii of the press point.
+        /// If point is greater than GetPointCount() then this method will return Vector2.Zero.
+        /// </summary>
+        /// <param name="point">The point required</param>
+        /// <returns>The horizontal and vertical radii of the press point</returns>
+        public Vector2 GetEllipseRadius(uint point)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetEllipseRadius(swigCPtr, point), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Retrieves the touch pressure.
+        /// The pressure range starts at 0.0f.
+        /// Normal pressure is defined as 1.0f.
+        /// A value between 0.0f and 1.0f means light pressure has been applied.
+        /// A value greater than 1.0f means more pressure than normal has been applied.
+        /// If point is greater than GetPointCount() then this method will return 1.0f.
+        /// </summary>
+        /// <param name="point">point The point required</param>
+        /// <returns>The touch pressure</returns>
+        public float GetPressure(uint point)
+        {
+            float ret = NDalicPINVOKE.Touch_GetPressure(swigCPtr, point);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Degree GetAngle(uint point)
+        {
+            Degree ret = new Degree(NDalicPINVOKE.Touch_GetAngle(swigCPtr, point), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
     }
-  }
-
-
-  public static Touch GetTouchFromPtr(global::System.IntPtr cPtr) {
-    Touch ret = new Touch(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Touch() : this(NDalicPINVOKE.new_Touch__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Touch(Touch other) : this(NDalicPINVOKE.new_Touch__SWIG_1(Touch.getCPtr(other)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Touch Assign(Touch other) {
-    Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetTime() {
-    uint ret = NDalicPINVOKE.Touch_GetTime(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public uint GetPointCount() {
-    uint ret = NDalicPINVOKE.Touch_GetPointCount(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public int GetDeviceId(uint point) {
-    int ret = NDalicPINVOKE.Touch_GetDeviceId(swigCPtr, point);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PointStateType GetState(uint point) {
-    PointStateType ret = (PointStateType)NDalicPINVOKE.Touch_GetState(swigCPtr, point);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Actor GetHitActor(uint point) {
-    Actor ret = new Actor(NDalicPINVOKE.Touch_GetHitActor(swigCPtr, point), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetLocalPosition(uint point) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetLocalPosition(swigCPtr, point), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetScreenPosition(uint point) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetScreenPosition(swigCPtr, point), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetRadius(uint point) {
-    float ret = NDalicPINVOKE.Touch_GetRadius(swigCPtr, point);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetEllipseRadius(uint point) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Touch_GetEllipseRadius(swigCPtr, point), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetPressure(uint point) {
-    float ret = NDalicPINVOKE.Touch_GetPressure(swigCPtr, point);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Degree GetAngle(uint point) {
-    Degree ret = new Degree(NDalicPINVOKE.Touch_GetAngle(swigCPtr, point), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
 
-}
+    /// <summary>
+    /// Enumeration for point state type.
+    /// </summary>
+    public enum PointStateType
+    {
+        Started,
+        Finished,
+        Down = Started,
+        Up = Finished,
+        Motion,
+        Leave,
+        Stationary,
+        Interrupted
+    }
 
 }
index a1bb95c..6f6b51f 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TouchPoint : global::System.IDisposable {
+    internal class TouchPoint : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 44cc3ae..5640472 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable
+    internal class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable
     , global::System.Collections.Generic.IEnumerable<TouchPoint>
  {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
index 73a44b7..5d3115a 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TouchSignal : global::System.IDisposable {
+    internal class TouchSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index fed9d5b..f927eea 100755 (executable)
@@ -55,11 +55,11 @@ public class TransitionData : BaseHandle {
     }
   }
 
-  public TransitionData (Property.Map transition) : this (NDalicPINVOKE.TransitionData_New__SWIG_0(Property.Map.getCPtr(transition)), true) {
+  public TransitionData (PropertyMap transition) : this (NDalicPINVOKE.TransitionData_New__SWIG_0(PropertyMap.getCPtr(transition)), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
   }
-  public TransitionData (Property.Array transition) : this (NDalicPINVOKE.TransitionData_New__SWIG_1(Property.Array.getCPtr(transition)), true) {
+  public TransitionData (PropertyArray transition) : this (NDalicPINVOKE.TransitionData_New__SWIG_1(PropertyArray.getCPtr(transition)), true) {
       if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
   }
@@ -85,13 +85,13 @@ public class TransitionData : BaseHandle {
     return ret;
   }
 
-  public Property.Map GetAnimatorAt(uint index) {
-    Property.Map ret = new Property.Map(NDalicPINVOKE.TransitionData_GetAnimatorAt(swigCPtr, index), true);
+  public PropertyMap GetAnimatorAt(uint index) {
+    PropertyMap ret = new PropertyMap(NDalicPINVOKE.TransitionData_GetAnimatorAt(swigCPtr, index), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }
 
-  public TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) {
+  internal TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index a579ddd..fb57080 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TypeAction : global::System.IDisposable {
+    internal class TypeAction : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 625fa73..8a4903e 100755 (executable)
@@ -107,7 +107,7 @@ public class TypeInfo : BaseHandle {
     return ret;
   }
 
-  public void GetPropertyIndices(VectorInteger indices) {
+  internal void GetPropertyIndices(VectorInteger indices) {
     NDalicPINVOKE.TypeInfo_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
index f24cdfe..c844876 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class TypeRegistration : global::System.IDisposable {
+    internal class TypeRegistration : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
@@ -81,7 +81,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD
     }
   }
 
-  public static void RegisterProperty(string controlName, string propertyName, int index, Property.Type type, System.Delegate setFunc, System.Delegate getFunc) {
+  public static void RegisterProperty(string controlName, string propertyName, int index, PropertyType type, System.Delegate setFunc, System.Delegate getFunc) {
 System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(setFunc); 
 System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(getFunc); 
     {
index 4d87b07..c8b71d1 100755 (executable)
@@ -65,7 +65,7 @@ public class TypeRegistry : BaseHandle {
     return ret;
   }
 
-  public TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) {
+  internal TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) {
     TypeInfo ret = new TypeInfo(NDalicPINVOKE.TypeRegistry_GetTypeInfo__SWIG_1(swigCPtr, SWIGTYPE_p_std__type_info.getCPtr(registerType)), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
@@ -83,7 +83,7 @@ public class TypeRegistry : BaseHandle {
     return ret;
   }
 
-  public TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) {
+  internal TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) {
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
index 594125e..6b9bf64 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class Uint16Pair : global::System.IDisposable {
+    internal class Uint16Pair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 0606deb..888130d 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Vector2 : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// A two dimensional vector.
+    /// </summary>
+    public class Vector2 : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Vector2(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Vector2(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(Vector2 obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Vector2 obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Vector2() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Vector2()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Vector2(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Vector2(swigCPtr);
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A vector containing the result of the addition</returns>
+        public static Vector2 operator +(Vector2 arg1, Vector2 arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A vector containing the result of the subtraction</returns>
+        public static Vector2 operator -(Vector2 arg1, Vector2 arg2)
+        {
+            return arg1.Subtract(arg2);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Target Value</param>
+        /// <returns>A vector containg the negation</returns>
+        public static Vector2 operator -(Vector2 arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the multiplication</returns>
+        public static Vector2 operator *(Vector2 arg1, Vector2 arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
 
-  public static Vector2 operator+(Vector2 arg1, Vector2 arg2) {
-    return arg1.Add(arg2);
-  }
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector2 operator *(Vector2 arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
 
-  public static Vector2 operator-(Vector2 arg1, Vector2 arg2) {
-    return arg1.Subtract(arg2);
-  }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the division</returns>
+        public static Vector2 operator /(Vector2 arg1, Vector2 arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector2 operator-(Vector2 arg1) {
-    return arg1.Subtract();
-  }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector by</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector2 operator /(Vector2 arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector2 operator*(Vector2 arg1, Vector2 arg2) {
-    return arg1.Multiply(arg2);
-  }
+        /// <summary>
+        /// Array subscript operator overload.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
 
-  public static Vector2 operator*(Vector2 arg1, float arg2) {
-    return arg1.Multiply(arg2);
-  }
+        internal static Vector2 GetVector2FromPtr(global::System.IntPtr cPtr)
+        {
+            Vector2 ret = new Vector2(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public static Vector2 operator/(Vector2 arg1, Vector2 arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Default constructor, initializes the vector to 0.
+        /// </summary>
+        public Vector2() : this(NDalicPINVOKE.new_Vector2__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector2 operator/(Vector2 arg1, float arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="x">x or width component</param>
+        /// <param name="y">y or height component</param>
+        public Vector2(float x, float y) : this(NDalicPINVOKE.new_Vector2__SWIG_1(x, y), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public float this[uint index]
-  {
-    get
-    {
-      return ValueOfIndex(index);
-    }
-  }
-
-  public static Vector2 GetVector2FromPtr(global::System.IntPtr cPtr) {
-    Vector2 ret = new Vector2(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-       return ret;
-  }
-
-
-  public Vector2() : this(NDalicPINVOKE.new_Vector2__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2(float x, float y) : this(NDalicPINVOKE.new_Vector2__SWIG_1(x, y), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2(float[] array) : this(NDalicPINVOKE.new_Vector2__SWIG_2(array), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2(Vector3 vec3) : this(NDalicPINVOKE.new_Vector2__SWIG_3(Vector3.getCPtr(vec3)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector2(Vector4 vec4) : this(NDalicPINVOKE.new_Vector2__SWIG_4(Vector4.getCPtr(vec4)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Vector2 ONE {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_ONE_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector2 XAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_XAXIS_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector2 YAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_YAXIS_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector2 NEGATIVE_XAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_NEGATIVE_XAXIS_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector2 NEGATIVE_YAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_NEGATIVE_YAXIS_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector2 ZERO {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_ZERO_get();
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public Vector2 Assign(float[] array) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_0(swigCPtr, array), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Assign(Vector3 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_1(swigCPtr, Vector3.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Assign(Vector4 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Add(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Add(swigCPtr, Vector2.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 AddAssign(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_AddAssign(swigCPtr, Vector2.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Subtract(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 SubtractAssign(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_SubtractAssign(swigCPtr, Vector2.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Multiply(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Multiply(float rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 MultiplyAssign(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 MultiplyAssign(float rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Divide(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Divide(float rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 DivideAssign(Vector2 rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 DivideAssign(float rhs) {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 Subtract() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EqualTo(Vector2 rhs) {
-    bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Vector2.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool NotEqualTo(Vector2 rhs) {
-    bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Vector2.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float ValueOfIndex(uint index) {
-    float ret = NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Length() {
-    float ret = NDalicPINVOKE.Vector2_Length(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float LengthSquared() {
-    float ret = NDalicPINVOKE.Vector2_LengthSquared(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Normalize() {
-    NDalicPINVOKE.Vector2_Normalize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Clamp(Vector2 min, Vector2 max) {
-    NDalicPINVOKE.Vector2_Clamp(swigCPtr, Vector2.getCPtr(min), Vector2.getCPtr(max));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public SWIGTYPE_p_float AsFloat() {
-    global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_AsFloat__SWIG_0(swigCPtr);
-    SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float X {
-    set {
-      NDalicPINVOKE.Vector2_X_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector2_X_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Width {
-    set {
-      NDalicPINVOKE.Vector2_Width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector2_Width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Y {
-    set {
-      NDalicPINVOKE.Vector2_Y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector2_Y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Height {
-    set {
-      NDalicPINVOKE.Vector2_Height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector2_Height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Conversion constructor from an array of two floats.
+        /// </summary>
+        /// <param name="array">Array of xy</param>
+        public Vector2(float[] array) : this(NDalicPINVOKE.new_Vector2__SWIG_2(array), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="vec3">Vector3 to create this vector from</param>
+        public Vector2(Vector3 vec3) : this(NDalicPINVOKE.new_Vector2__SWIG_3(Vector3.getCPtr(vec3)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="vec4">Vector4 to create this vector from</param>
+        public Vector2(Vector4 vec4) : this(NDalicPINVOKE.new_Vector2__SWIG_4(Vector4.getCPtr(vec4)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// (1.0f,1.0f)
+        /// </summary>
+        public static Vector2 One
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_ONE_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the X axis
+        /// </summary>
+        public static Vector2 XAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_XAXIS_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the Y axis
+        /// </summary>
+        public static Vector2 YAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_YAXIS_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the negative X axis
+        /// </summary>
+        public static Vector2 NegativeXAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_NEGATIVE_XAXIS_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the negative Y axis
+        /// </summary>
+        public static Vector2 NegativeYAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_NEGATIVE_YAXIS_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (0.0f, 0.0f)
+        /// </summary>
+        public static Vector2 Zero
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_ZERO_get();
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal Vector2 Assign(float[] array)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_0(swigCPtr, array), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Assign(Vector3 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_1(swigCPtr, Vector3.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Assign(Vector4 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Add(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Add(swigCPtr, Vector2.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 AddAssign(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_AddAssign(swigCPtr, Vector2.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Subtract(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 SubtractAssign(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_SubtractAssign(swigCPtr, Vector2.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Multiply(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Multiply(float rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 MultiplyAssign(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 MultiplyAssign(float rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Divide(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Divide(float rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 DivideAssign(Vector2 rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 DivideAssign(float rhs)
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector2 Subtract()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool EqualTo(Vector2 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Vector2.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool NotEqualTo(Vector2 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Vector2.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector.
+        /// </summary>
+        /// <returns>The length of the vector</returns>
+        public float Length()
+        {
+            float ret = NDalicPINVOKE.Vector2_Length(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector squared.
+        /// This is more efficient than Length() for threshold
+        /// testing as it avoids the use of a square root.
+        /// </summary>
+        /// <returns>The length of the vector squared</returns>
+        public float LengthSquared()
+        {
+            float ret = NDalicPINVOKE.Vector2_LengthSquared(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the vector to be unit length, whilst maintaining its direction.
+        /// </summary>
+        public void Normalize()
+        {
+            NDalicPINVOKE.Vector2_Normalize(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Clamps the vector between minimum and maximum vectors.
+        /// </summary>
+        /// <param name="min">The minimum vector</param>
+        /// <param name="max">The maximum vector</param>
+        public void Clamp(Vector2 min, Vector2 max)
+        {
+            NDalicPINVOKE.Vector2_Clamp(swigCPtr, Vector2.getCPtr(min), Vector2.getCPtr(max));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal SWIGTYPE_p_float AsFloat()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_AsFloat__SWIG_0(swigCPtr);
+            SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// x component
+        /// </summary>
+        public float X
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_X_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_X_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// width
+        /// </summary>
+        public float Width
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_Width_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_Width_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// y component
+        /// </summary>
+        public float Y
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_Y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_Y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// height
+        /// </summary>
+        public float Height
+        {
+            set
+            {
+                NDalicPINVOKE.Vector2_Height_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector2_Height_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 3e094f1..ef7f883 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Vector3 : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// A three dimensional vector.
+    /// </summary>
+    public class Vector3 : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Vector3(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Vector3(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(Vector3 obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Vector3 obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Vector3() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Vector3()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        public virtual void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Vector3(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Vector3(swigCPtr);
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the addition</returns>
+        public static Vector3 operator +(Vector3 arg1, Vector3 arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the subtraction</returns>
+        public static Vector3 operator -(Vector3 arg1, Vector3 arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Target Value</param>
+        /// <returns>A vector containg the negation</returns>
+        public static Vector3 operator -(Vector3 arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the multiplication</returns>
+        public static Vector3 operator *(Vector3 arg1, Vector3 arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector3 operator *(Vector3 arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the division</returns>
+        public static Vector3 operator /(Vector3 arg1, Vector3 arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector3 operator+(Vector3 arg1, Vector3 arg2) {
-    return arg1.Add(arg2);
-  }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector by</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector3 operator /(Vector3 arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector3 operator-(Vector3 arg1, Vector3 arg2) {
-    return arg1.Subtract(arg2);
-  }
+        /// <summary>
+        /// Array subscript operator overload.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
 
-  public static Vector3 operator-(Vector3 arg1) {
-    return arg1.Subtract();
-  }
+        internal static Vector3 GetVector3FromPtr(global::System.IntPtr cPtr)
+        {
+            Vector3 ret = new Vector3(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public static Vector3 operator*(Vector3 arg1, Vector3 arg2) {
-    return arg1.Multiply(arg2);
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public Vector3() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector3 operator*(Vector3 arg1, float arg2) {
-    return arg1.Multiply(arg2);
-  }
+        /// <summary>
+        /// Default constructor, initializes the vector to 0.
+        /// </summary>
+        /// <param name="x">x (or width) component</param>
+        /// <param name="y">y (or height) component</param>
+        /// <param name="z">z (or depth) component</param>
+        public Vector3(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector3 operator/(Vector3 arg1, Vector3 arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Conversion constructor from an array of three floats.
+        /// </summary>
+        /// <param name="array">Array of xyz</param>
+        public Vector3(float[] array) : this(NDalicPINVOKE.new_Vector3__SWIG_2(array), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector3 operator/(Vector3 arg1, float arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="vec2">Vector2 to create this vector from</param>
+        public Vector3(Vector2 vec2) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Vector2.getCPtr(vec2)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public float this[uint index]
-  {
-    get
-    {
-      return ValueOfIndex(index);
-    }
-  }
-
-  public static Vector3 GetVector3FromPtr(global::System.IntPtr cPtr) {
-    Vector3 ret = new Vector3(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-       return ret;
-  }
-
-
-  public Vector3() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3(float[] array) : this(NDalicPINVOKE.new_Vector3__SWIG_2(array), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3(Vector2 vec2) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Vector2.getCPtr(vec2)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector3(Vector4 vec4) : this(NDalicPINVOKE.new_Vector3__SWIG_4(Vector4.getCPtr(vec4)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Vector3 ONE {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ONE_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 XAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 YAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 ZAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 NEGATIVE_XAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 NEGATIVE_YAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 NEGATIVE_ZAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector3 ZERO {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get();
-      Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public Vector3 Assign(float[] array) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_0(swigCPtr, array), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Assign(Vector2 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Assign(Vector4 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Add(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Add(swigCPtr, Vector3.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 AddAssign(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_AddAssign(swigCPtr, Vector3.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Subtract(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 SubtractAssign(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_SubtractAssign(swigCPtr, Vector3.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Multiply(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Multiply(float rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 MultiplyAssign(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 MultiplyAssign(float rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 MultiplyAssign(Quaternion rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Quaternion.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Divide(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Divide(float rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 DivideAssign(Vector3 rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 DivideAssign(float rhs) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Subtract() {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EqualTo(Vector3 rhs) {
-    bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Vector3.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool NotEqualTo(Vector3 rhs) {
-    bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Vector3.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float ValueOfIndex(uint index) {
-    float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Dot(Vector3 other) {
-    float ret = NDalicPINVOKE.Vector3_Dot(swigCPtr, Vector3.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector3 Cross(Vector3 other) {
-    Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Cross(swigCPtr, Vector3.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Length() {
-    float ret = NDalicPINVOKE.Vector3_Length(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float LengthSquared() {
-    float ret = NDalicPINVOKE.Vector3_LengthSquared(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Normalize() {
-    NDalicPINVOKE.Vector3_Normalize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Clamp(Vector3 min, Vector3 max) {
-    NDalicPINVOKE.Vector3_Clamp(swigCPtr, Vector3.getCPtr(min), Vector3.getCPtr(max));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public SWIGTYPE_p_float AsFloat() {
-    global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_AsFloat__SWIG_0(swigCPtr);
-    SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetVectorXY() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector3_GetVectorXY__SWIG_0(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector2 GetVectorYZ() {
-    Vector2 ret = new Vector2(NDalicPINVOKE.Vector3_GetVectorYZ__SWIG_0(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float X {
-    set {
-      NDalicPINVOKE.Vector3_X_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Width {
-    set {
-      NDalicPINVOKE.Vector3_Width_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_Width_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float r {
-    set {
-      NDalicPINVOKE.Vector3_r_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_r_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Y {
-    set {
-      NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Height {
-    set {
-      NDalicPINVOKE.Vector3_Height_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_Height_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float g {
-    set {
-      NDalicPINVOKE.Vector3_g_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_g_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Z {
-    set {
-      NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Depth {
-    set {
-      NDalicPINVOKE.Vector3_Depth_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_Depth_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float b {
-    set {
-      NDalicPINVOKE.Vector3_b_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector3_b_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="vec4">Vector4 to create this vector from</param>
+        public Vector3(Vector4 vec4) : this(NDalicPINVOKE.new_Vector3__SWIG_4(Vector4.getCPtr(vec4)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// (1.0f,1.0f,1.0f)
+        /// </summary>
+        public static Vector3 One
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ONE_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the X axis
+        /// </summary>
+        public static Vector3 XAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the Y axis
+        /// </summary>
+        public static Vector3 YAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the Z axis
+        /// </summary>
+        public static Vector3 ZAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the negative X axis
+        /// </summary>
+        public static Vector3 NegativeXAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the negative Y axis
+        /// </summary>
+        public static Vector3 NegativeYAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// Vector representing the negative Z axis
+        /// </summary>
+        public static Vector3 NegativeZAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (0.0f, 0.0f, 0.0f)
+        /// </summary>
+        public static Vector3 Zero
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get();
+                Vector3 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector3(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal Vector3 Assign(float[] array)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_0(swigCPtr, array), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Assign(Vector2 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Assign(Vector4 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Add(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Add(swigCPtr, Vector3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 AddAssign(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_AddAssign(swigCPtr, Vector3.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Subtract(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 SubtractAssign(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_SubtractAssign(swigCPtr, Vector3.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Multiply(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Multiply(float rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 MultiplyAssign(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 MultiplyAssign(float rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 MultiplyAssign(Rotation rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Rotation.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Divide(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Divide(float rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 DivideAssign(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 DivideAssign(float rhs)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Subtract()
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool EqualTo(Vector3 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Vector3.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool NotEqualTo(Vector3 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Vector3.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float Dot(Vector3 other)
+        {
+            float ret = NDalicPINVOKE.Vector3_Dot(swigCPtr, Vector3.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector3 Cross(Vector3 other)
+        {
+            Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Cross(swigCPtr, Vector3.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector.
+        /// </summary>
+        /// <returns>The length of the vector</returns>
+        public float Length()
+        {
+            float ret = NDalicPINVOKE.Vector3_Length(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector squared.
+        /// This is more efficient than Length() for threshold
+        /// testing as it avoids the use of a square root.
+        /// </summary>
+        /// <returns>The length of the vector squared</returns>
+        public float LengthSquared()
+        {
+            float ret = NDalicPINVOKE.Vector3_LengthSquared(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the vector to be unit length, whilst maintaining its direction.
+        /// </summary>
+        public void Normalize()
+        {
+            NDalicPINVOKE.Vector3_Normalize(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Clamps the vector between minimum and maximum vectors.
+        /// </summary>
+        /// <param name="min">The minimum vector</param>
+        /// <param name="max">The maximum vector</param>
+        public void Clamp(Vector3 min, Vector3 max)
+        {
+            NDalicPINVOKE.Vector3_Clamp(swigCPtr, Vector3.getCPtr(min), Vector3.getCPtr(max));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal SWIGTYPE_p_float AsFloat()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_AsFloat__SWIG_0(swigCPtr);
+            SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the x & y components (or width & height, or r & g) as a Vector2.
+        /// </summary>
+        /// <returns>The partial vector contents as Vector2 (x,y)</returns>
+        public Vector2 GetVectorXY()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector3_GetVectorXY__SWIG_0(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the y & z components (or height & depth, or g & b) as a Vector2.
+        /// </summary>
+        /// <returns>The partial vector contents as Vector2 (y,z)</returns>
+        public Vector2 GetVectorYZ()
+        {
+            Vector2 ret = new Vector2(NDalicPINVOKE.Vector3_GetVectorYZ__SWIG_0(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// x component
+        /// </summary>
+        public float X
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_X_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// width component
+        /// </summary>
+        public float Width
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Width_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Width_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// red component
+        /// </summary>
+        public float R
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_r_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_r_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// y component
+        /// </summary>
+        public float Y
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// height component
+        /// </summary>
+        public float Height
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Height_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Height_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// green component
+        /// </summary>
+        public float G
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_g_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_g_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// z component
+        /// </summary>
+        public float Z
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Z_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// depth component
+        /// </summary>
+        public float Depth
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_Depth_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_Depth_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// blue component
+        /// </summary>
+        public float B
+        {
+            set
+            {
+                NDalicPINVOKE.Vector3_b_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector3_b_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 678c699..491dc51 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Vector4 : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// A four dimensional vector.
+    /// </summary>
+    public class Vector4 : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Vector4(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Vector4(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(Vector4 obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Vector4 obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Vector4() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Vector4()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Vector4(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Vector4(swigCPtr);
+        /// <summary>
+        /// Addition operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A vector containing the result of the addition</returns>
+        public static Vector4 operator +(Vector4 arg1, Vector4 arg2)
+        {
+            return arg1.Add(arg2);
+        }
+
+        /// <summary>
+        /// Subtraction operator.
+        /// </summary>
+        /// <param name="arg1">First value</param>
+        /// <param name="arg2">Second value</param>
+        /// <returns>A vector containing the result of the subtraction</returns>
+        public static Vector4 operator -(Vector4 arg1, Vector4 arg2)
+        {
+            return arg1.Subtract(arg2);
+        }
+
+        /// <summary>
+        /// Unary negation operator.
+        /// </summary>
+        /// <param name="arg1">Target Value</param>
+        /// <returns>A vector containg the negation</returns>
+        public static Vector4 operator -(Vector4 arg1)
+        {
+            return arg1.Subtract();
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the multiplication</returns>
+        public static Vector4 operator *(Vector4 arg1, Vector4 arg2)
+        {
+            return arg1.Multiply(arg2);
+        }
+
+        /// <summary>
+        /// Multiplication operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector4 operator *(Vector4 arg1, float arg2)
+        {
+            return arg1.Multiply(arg2);
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">Second Value</param>
+        /// <returns>A vector containing the result of the division</returns>
+        public static Vector4 operator /(Vector4 arg1, Vector4 arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector4 operator+(Vector4 arg1, Vector4 arg2) {
-    return arg1.Add(arg2);
-  }
+        /// <summary>
+        /// Division operator.
+        /// </summary>
+        /// <param name="arg1">First Value</param>
+        /// <param name="arg2">The float value to scale the vector by</param>
+        /// <returns>A vector containing the result of the scaling</returns>
+        public static Vector4 operator /(Vector4 arg1, float arg2)
+        {
+            return arg1.Divide(arg2);
+        }
 
-  public static Vector4 operator-(Vector4 arg1, Vector4 arg2) {
-    return arg1.Subtract(arg2);
-  }
+        /// <summary>
+        /// Array subscript operator overload.
+        /// </summary>
+        /// <param name="index">Subscript index</param>
+        /// <returns>The float at the given index</returns>
+        public float this[uint index]
+        {
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
 
-  public static Vector4 operator-(Vector4 arg1) {
-    return arg1.Subtract();
-  }
+        internal static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr)
+        {
+            Vector4 ret = new Vector4(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public static Vector4 operator*(Vector4 arg1, Vector4 arg2) {
-    return arg1.Multiply(arg2);
-  }
+        /// <summary>
+        /// Default constructor, initializes the vector to 0.
+        /// </summary>
+        public Vector4() : this(NDalicPINVOKE.new_Vector4__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector4 operator*(Vector4 arg1, float arg2) {
-    return arg1.Multiply(arg2);
-  }
+        /// <summary>
+        /// Conversion constructor from four floats.
+        /// </summary>
+        /// <param name="x">x (or r/s) component</param>
+        /// <param name="y">y (or g/t) component</param>
+        /// <param name="z">z (or b/p) component</param>
+        /// <param name="w">w (or a/q) component</param>
+        public Vector4(float x, float y, float z, float w) : this(NDalicPINVOKE.new_Vector4__SWIG_1(x, y, z, w), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector4 operator/(Vector4 arg1, Vector4 arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Conversion constructor from an array of four floats.
+        /// </summary>
+        /// <param name="array">array Array of either xyzw/rgba/stpq</param>
+        public Vector4(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(array), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public static Vector4 operator/(Vector4 arg1, float arg2) {
-    return arg1.Divide(arg2);
-  }
+        /// <summary>
+        /// Conversion constructor from Vector2.
+        /// </summary>
+        /// <param name="vec2">Vector2 to copy from, z and w are initialized to 0</param>
+        public Vector4(Vector2 vec2) : this(NDalicPINVOKE.new_Vector4__SWIG_3(Vector2.getCPtr(vec2)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public float this[uint index]
-  {
-    get
-    {
-      return ValueOfIndex(index);
-    }
-  }
-
-  public static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr) {
-    Vector4 ret = new Vector4(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-       return ret;
-  }
-
-
-  public Vector4() : this(NDalicPINVOKE.new_Vector4__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4(float x, float y, float z, float w) : this(NDalicPINVOKE.new_Vector4__SWIG_1(x, y, z, w), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4(float[] array) : this(NDalicPINVOKE.new_Vector4__SWIG_2(array), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4(Vector2 vec2) : this(NDalicPINVOKE.new_Vector4__SWIG_3(Vector2.getCPtr(vec2)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4(Vector3 vec3) : this(NDalicPINVOKE.new_Vector4__SWIG_4(Vector3.getCPtr(vec3)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public static Vector4 ONE {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ONE_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector4 XAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_XAXIS_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector4 YAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_YAXIS_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector4 ZAXIS {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ZAXIS_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public static Vector4 ZERO {
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ZERO_get();
-      Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public Vector4 Assign(float[] array) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_0(swigCPtr, array), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Assign(Vector2 vec2) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(vec2)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Assign(Vector3 vec3) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_2(swigCPtr, Vector3.getCPtr(vec3)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Add(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Add(swigCPtr, Vector4.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 AddAssign(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_AddAssign(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Subtract(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 SubtractAssign(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_SubtractAssign(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Multiply(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Multiply(float rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 MultiplyAssign(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 MultiplyAssign(float rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Divide(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Divide(float rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_1(swigCPtr, rhs), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 DivideAssign(Vector4 rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 DivideAssign(float rhs) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_1(swigCPtr, rhs), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Subtract() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_1(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EqualTo(Vector4 rhs) {
-    bool ret = NDalicPINVOKE.Vector4_EqualTo(swigCPtr, Vector4.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool NotEqualTo(Vector4 rhs) {
-    bool ret = NDalicPINVOKE.Vector4_NotEqualTo(swigCPtr, Vector4.getCPtr(rhs));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float ValueOfIndex(uint index) {
-    float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Dot(Vector3 other) {
-    float ret = NDalicPINVOKE.Vector4_Dot__SWIG_0(swigCPtr, Vector3.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Dot(Vector4 other) {
-    float ret = NDalicPINVOKE.Vector4_Dot__SWIG_1(swigCPtr, Vector4.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Dot4(Vector4 other) {
-    float ret = NDalicPINVOKE.Vector4_Dot4(swigCPtr, Vector4.getCPtr(other));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Vector4 Cross(Vector4 other) {
-    Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Cross(swigCPtr, Vector4.getCPtr(other)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float Length() {
-    float ret = NDalicPINVOKE.Vector4_Length(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float LengthSquared() {
-    float ret = NDalicPINVOKE.Vector4_LengthSquared(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Normalize() {
-    NDalicPINVOKE.Vector4_Normalize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Clamp(Vector4 min, Vector4 max) {
-    NDalicPINVOKE.Vector4_Clamp(swigCPtr, Vector4.getCPtr(min), Vector4.getCPtr(max));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public SWIGTYPE_p_float AsFloat() {
-    global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_AsFloat__SWIG_0(swigCPtr);
-    SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float X {
-    set {
-      NDalicPINVOKE.Vector4_X_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_X_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float r {
-    set {
-      NDalicPINVOKE.Vector4_r_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_r_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float s {
-    set {
-      NDalicPINVOKE.Vector4_s_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_s_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Y {
-    set {
-      NDalicPINVOKE.Vector4_Y_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_Y_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float g {
-    set {
-      NDalicPINVOKE.Vector4_g_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_g_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float t {
-    set {
-      NDalicPINVOKE.Vector4_t_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_t_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float Z {
-    set {
-      NDalicPINVOKE.Vector4_Z_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_Z_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float b {
-    set {
-      NDalicPINVOKE.Vector4_b_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_b_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float p {
-    set {
-      NDalicPINVOKE.Vector4_p_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_p_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float W {
-    set {
-      NDalicPINVOKE.Vector4_W_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_W_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float a {
-    set {
-      NDalicPINVOKE.Vector4_a_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_a_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public float q {
-    set {
-      NDalicPINVOKE.Vector4_q_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      float ret = NDalicPINVOKE.Vector4_q_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
+        /// <summary>
+        /// Conversion constructor from Vector3.
+        /// </summary>
+        /// <param name="vec3">Vector3 to copy from, w is initialized to 0</param>
+        public Vector4(Vector3 vec3) : this(NDalicPINVOKE.new_Vector4__SWIG_4(Vector3.getCPtr(vec3)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-}
+        /// <summary>
+        /// (1.0f,1.0f,1.0f,1.0f)
+        /// </summary>
+        public static Vector4 One
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ONE_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (1.0f,0.0f,0.0f,0.0f)
+        /// </summary>
+        public static Vector4 XAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_XAXIS_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (0.0f,1.0f,0.0f,0.0f)
+        /// </summary>
+        public static Vector4 YAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_YAXIS_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (0.0f,0.0f,1.0f,0.0f)
+        /// </summary>
+        public static Vector4 ZAxis
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ZAXIS_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// (0.0f, 0.0f, 0.0f, 0.0f)
+        /// </summary>
+        public static Vector4 Zero
+        {
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_ZERO_get();
+                Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        internal Vector4 Assign(float[] array)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_0(swigCPtr, array), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Assign(Vector2 vec2)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(vec2)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Assign(Vector3 vec3)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_2(swigCPtr, Vector3.getCPtr(vec3)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Add(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Add(swigCPtr, Vector4.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 AddAssign(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_AddAssign(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Subtract(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 SubtractAssign(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_SubtractAssign(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Multiply(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Multiply(float rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 MultiplyAssign(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 MultiplyAssign(float rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Divide(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Divide(float rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_1(swigCPtr, rhs), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 DivideAssign(Vector4 rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 DivideAssign(float rhs)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_1(swigCPtr, rhs), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Subtract()
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_1(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool EqualTo(Vector4 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector4_EqualTo(swigCPtr, Vector4.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal bool NotEqualTo(Vector4 rhs)
+        {
+            bool ret = NDalicPINVOKE.Vector4_NotEqualTo(swigCPtr, Vector4.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float ValueOfIndex(uint index)
+        {
+            float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float Dot(Vector3 other)
+        {
+            float ret = NDalicPINVOKE.Vector4_Dot__SWIG_0(swigCPtr, Vector3.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float Dot(Vector4 other)
+        {
+            float ret = NDalicPINVOKE.Vector4_Dot__SWIG_1(swigCPtr, Vector4.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal float Dot4(Vector4 other)
+        {
+            float ret = NDalicPINVOKE.Vector4_Dot4(swigCPtr, Vector4.getCPtr(other));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Vector4 Cross(Vector4 other)
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Cross(swigCPtr, Vector4.getCPtr(other)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector.
+        /// </summary>
+        /// <returns>The length</returns>
+        public float Length()
+        {
+            float ret = NDalicPINVOKE.Vector4_Length(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the length of the vector squared.
+        /// This is faster than using Length() when performing
+        /// threshold checks as it avoids use of the square root.
+        /// </summary>
+        /// <returns>The length of the vector squared</returns>
+        public float LengthSquared()
+        {
+            float ret = NDalicPINVOKE.Vector4_LengthSquared(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Normalizes the vector.
+        /// Sets the vector to unit length whilst maintaining its direction.
+        /// </summary>
+        public void Normalize()
+        {
+            NDalicPINVOKE.Vector4_Normalize(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Clamps the vector between minimum and maximum vectors.
+        /// </summary>
+        /// <param name="min">The minimum vector</param>
+        /// <param name="max">The maximum vector</param>
+        public void Clamp(Vector4 min, Vector4 max)
+        {
+            NDalicPINVOKE.Vector4_Clamp(swigCPtr, Vector4.getCPtr(min), Vector4.getCPtr(max));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal SWIGTYPE_p_float AsFloat()
+        {
+            global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_AsFloat__SWIG_0(swigCPtr);
+            SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// x component
+        /// </summary>
+        public float X
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_X_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_X_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// red component
+        /// </summary>
+        public float R
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_r_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_r_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// s component
+        /// </summary>
+        public float S
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_s_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_s_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// y component
+        /// </summary>
+        public float Y
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_Y_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_Y_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// green component
+        /// </summary>
+        public float G
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_g_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_g_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// t component
+        /// </summary>
+        public float T
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_t_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_t_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// z component
+        /// </summary>
+        public float Z
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_Z_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_Z_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// blue component
+        /// </summary>
+        public float B
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_b_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_b_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// p component
+        /// </summary>
+        public float P
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_p_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_p_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// w component
+        /// </summary>
+        public float W
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_W_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_W_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// alpha component
+        /// </summary>
+        public float A
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_a_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_a_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// q component
+        /// </summary>
+        public float Q
+        {
+            set
+            {
+                NDalicPINVOKE.Vector4_q_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                float ret = NDalicPINVOKE.Vector4_q_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+    }
 
 }
index 96d4ed1..50578f0 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorBase : global::System.IDisposable {
+    internal class VectorBase : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index c01ad6b..6e6eaea 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorFloat : global::System.IDisposable {
+    internal class VectorFloat : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index b12bf0c..e338d0c 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorInteger : global::System.IDisposable {
+internal class VectorInteger : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index fe0216b..70b06ed 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorUint16Pair : global::System.IDisposable {
+    internal class VectorUint16Pair : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index f5679a4..f1a6f5d 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VectorUnsignedChar : global::System.IDisposable {
+    internal class VectorUnsignedChar : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
diff --git a/src/Tizen.NUI/devel-src/VerticalAlignmentType.cs b/src/Tizen.NUI/devel-src/VerticalAlignmentType.cs
deleted file mode 100755 (executable)
index 210b3ba..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated />
-//
-// This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
-
-public enum VerticalAlignmentType {
-  TOP,
-  CENTER,
-  BOTTOM
-}
-
-}
index 9bc0e46..b8dfa97 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-using System;
-using System.Runtime.InteropServices;
+    using System;
+    using System.Runtime.InteropServices;
 
+    /// <summary>
+    /// VideoView is a control for video playback and display.
+    /// </summary>
+    public class VideoView : View
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class VideoView : View {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        ~VideoView()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  ~VideoView() {
-    DisposeQueue.Instance.Add(this);
-  }
+        public override void Dispose()
+        {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_VideoView(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Event arguments that passed via Finished signal
+        /// </summary>
+        public class FinishedEventArgs : EventArgs
+        {
+            private VideoView _videoView;
+
+            /// <summary>
+            /// The view for video playback and display.
+            /// </summary>
+            public VideoView VideoView
+            {
+                get
+                {
+                    return _videoView;
+                }
+                set
+                {
+                    _videoView = value;
+                }
+            }
+        }
+
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void FinishedCallbackDelegate(IntPtr data);
+        private EventHandler<FinishedEventArgs> _videoViewFinishedEventHandler;
+        private FinishedCallbackDelegate _videoViewFinishedCallbackDelegate;
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_VideoView(swigCPtr);
+
+        /// <summary>
+        /// Event for Finished signal which can be used to subscribe/unsubscribe the event handler
+        /// (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.
+        /// Finished signal is emitted when a video playback have finished.
+        /// </summary>
+        public event EventHandler<FinishedEventArgs> Finished
+        {
+            add
+            {
+                if (_videoViewFinishedEventHandler == null)
+                {
+                    _videoViewFinishedCallbackDelegate = (OnFinished);
+                    FinishedSignal().Connect(_videoViewFinishedCallbackDelegate);
+                }
+                _videoViewFinishedEventHandler += value;
+            }
+            remove
+            {
+                _videoViewFinishedEventHandler -= value;
+                if (_videoViewFinishedEventHandler == null && _videoViewFinishedCallbackDelegate != null)
+                {
+                    FinishedSignal().Disconnect(_videoViewFinishedCallbackDelegate);
+                }
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
 
+        // Callback for VideoView Finished signal
+        private void OnFinished(IntPtr data)
+        {
+            FinishedEventArgs e = new FinishedEventArgs();
 
+            // Populate all members of "e" (FinishedEventArgs) with real data
+            e.VideoView = VideoView.GetVideoViewFromPtr(data);
 
-/**
-  * @brief Event arguments that passed via Finished signal
-  *
-  */
-public class FinishedEventArgs : EventArgs
-{
-   private VideoView _videoView;
-
-   /**
-     * @brief VideoView - VideoView is a control for video playback and display.
-     *
-     */
-   public VideoView VideoView
-   {
-      get
-      {
-         return _videoView;
-      }
-      set
-      {
-         _videoView = value;
-      }
-   }
-}
+            if (_videoViewFinishedEventHandler != null)
+            {
+                //here we send all data to user event handlers
+                _videoViewFinishedEventHandler(this, e);
+            }
+        }
 
+        internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr)
+        {
+            VideoView ret = new VideoView(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-  private delegate void FinishedCallbackDelegate(IntPtr data);
-  private DaliEventHandler<object,FinishedEventArgs> _videoViewFinishedEventHandler;
-  private FinishedCallbackDelegate _videoViewFinishedCallbackDelegate;
-
-  /**
-    * @brief Event for Finished signal which can be used to subscribe/unsubscribe the event handler
-    * (in the type of FinishedEventHandler-DaliEventHandler<object,FinishedEventArgs>) provided by the user.
-    * Finished signal is emitted when a video playback have finished.
-    */
-  public event DaliEventHandler<object,FinishedEventArgs> Finished
-  {
-     add
-     {
-        lock(this)
+
+        internal class Property : global::System.IDisposable
         {
-           // Restricted to only one listener
-           if (_videoViewFinishedEventHandler == null)
-           {
-              _videoViewFinishedEventHandler += value;
-
-              _videoViewFinishedCallbackDelegate = new FinishedCallbackDelegate(OnFinished);
-              this.FinishedSignal().Connect(_videoViewFinishedCallbackDelegate);
-           }
+            private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+            protected bool swigCMemOwn;
+
+            internal Property(global::System.IntPtr cPtr, bool cMemoryOwn)
+            {
+                swigCMemOwn = cMemoryOwn;
+                swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+            }
+
+            internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj)
+            {
+                return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+            }
+
+            ~Property()
+            {
+                Dispose();
+            }
+
+            public virtual void Dispose()
+            {
+                lock (this)
+                {
+                    if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                    {
+                        if (swigCMemOwn)
+                        {
+                            swigCMemOwn = false;
+                            NDalicPINVOKE.delete_VideoView_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal Property() : this(NDalicPINVOKE.new_VideoView_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();
+            internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();
+            internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();
+            internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();
+
         }
-     }
 
-     remove
-     {
-        lock(this)
+        /// <summary>
+        /// Creates an initialized VideoView.
+        /// </summary>
+        public VideoView() : this(NDalicPINVOKE.VideoView_New__SWIG_0(), true)
         {
-           if (_videoViewFinishedEventHandler != null)
-           {
-              this.FinishedSignal().Disconnect(_videoViewFinishedCallbackDelegate);
-           }
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-           _videoViewFinishedEventHandler -= value;
         }
-     }
-  }
-
-  // Callback for VideoView Finished signal
-  private void OnFinished(IntPtr data)
-  {
-     FinishedEventArgs e = new FinishedEventArgs();
-
-     // Populate all members of "e" (FinishedEventArgs) with real data
-     e.VideoView = VideoView.GetVideoViewFromPtr( data );
-
-     if (_videoViewFinishedEventHandler != null)
-     {
-        //here we send all data to user event handlers
-        _videoViewFinishedEventHandler(this, e);
-     }
-  }
-
-  public static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr) {
-    VideoView ret = new VideoView(cPtr, false);
-   if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-
-  public class Property : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) {
-      swigCMemOwn = cMemoryOwn;
-      swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-    }
-  
-    internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~Property() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_VideoView_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+
+        /// <summary>
+        /// Creates an initialized VideoView.
+        /// If the string is empty, VideoView will not display anything.
+        /// </summary>
+        /// <param name="url">The url of the video resource to display</param>
+        public VideoView(string url) : this(NDalicPINVOKE.VideoView_New__SWIG_1(url), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public Property() : this(NDalicPINVOKE.new_VideoView_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get();
-    public static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get();
-    public static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get();
-    public static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get();
-  
-  }
-
-  public VideoView () : this (NDalicPINVOKE.VideoView_New__SWIG_0(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public VideoView (string url) : this (NDalicPINVOKE.VideoView_New__SWIG_1(url), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public VideoView(VideoView videoView) : this(NDalicPINVOKE.new_VideoView__SWIG_1(VideoView.getCPtr(videoView)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VideoView Assign(VideoView videoView) {
-    VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static VideoView DownCast(BaseHandle handle) {
-    VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void Play() {
-    NDalicPINVOKE.VideoView_Play(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Pause() {
-    NDalicPINVOKE.VideoView_Pause(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Stop() {
-    NDalicPINVOKE.VideoView_Stop(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Forward(int millisecond) {
-    NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Backward(int millisecond) {
-    NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VideoViewSignal FinishedSignal() {
-    VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX
-  }
-
-  public Tizen.NUI.Property.Map Video
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( VideoView.Property.VIDEO).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.VIDEO, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool Looping
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( VideoView.Property.LOOPING).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.LOOPING, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool Muted
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( VideoView.Property.MUTED).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.MUTED, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Volume
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( VideoView.Property.VOLUME).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( VideoView.Property.VOLUME, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
 
-}
+        internal VideoView Assign(VideoView videoView)
+        {
+            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Downcasts a handle to VideoView handle.
+        /// If handle points to a VideoView, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>Handle to a VideoView or an uninitialized handle</returns>
+        public new static VideoView DownCast(BaseHandle handle)
+        {
+            VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Starts the video playback.
+        /// </summary>
+        public void Play()
+        {
+            NDalicPINVOKE.VideoView_Play(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Pauses the video playback.
+        /// </summary>
+        public void Pause()
+        {
+            NDalicPINVOKE.VideoView_Pause(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Stops the video playback.
+        /// </summary>
+        public void Stop()
+        {
+            NDalicPINVOKE.VideoView_Stop(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Seeks forward by the specified number of milliseconds.
+        /// </summary>
+        /// <param name="millisecond">The position for forward playback</param>
+        public void Forward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Forward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Seeks backward by the specified number of milliseconds.
+        /// </summary>
+        /// <param name="millisecond">The position for backward playback</param>
+        public void Backward(int millisecond)
+        {
+            NDalicPINVOKE.VideoView_Backward(swigCPtr, millisecond);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VideoViewSignal FinishedSignal()
+        {
+            VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX
+        }
+
+        /// <summary>
+        /// video file url as string type or PropertyMap.
+        /// </summary>
+        public PropertyMap Video
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VIDEO).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VIDEO, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// looping status, true or false.
+        /// </summary>
+        public bool Looping
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.LOOPING).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.LOOPING, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// mute status, true or false.
+        /// </summary>
+        public bool Muted
+        {
+            get
+            {
+                bool temp = false;
+                GetProperty(VideoView.Property.MUTED).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.MUTED, new Tizen.NUI.PropertyValue(value));
+            }
+        }
+
+        /// <summary>
+        /// left and right volume scalar as float type, PropertyMap with two values ( "left" and "right" ).
+        /// </summary>
+        public PropertyMap Volume
+        {
+            get
+            {
+                PropertyMap temp = new PropertyMap();
+                GetProperty(VideoView.Property.VOLUME).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(VideoView.Property.VOLUME, new PropertyValue(value));
+            }
+        }
+
+    }
 
 }
index 6a7b743..97221d5 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VideoViewSignal : global::System.IDisposable {
+    internal class VideoViewSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index f9c9404..10af16f 100755 (executable)
 * 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.9
-//
-// Do not make changes to this file unless you know what you are doing--modify
-// the SWIG interface file instead.
-//------------------------------------------------------------------------------
-
-namespace Tizen.NUI {
+
+namespace Tizen.NUI
+{
 
     using System;
     using System.Runtime.InteropServices;
 
-    
-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);
-  }
-
-  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;
-  }
-
-  ~View() {
-    Dispose();
-  }
-
-  public override void Dispose() {
-    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);
-      base.Dispose();
-    }
-  }
-
-
-    /**
-     * @brief Event arguments that passed via KeyInputFocusGained signal
-     *
-     */
-    public class KeyInputFocusGainedEventArgs : EventArgs
+    /// <summary>
+    /// View is the base class for all views.
+    /// </summary>
+    public class View : CustomActor
     {
-      private View _view;
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-      /**
-       * @brief View - is the view that gets Key Input Focus
-       *
-       */
-      public View View
-      {
-        get
+        internal View(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.View_SWIGUpcast(cPtr), cMemoryOwn)
         {
-          return _view;
+            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;
         }
-        set
+
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(View obj)
         {
-          _view = value;
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
         }
-      }
-    }
 
-    /**
-     * @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
+        ~View()
         {
-          return _view;
+            DisposeQueue.Instance.Add(this);
+
+            // Unregister this instance of view from the view registry.
+            ViewRegistry.UnregisterView(this);
         }
-        set
+
+        public override void Dispose()
         {
-          _view = value;
+            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);
+                base.Dispose();
+            }
         }
-      }
-    }
 
-    /**
-     * @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
+
+        private EventHandler _keyInputFocusGainedEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void KeyInputFocusGainedCallbackType(IntPtr control);
+        private KeyInputFocusGainedCallbackType _keyInputFocusGainedCallback;
+
+        /**
+          * @brief Event for KeyInputFocusGained signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. KeyInputFocusGained signal is emitted when the control gets Key Input Focus.
+          */
+        public event EventHandler FocusGained
         {
-          return _view;
+            add
+            {
+                if (_keyInputFocusGainedEventHandler == null)
+                {
+                    _keyInputFocusGainedCallback = OnKeyInputFocusGained;
+                    this.KeyInputFocusGainedSignal().Connect(_keyInputFocusGainedCallback);
+                }
+
+                _keyInputFocusGainedEventHandler += value;
+            }
+
+            remove
+            {
+                _keyInputFocusGainedEventHandler -= value;
+
+                if (_keyInputFocusGainedEventHandler == null && _keyInputFocusGainedCallback != null)
+                {
+                    this.KeyInputFocusGainedSignal().Disconnect(_keyInputFocusGainedCallback);
+                }
+            }
         }
-        set
+
+        private void OnKeyInputFocusGained(IntPtr view)
         {
-          _view = value;
+            if (_keyInputFocusGainedEventHandler != null)
+            {
+                _keyInputFocusGainedEventHandler(this, null);
+            }
         }
-      }
 
-      /**
-       * @brief Key - is the key sent to the View.
-       *
-       */
-      public Key Key
-      {
-        get
+
+        private EventHandler _keyInputFocusLostEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void KeyInputFocusLostCallbackType(IntPtr control);
+        private KeyInputFocusLostCallbackType _keyInputFocusLostCallback;
+
+        /**
+          * @brief Event for KeyInputFocusLost signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus.
+          */
+        public event EventHandler FocusLost
         {
-          return _key;
+            add
+            {
+                if (_keyInputFocusLostEventHandler == null)
+                {
+                    _keyInputFocusLostCallback = OnKeyInputFocusLost;
+                    this.KeyInputFocusLostSignal().Connect(_keyInputFocusLostCallback);
+                }
+
+                _keyInputFocusLostEventHandler += value;
+            }
+
+            remove
+            {
+                _keyInputFocusLostEventHandler -= value;
+
+                if (_keyInputFocusLostEventHandler == null && _keyInputFocusLostCallback != null)
+                {
+                    this.KeyInputFocusLostSignal().Disconnect(_keyInputFocusLostCallback);
+                }
+            }
         }
-        set
+
+        private void OnKeyInputFocusLost(IntPtr view)
         {
-          _key = value;
+            if (_keyInputFocusLostEventHandler != null)
+            {
+                _keyInputFocusLostEventHandler(this, null);
+            }
         }
-      }
-    }
 
-    /**
-      * @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
+        /**
+          * @brief Event arguments that passed via KeyEvent signal
+          *
+          */
+        public class KeyEventArgs : EventArgs
         {
-          return _view;
+            private Key _key;
+
+            /**
+              * @brief KeyEvent - is the keyevent sent to the View.
+              *
+              */
+            public Key Key
+            {
+                get
+                {
+                    return _key;
+                }
+                set
+                {
+                    _key = value;
+                }
+            }
         }
-        set
+
+        private EventHandlerWithReturnType<object, KeyEventArgs, bool> _keyEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool KeyCallbackType(IntPtr control, IntPtr keyEvent);
+        private KeyCallbackType _keyCallback;
+
+        /**
+          * @brief Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. KeyPressed signal is emitted when key event is received.
+          */
+        public event EventHandlerWithReturnType<object, KeyEventArgs, bool> KeyEvent
         {
-          _view = value;
+            add
+            {
+                if (_keyEventHandler == null)
+                {
+                    _keyCallback = OnKeyEvent;
+                    this.KeyEventSignal().Connect(_keyCallback);
+                }
+
+                _keyEventHandler += value;
+            }
+
+            remove
+            {
+                _keyEventHandler -= value;
+
+                if (_keyEventHandler == null && _keyCallback != null)
+                {
+                    this.KeyEventSignal().Disconnect(_keyCallback);
+                }
+            }
         }
-      }
-    }
 
+        private bool OnKeyEvent(IntPtr view, IntPtr keyEvent)
+        {
+            KeyEventArgs e = new KeyEventArgs();
 
-    /**
-      * @brief Event arguments that passed via Touch signal
-      *
-      */
-    public class TouchEventArgs : EventArgs
-    {
-       private View _view;
-       private Touch _touch;
+            e.Key = Tizen.NUI.Key.GetKeyFromPtr(keyEvent);
 
-      /**
-        * @brief View - is the view that is being touched
-        *
-        */
-      public View View
-      {
-        get
-        {
-          return _view;
+            if (_keyEventHandler != null)
+            {
+                return _keyEventHandler(this, e);
+            }
+            return false;
         }
-        set
+
+
+        private EventHandler _onRelayoutEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void OnRelayoutEventCallbackType(IntPtr control);
+        private OnRelayoutEventCallbackType _onRelayoutEventCallback;
+
+        /**
+          * @brief Event for OnRelayout signal which can be used to subscribe/unsubscribe the event handler
+          * OnRelayout signal is emitted after the size has been set on the view during relayout.
+          */
+        public event EventHandler OnRelayoutEvent
         {
-          _view = value;
+            add
+            {
+                if (_onRelayoutEventHandler == null)
+                {
+                    _onRelayoutEventCallback = OnRelayout;
+                    this.OnRelayoutSignal().Connect(_onRelayoutEventCallback);
+                }
+
+                _onRelayoutEventHandler += value;
+            }
+
+            remove
+            {
+                _onRelayoutEventHandler -= value;
+
+                if (_onRelayoutEventHandler == null && _onRelayoutEventCallback != null)
+                {
+                    this.OnRelayoutSignal().Disconnect(_onRelayoutEventCallback);
+                }
+
+            }
         }
-      }
 
-      /**
-        * @brief Touch - contains the information of touch points
-        *
-        */
-      public Touch Touch
-      {
-        get
+        // Callback for View OnRelayout signal
+        private void OnRelayout(IntPtr data)
         {
-          return _touch;
+            if (_onRelayoutEventHandler != null)
+            {
+                _onRelayoutEventHandler(this, null);
+            }
         }
-        set
+
+
+        /**
+          * @brief Event arguments that passed via Touch signal
+          *
+          */
+        public class TouchEventArgs : EventArgs
         {
-          _touch = value;
+            private Touch _touch;
+
+            /**
+              * @brief TouchData - 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;
+        private EventHandlerWithReturnType<object, TouchEventArgs, bool> _touchDataEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool TouchDataCallbackType(IntPtr view, IntPtr touchData);
+        private TouchDataCallbackType _touchDataCallback;
 
-      /**
-        * @brief View - is the view that is being hovered
-        *
-        */
-      public View View
-      {
-        get
+        /**
+          * @brief Event for Touched signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. Touched signal is emitted when touch input is received.
+          */
+        public event EventHandlerWithReturnType<object, TouchEventArgs, bool> Touched
         {
-          return _view;
+            add
+            {
+                if (_touchDataEventHandler == null)
+                {
+                    _touchDataCallback = OnTouch;
+                    this.TouchSignal().Connect(_touchDataCallback);
+                }
+
+                _touchDataEventHandler += value;
+            }
+
+            remove
+            {
+                _touchDataEventHandler -= value;
+
+                if (_touchDataEventHandler == null && _touchDataCallback != null)
+                {
+                    this.TouchSignal().Disconnect(_touchDataCallback);
+                }
+
+            }
         }
-        set
+
+        // Callback for View TouchSignal
+        private bool OnTouch(IntPtr view, IntPtr touchData)
         {
-          _view = value;
+            TouchEventArgs e = new TouchEventArgs();
+
+            e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(touchData);
+
+            if (_touchDataEventHandler != null)
+            {
+                return _touchDataEventHandler(this, e);
+            }
+            return false;
         }
-      }
 
-      /**
-        * @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
+
+        /**
+          * @brief Event arguments that passed via Hover signal
+          *
+          */
+        public class HoverEventArgs : EventArgs
         {
-          return _hover;
+            private Hover _hover;
+            /**
+              * @brief HoverEvent - 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;
+                }
+            }
         }
-        set
+
+        private EventHandlerWithReturnType<object, HoverEventArgs, bool> _hoverEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool HoverEventCallbackType(IntPtr view, IntPtr hoverEvent);
+        private HoverEventCallbackType _hoverEventCallback;
+
+        /**
+          * @brief Event for Hovered signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. Hovered signal is emitted when hover input is received.
+          */
+        public event EventHandlerWithReturnType<object, HoverEventArgs, bool> Hovered
         {
-          _hover = value;
+            add
+            {
+                if (_hoverEventHandler == null)
+                {
+                    _hoverEventCallback = OnHoverEvent;
+                    this.HoveredSignal().Connect(_hoverEventCallback);
+                }
+
+                _hoverEventHandler += value;
+            }
+
+            remove
+            {
+                _hoverEventHandler -= value;
+
+                if (_hoverEventHandler == null && _hoverEventCallback != null)
+                {
+                    this.HoveredSignal().Disconnect(_hoverEventCallback);
+                }
+
+            }
         }
-      }
-    }
-
-    /**
-      * @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
+        // Callback for View Hover signal
+        private bool OnHoverEvent(IntPtr view, IntPtr hoverEvent)
         {
-          return _view;
+            HoverEventArgs e = new HoverEventArgs();
+
+            e.Hover = Tizen.NUI.Hover.GetHoverFromPtr(hoverEvent);
+
+            if (_hoverEventHandler != null)
+            {
+                return _hoverEventHandler(this, e);
+            }
+            return false;
         }
-        set
+
+
+        /**
+          * @brief Event arguments that passed via Wheel signal
+          *
+          */
+        public class WheelEventArgs : EventArgs
         {
-          _view = value;
+            private Wheel _wheel;
+            /**
+              * @brief WheelEvent - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL
+              *
+              */
+            public Wheel Wheel
+            {
+                get
+                {
+                    return _wheel;
+                }
+                set
+                {
+                    _wheel = value;
+                }
+            }
         }
-      }
 
-      /**
-        * @brief Wheel - store a wheel rolling type : MOUSE_WHEEL or CUSTOM_WHEEL
-        *
-        */
-      public Wheel Wheel
-      {
-        get
+        private EventHandlerWithReturnType<object, WheelEventArgs, bool> _wheelEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate bool WheelEventCallbackType(IntPtr view, IntPtr wheelEvent);
+        private WheelEventCallbackType _wheelEventCallback;
+
+        /**
+          * @brief Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler
+          * provided by the user. WheelMoved signal is emitted when wheel event is received.
+          */
+        public event EventHandlerWithReturnType<object, WheelEventArgs, bool> WheelMoved
         {
-          return _wheel;
+            add
+            {
+                if (_wheelEventHandler == null)
+                {
+                    _wheelEventCallback = OnWheelEvent;
+                    this.WheelEventSignal().Connect(_wheelEventCallback);
+                }
+
+                _wheelEventHandler += value;
+            }
+
+            remove
+            {
+                _wheelEventHandler -= value;
+
+                if (_wheelEventHandler == null && _wheelEventCallback != null)
+                {
+                    this.WheelEventSignal().Disconnect(_wheelEventCallback);
+                }
+
+            }
         }
-        set
+
+        // Callback for View Wheel signal
+        private bool OnWheelEvent(IntPtr view, IntPtr wheelEvent)
         {
-          _wheel = value;
+            WheelEventArgs e = new WheelEventArgs();
+
+            e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(wheelEvent);
+
+            if (_wheelEventHandler != null)
+            {
+                return _wheelEventHandler(this, e);
+            }
+            return false;
         }
-      }
-    }
 
-    /**
-      * @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
+        private EventHandler _onStageEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void OnStageEventCallbackType(IntPtr control);
+        private OnStageEventCallbackType _onStageEventCallback;
+
+        /**
+          * @brief Event for OnStage signal which can be used to subscribe/unsubscribe the event handler
+          * OnStage signal is emitted after the view has been connected to the stage.
+          */
+        public event EventHandler OnStageEvent
         {
-          return _view;
+            add
+            {
+                if (_onStageEventHandler == null)
+                {
+                    _onStageEventCallback = OnStage;
+                    this.OnStageSignal().Connect(_onStageEventCallback);
+                }
+
+                _onStageEventHandler += value;
+            }
+
+            remove
+            {
+                _onStageEventHandler -= value;
+
+                if (_onStageEventHandler == null && _onStageEventCallback != null)
+                {
+                    this.OnStageSignal().Disconnect(_onStageEventCallback);
+                }
+            }
         }
-        set
+
+        // Callback for View OnStage signal
+        private void OnStage(IntPtr data)
         {
-          _view = value;
+            if (_onStageEventHandler != null)
+            {
+                _onStageEventHandler(this, null);
+            }
         }
-      }
-    }
 
-    /**
-      * @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
+        private EventHandler _offStageEventHandler;
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private delegate void OffStageEventCallbackType(IntPtr control);
+        private OffStageEventCallbackType _offStageEventCallback;
+
+        /**
+          * @brief Event for OffStage signal which can be used to subscribe/unsubscribe the event handler
+          * OffStage signal is emitted after the view has been disconnected from the stage.
+          */
+        public event EventHandler OffStageEvent
         {
-          return _view;
+            add
+            {
+                if (_offStageEventHandler == null)
+                {
+                    _offStageEventCallback = OffStage;
+                    this.OffStageSignal().Connect(_offStageEventCallback);
+                }
+
+                _offStageEventHandler += value;
+            }
+
+            remove
+            {
+                _offStageEventHandler -= value;
+
+                if (_offStageEventHandler == null && _offStageEventCallback != null)
+                {
+                    this.OffStageSignal().Disconnect(_offStageEventCallback);
+                }
+            }
         }
-        set
+
+        // Callback for View OffStage signal
+        private void OffStage(IntPtr data)
         {
-          _view = value;
+            if (_offStageEventHandler != null)
+            {
+                _offStageEventHandler(this, null);
+            }
         }
-      }
-    }
 
-    [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)
+
+
+
+
+
+        internal static View GetViewFromPtr(global::System.IntPtr cPtr)
         {
-          // Restricted to only one listener
-          if (_KeyInputFocusGainedEventHandler == null)
-          {
-            _KeyInputFocusGainedEventHandler += value;
-            //Console.WriteLine("View Key EVENT Locked....");
-            _KeyInputFocusGainedCallbackDelegate = new KeyInputFocusGainedCallbackDelegate(OnKeyInputFocusGained);
-            this.KeyInputFocusGainedSignal().Connect(_KeyInputFocusGainedCallbackDelegate);
-          }
+            View ret = new View(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
 
-      remove
-      {
-        lock(this)
+        internal class Property : global::System.IDisposable
         {
-          if (_KeyInputFocusGainedEventHandler != null)
-          {
-            this.KeyInputFocusGainedSignal().Disconnect(_KeyInputFocusGainedCallbackDelegate);
-          }
+            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_View_Property(swigCPtr);
+                        }
+                        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                    }
+                    global::System.GC.SuppressFinalize(this);
+                }
+            }
+
+            internal static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get();
+            internal static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get();
+            internal static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get();
+            internal static readonly int LEFT_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_LEFT_FOCUSABLE_ACTOR_ID_get();
+            internal static readonly int RIGHT_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get();
+            internal static readonly int UP_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get();
+            internal static readonly int DOWN_FOCUSABLE_ACTOR_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get();
+
+            internal Property() : this(NDalicPINVOKE.new_View_Property(), true)
+            {
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+
+            internal static readonly int STYLE_NAME = NDalicPINVOKE.View_Property_STYLE_NAME_get();
+            internal static readonly int BACKGROUND_COLOR = NDalicPINVOKE.View_Property_BACKGROUND_COLOR_get();
+            internal static readonly int BACKGROUND_IMAGE = NDalicPINVOKE.View_Property_BACKGROUND_IMAGE_get();
+            internal static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get();
+            internal static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get();
 
-          _KeyInputFocusGainedEventHandler -= 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 = Tizen.NUI.View.GetViewFromPtr(view);
-
-      if (_KeyInputFocusGainedEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _KeyInputFocusGainedEventHandler(this, e);
-      }
 
-    }
+        /// <summary>
+        /// Describes the direction to move the keyboard focus towards.
+        /// </summary>
+        public enum FocusDirection
+        {
+            Left,
+            Right,
+            Up,
+            Down,
+            PageUp,
+            PageDown
+        }
 
-    /**
-     * @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)
+        /// <summary>
+        /// Creates a new instance of a View.
+        /// </summary>
+        public View() : this(NDalicPINVOKE.View_New(), true)
         {
-          // Restricted to only one listener
-          if (_KeyInputFocusLostEventHandler == null)
-          {
-            _KeyInputFocusLostEventHandler += value;
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
-            _KeyInputFocusLostCallbackDelegate = new KeyInputFocusLostCallbackDelegate(OnKeyInputFocusLost);
-            this.KeyInputFocusLostSignal().Connect(_KeyInputFocusLostCallbackDelegate);
-          }
         }
-      }
+        internal View(View uiControl) : this(NDalicPINVOKE.new_View__SWIG_1(View.getCPtr(uiControl)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-      remove
-      {
-        lock(this)
+        internal View Assign(View handle)
         {
-          if (_KeyInputFocusLostEventHandler != null)
-          {
-            this.KeyInputFocusLostSignal().Disconnect(_KeyInputFocusLostCallbackDelegate);
-          }
+            View ret = new View(NDalicPINVOKE.View_Assign(swigCPtr, View.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-          _KeyInputFocusLostEventHandler -= value;
+        /// <summary>
+        /// Downcasts a handle to View handle.
+        /// If handle points to a View, the downcast produces valid handle.
+        /// If not, the returned handle is left uninitialized.
+        /// </summary>
+        /// <param name="handle">Handle to an object</param>
+        /// <returns>A handle to a View or an uninitialized handle</returns>
+        public new static View DownCast(BaseHandle handle)
+        {
+            View ret = new View(NDalicPINVOKE.View_DownCast(BaseHandle.getCPtr(handle)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
-    }
 
-    private void OnKeyInputFocusLost(IntPtr view)
-    {
-      KeyInputFocusLostEventArgs e = new KeyInputFocusLostEventArgs();
+        /// <summary>
+        /// Downcasts a handle to class which inherit View handle.
+        /// </summary>
+        /// <typeparam name="T">Class which inherit View</typeparam>
+        /// <param name="actor">Actor to an object</param>
+        /// <returns>A object which inherit View</returns>
+        public static T DownCast<T>(Actor actor) where T : View
+        {
+            return (T)(ViewRegistry.GetViewFromActor(actor));
+        }
 
-      // Populate all members of "e" (KeyInputFocusLostEventArgs) with real data
-      e.View = Tizen.NUI.View.GetViewFromPtr(view);
+        private View ConvertIdToView(uint id)
+        {
+            Actor actor = null;
 
-      if (_KeyInputFocusLostEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _KeyInputFocusLostEventHandler(this, e);
-      }
-    }
+            if (Parent)
+            {
+                actor = Parent.FindChildById(id);
+            }
 
-    /**
-     * @brief Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler
-     * (in the type of KeyHandler-DaliEventHandlerWithReturnType<object,KeyEventArgs,bool>)
-     * provided by the user. KeyPressed signal is emitted when key event is received.
-     */
-    public event DaliEventHandlerWithReturnType<object,KeyEventArgs,bool> KeyPressed
-    {
-      add
-      {
-        lock(this)
-        {
-          // Restricted to only one listener
-          if (_KeyHandler == null)
-          {
-            _KeyHandler += value;
+            if (!actor)
+            {
+                actor = Stage.Instance.GetRootLayer().FindChildById(id);
+            }
 
-            _KeyCallbackDelegate = new KeyCallbackDelegate(OnKey);
-            this.KeyEventSignal().Connect(_KeyCallbackDelegate);
-          }
+            return View.DownCast<View>(actor);
         }
-      }
 
-      remove
-      {
-        lock(this)
+        internal void SetKeyInputFocus()
         {
-          if (_KeyHandler != null)
-          {
-            this.KeyEventSignal().Disconnect(_KeyCallbackDelegate);
-          }
-
-          _KeyHandler -= value;
+            NDalicPINVOKE.View_SetKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-      }
-    }
 
-    private bool OnKey(IntPtr view, IntPtr key)
-    {
-      KeyEventArgs e = new KeyEventArgs();
+        /// <summary>
+        /// Quries whether the view has key input focus.
+        /// </summary>
+        /// <returns>true if this view has keyboard input focus</returns>
+        public bool HasKeyInputFocus()
+        {
+            bool ret = NDalicPINVOKE.View_HasKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-      // Populate all members of "e" (KeyEventArgs) with real data
-      e.View = Tizen.NUI.View.GetViewFromPtr(view);
-      e.Key = Tizen.NUI.Key.GetKeyFromPtr(key);
+        internal void ClearKeyInputFocus()
+        {
+            NDalicPINVOKE.View_ClearKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-      if (_KeyHandler != null)
-      {
-        //here we send all data to user event handlers
-        return _KeyHandler(this, e);
-      }
-      return false;
+        internal PinchGestureDetector GetPinchGestureDetector()
+        {
+            PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.View_GetPinchGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    }
+        internal PanGestureDetector GetPanGestureDetector()
+        {
+            PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.View_GetPanGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    /**
-      * @brief Event for OnRelayout signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of OnRelayoutEventHandler) provided by the user.
-      * OnRelayout signal is emitted after the size has been set on the view during relayout.
-      */
-    public event DaliEventHandler<object,OnRelayoutEventArgs> OnRelayoutEvent
-    {
-      add
-      {
-        lock(this)
+        internal TapGestureDetector GetTapGestureDetector()
         {
-          // Restricted to only one listener
-          if (_viewOnRelayoutEventHandler == null)
-          {
-            _viewOnRelayoutEventHandler += value;
-            //Console.WriteLine("View OnRelayoutEventArgs Locked....");
-            _viewOnRelayoutEventCallbackDelegate = new OnRelayoutEventCallbackDelegate(OnRelayout);
-            this.OnRelayoutSignal().Connect(_viewOnRelayoutEventCallbackDelegate);
-          }
+            TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.View_GetTapGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
 
-      remove
-      {
-        lock(this)
+        internal LongPressGestureDetector GetLongPressGestureDetector()
         {
-          if (_viewOnRelayoutEventHandler != null)
-          {
-            this.OnRelayoutSignal().Disconnect(_viewOnRelayoutEventCallbackDelegate);
-          }
+            LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.View_GetLongPressGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-          _viewOnRelayoutEventHandler -= value;
+        /// <summary>
+        /// Sets the name of the style to be applied to the view.
+        /// </summary>
+        /// <param name="styleName">A string matching a style described in a stylesheet</param>
+        public void SetStyleName(string styleName)
+        {
+            NDalicPINVOKE.View_SetStyleName(swigCPtr, styleName);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-      }
-    }
 
-    // Callback for View OnRelayout signal
-    private void OnRelayout(IntPtr data)
-    {
-      OnRelayoutEventArgs e = new OnRelayoutEventArgs();
-      //Console.WriteLine("View OnRelayoutEventArgs....");
-      // Populate all members of "e" (OnRelayoutEventArgs) with real data
-      e.View = View.GetViewFromPtr(data);
-
-      if (_viewOnRelayoutEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _viewOnRelayoutEventHandler(this, e);
-      }
-    }
+        /// <summary>
+        /// Retrieves the name of the style to be applied to the view (if any).
+        /// </summary>
+        /// <returns>A string matching a style, or an empty string</returns>
+        public string GetStyleName()
+        {
+            string ret = NDalicPINVOKE.View_GetStyleName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    /**
-      * @brief Event for Touched signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of TouchHandler-DaliEventHandlerWithReturnType<object,TouchEventArgs,bool>)
-      * provided by the user. Touched signal is emitted when touch input is received.
-      */
-    public event DaliEventHandlerWithReturnType<object,TouchEventArgs,bool> Touched
-    {
-      add
-      {
-        lock(this)
+        internal void SetBackgroundColor(Vector4 color)
         {
-          // Restricted to only one listener
-          if (_viewTouchHandler == null)
-          {
-            _viewTouchHandler += value;
-            //Console.WriteLine("View Touch EVENT LOCKED....");
-            _viewTouchCallbackDelegate = new TouchCallbackDelegate(OnTouch);
-            this.TouchSignal().Connect(_viewTouchCallbackDelegate);
-          }
+            NDalicPINVOKE.View_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-      }
 
-      remove
-      {
-        lock(this)
+        internal Vector4 GetBackgroundColor()
         {
-          if (_viewTouchHandler != null)
-          {
-            this.TouchSignal().Disconnect(_viewTouchCallbackDelegate);
-          }
+            Vector4 ret = new Vector4(NDalicPINVOKE.View_GetBackgroundColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-          _viewTouchHandler -= value;
+        internal void SetBackgroundImage(Image image)
+        {
+            NDalicPINVOKE.View_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-      }
-    }
 
-    // Callback for View TouchSignal
-    private bool OnTouch(IntPtr view, IntPtr touch)
-    {
-      TouchEventArgs e = new TouchEventArgs();
-      //Console.WriteLine("View Touch EVENT....");
-      // Populate all members of "e" (TouchEventArgs) with real data
-      e.View = View.GetViewFromPtr(view);
-      e.Touch = Tizen.NUI.Touch.GetTouchFromPtr(touch);
-
-      if (_viewTouchHandler != null)
-      {
-        //here we send all data to user event handlers
-        return _viewTouchHandler(this, e);
-      }
-
-      return false;
-    }
+        /// <summary>
+        /// Clears the background.
+        /// </summary>
+        public void ClearBackground()
+        {
+            NDalicPINVOKE.View_ClearBackground(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    /**
-      * @brief Event for Hovered signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of HoverHandler-DaliEventHandlerWithReturnType<object,HoverEventArgs,bool>)
-      * provided by the user. Hovered signal is emitted when hover input is received.
-      */
-    public event DaliEventHandlerWithReturnType<object,HoverEventArgs,bool> Hovered
-    {
-      add
-      {
-        lock(this)
+        internal ControlKeySignal KeyEventSignal()
         {
-          // Restricted to only one listener
-          if (_viewHoverHandler == null)
-          {
-            _viewHoverHandler += value;
+            ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.View_KeyEventSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-            _viewHoverCallbackDelegate = new HoverCallbackDelegate(OnHover);
-            this.HoveredSignal().Connect(_viewHoverCallbackDelegate);
-          }
+        internal KeyInputFocusSignal KeyInputFocusGainedSignal()
+        {
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusGainedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
         }
-      }
 
-      remove
-      {
-        lock(this)
+        internal KeyInputFocusSignal KeyInputFocusLostSignal()
         {
-          if (_viewHoverHandler != null)
-          {
-            this.HoveredSignal().Disconnect(_viewHoverCallbackDelegate);
-          }
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusLostSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-          _viewHoverHandler -= value;
+        internal View(ViewImpl implementation) : this(NDalicPINVOKE.new_View__SWIG_2(ViewImpl.getCPtr(implementation)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-      }
-    }
 
-    // Callback for View Hover signal
-    private bool OnHover(IntPtr view, IntPtr hover)
-    {
-      HoverEventArgs e = new HoverEventArgs();
+        internal enum PropertyRange
+        {
+            PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
+            CONTROL_PROPERTY_START_INDEX = PROPERTY_START_INDEX,
+            CONTROL_PROPERTY_END_INDEX = CONTROL_PROPERTY_START_INDEX + 1000
+        }
 
-      // Populate all members of "e" (HoverEventArgs) with real data
-      e.View = View.GetViewFromPtr(view);
-      e.Hover = Tizen.NUI.Hover.GetHoverFromPtr(hover);
+        /// <summary>
+        /// styleName, type string.
+        /// </summary>
+        public string StyleName
+        {
+            get
+            {
+                string temp;
+                GetProperty(View.Property.STYLE_NAME).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.STYLE_NAME, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      if (_viewHoverHandler != null)
-      {
-        //here we send all data to user event handlers
-        return _viewHoverHandler(this, e);
-      }
+        /// <summary>
+        /// mutually exclusive with BACKGROUND_IMAGE & BACKGROUND,  type Vector4.
+        /// </summary>
+        public Color BackgroundColor
+        {
+            get
+            {
+                Color backgroundColor = new Color(0.0f, 0.0f, 0.0f, 0.0f);
+
+                Tizen.NUI.PropertyMap background = Background;
+                int visualType = 0;
+                background.Find(Visual.Property.Type).Get(ref visualType);
+                if (visualType == (int)Visual.Type.Color)
+                {
+                    background.Find(ColorVisualProperty.MixColor).Get(backgroundColor);
+                }
+
+                return backgroundColor;
+            }
+            set
+            {
+                SetProperty(View.Property.BACKGROUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      return false;
-    }
+        /// <summary>
+        /// mutually exclusive with BACKGROUND_COLOR & BACKGROUND,  type Map.
+        /// </summary>
+        public string BackgroundImage
+        {
+            get
+            {
+                string backgroundImage = "";
+
+                Tizen.NUI.PropertyMap background = Background;
+                int visualType = 0;
+                background.Find(Visual.Property.Type).Get(ref visualType);
+                if (visualType == (int)Visual.Type.Image)
+                {
+                    background.Find(ImageVisualProperty.URL).Get(out backgroundImage);
+                }
+
+                return backgroundImage;
+            }
+            set
+            {
+                SetProperty(View.Property.BACKGROUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    /**
-      * @brief Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of WheelHandler-DaliEventHandlerWithReturnType<object,WheelEventArgs,bool>)
-      * provided by the user. WheelMoved signal is emitted when wheel event is received.
-      */
-    public event DaliEventHandlerWithReturnType<object,WheelEventArgs,bool> WheelMoved
-    {
-      add
-      {
-        lock(this)
+        internal bool KeyInputFocus
         {
-          // Restricted to only one listener
-          if (_viewWheelHandler == null)
-          {
-            _viewWheelHandler += value;
-            //Console.WriteLine("View Wheel EVENT LOCKED....");
-            _viewWheelCallbackDelegate = new WheelCallbackDelegate(OnWheel);
-            this.WheelEventSignal().Connect(_viewWheelCallbackDelegate);
-          }
+            get
+            {
+                bool temp = false;
+                GetProperty(View.Property.KEY_INPUT_FOCUS).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.KEY_INPUT_FOCUS, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        /// <summary>
+        /// mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map or string for URL.
+        /// </summary>
+        public Tizen.NUI.PropertyMap Background
         {
-          if (_viewWheelHandler != null)
-          {
-            this.WheelEventSignal().Disconnect(_viewWheelCallbackDelegate);
-          }
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(View.Property.BACKGROUND).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.BACKGROUND, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-          _viewWheelHandler -= value;
+        /// <summary>
+        /// The current state of the view.
+        /// </summary>
+        public string State
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(View.Property.STATE).Get(ref temp);
+                switch (temp)
+                {
+                    case 0:
+                    {
+                        return "NORMAL";
+                    }
+                    case 1:
+                    {
+                        return "FOCUSED";
+                    }
+                    case 2:
+                    {
+                        return "DISABLED";
+                    }
+                    default:
+                    {
+                        return "";
+                    }
+                }
+            }
+            set
+            {
+                SetProperty(View.Property.STATE, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
-    }
 
-    // Callback for View Wheel signal
-    private bool OnWheel(IntPtr view, IntPtr wheel)
-    {
-      WheelEventArgs e = new WheelEventArgs();
-      //Console.WriteLine("View Wheel EVENT ....");
-      // Populate all members of "e" (WheelEventArgs) with real data
-      e.View = View.GetViewFromPtr(view);
-      e.Wheel = Tizen.NUI.Wheel.GetWheelFromPtr(wheel);
-
-      if (_viewWheelHandler != null)
-      {
-        //here we send all data to user event handlers
-        return _viewWheelHandler(this, e);
-      }
-
-      return false;
-    }
+        /// <summary>
+        /// The current sub state of the view.
+        /// </summary>
+        public string SubState
+        {
+            get
+            {
+                string temp;
+                GetProperty(View.Property.SUB_STATE).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.SUB_STATE, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    /**
-      * @brief Event for OnStage signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of OnStageEventHandler) provided by the user.
-      * OnStage signal is emitted after the view has been connected to the stage.
-      */
-    public event DaliEventHandler<object,OnStageEventArgs> OnStageEvent
-    {
-      add
-      {
-        lock(this)
+        /// <summary>
+        /// Displays a tooltip
+        /// </summary>
+        public Tizen.NUI.PropertyMap Tooltip
         {
-          // Restricted to only one listener
-          if (_viewOnStageEventHandler == null)
-          {
-            _viewOnStageEventHandler += value;
+            get
+            {
+                Tizen.NUI.PropertyMap temp = new Tizen.NUI.PropertyMap();
+                GetProperty(View.Property.TOOLTIP).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.TOOLTIP, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-            _viewOnStageEventCallbackDelegate = new OnStageEventCallbackDelegate(OnStage);
-            this.OnStageSignal().Connect(_viewOnStageEventCallbackDelegate);
-          }
+        /// <summary>
+        /// Displays a tooltip as Text
+        /// </summary>
+        public string TooltipText
+        {
+            set
+            {
+                SetProperty(View.Property.TOOLTIP, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        private int LeftFocusableActorId
         {
-          if (_viewOnStageEventHandler != null)
-          {
-            this.OnStageSignal().Disconnect(_viewOnStageEventCallbackDelegate);
-          }
+            get
+            {
+                int temp = 0;
+                GetProperty(View.Property.LEFT_FOCUSABLE_ACTOR_ID).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.LEFT_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-          _viewOnStageEventHandler -= value;
+        private int RightFocusableActorId
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(View.Property.RIGHT_FOCUSABLE_ACTOR_ID).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.RIGHT_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
-    }
 
-    // Callback for View OnStage signal
-    private void OnStage(IntPtr data)
-    {
-      OnStageEventArgs e = new OnStageEventArgs();
+        private int UpFocusableActorId
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(View.Property.UP_FOCUSABLE_ACTOR_ID).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.UP_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      // Populate all members of "e" (OnStageEventArgs) with real data
-      e.View = View.GetViewFromPtr(data);
+        private int DownFocusableActorId
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(View.Property.DOWN_FOCUSABLE_ACTOR_ID).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(View.Property.DOWN_FOCUSABLE_ACTOR_ID, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      ////Console.WriteLine("############# OnStage()! e.View.Name=" + e.View.Name);
+        /// <summary>
+        /// Child Property of FlexContainer
+        /// The proportion of the free space in the container the flex item will receive. 
+        /// If all items in the container set this property, their sizes will be proportional to the specified flex factor
+        /// </summary> 
+        public float Flex
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(FlexContainer.ChildProperty.FLEX).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.ChildProperty.FLEX, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      if (_viewOnStageEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _viewOnStageEventHandler(this, e);
-      }
-    }
+        /// <summary>
+        /// Child Property of FlexContainer
+        /// The alignment of the flex item along the cross axis, which, if set, overides the default alignment for all items in the container
+        /// </summary> 
+        public int AlignSelf
+        {
+            get
+            {
+                int temp = 0;
+                GetProperty(FlexContainer.ChildProperty.ALIGN_SELF).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.ChildProperty.ALIGN_SELF, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-    /**
-      * @brief Event for OffStage signal which can be used to subscribe/unsubscribe the event handler
-      * (in the type of OffStageEventHandler) provided by the user.
-      * OffStage signal is emitted after the view has been disconnected from the stage.
-      */
-    public event DaliEventHandler<object,OffStageEventArgs> OffStageEvent
-    {
-      add
-      {
-        lock(this)
+        /// <summary>
+        /// Child Property of FlexContainer
+        /// The space around the flex item
+        /// </summary> 
+        public Vector4 FlexMargin
         {
-          // Restricted to only one listener
-          if (_viewOffStageEventHandler == null)
-          {
-            _viewOffStageEventHandler += value;
+            get
+            {
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(FlexContainer.ChildProperty.FLEX_MARGIN).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(FlexContainer.ChildProperty.FLEX_MARGIN, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-            _viewOffStageEventCallbackDelegate = new OffStageEventCallbackDelegate(OffStage);
-            this.OnStageSignal().Connect(_viewOffStageEventCallbackDelegate);
-          }
+        /// <summary>
+        /// The top-left cell this child occupies, if not set, the first available cell is used
+        /// </summary>
+        public Vector2 CellIndex
+        {
+            get
+            {
+                Vector2 temp = new Vector2(0.0f, 0.0f);
+                GetProperty(TableView.ChildProperty.CELL_INDEX).Get(temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.ChildProperty.CELL_INDEX, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
 
-      remove
-      {
-        lock(this)
+        /// <summary>
+        /// The number of rows this child occupies, if not set, default value is 1
+        /// </summary>
+        public float RowSpan
         {
-          if (_viewOffStageEventHandler != null)
-          {
-            this.OnStageSignal().Disconnect(_viewOffStageEventCallbackDelegate);
-          }
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TableView.ChildProperty.ROW_SPAN).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.ChildProperty.ROW_SPAN, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-          _viewOffStageEventHandler -= value;
+        /// <summary>
+        /// The number of columns this child occupies, if not set, default value is 1
+        /// </summary>
+        public float ColumnSpan
+        {
+            get
+            {
+                float temp = 0.0f;
+                GetProperty(TableView.ChildProperty.COLUMN_SPAN).Get(ref temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.ChildProperty.COLUMN_SPAN, new Tizen.NUI.PropertyValue(value));
+            }
         }
-      }
-    }
 
-    // Callback for View OffStage signal
-    private void OffStage(IntPtr data)
-    {
-      OffStageEventArgs e = new OffStageEventArgs();
+        /// <summary>
+        /// The horizontal alignment of this child inside the cells, if not set, default value is 'left'
+        /// </summary>
+        public string CellHorizontalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      // Populate all members of "e" (OffStageEventArgs) with real data
-      e.View = View.GetViewFromPtr(data);
+        /// <summary>
+        /// The vertical alignment of this child inside the cells, if not set, default value is 'top'
+        /// </summary>
+        public string CellVerticalAlignment
+        {
+            get
+            {
+                string temp;
+                GetProperty(TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get(out temp);
+                return temp;
+            }
+            set
+            {
+                SetProperty(TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT, new Tizen.NUI.PropertyValue(value));
+            }
+        }
 
-      if (_viewOffStageEventHandler != null)
-      {
-        //here we send all data to user event handlers
-        _viewOffStageEventHandler(this, e);
-      }
-    }
+        /// <summary>
+        /// The left focusable view.
+        /// This will return NULL if not set.
+        /// This will also return NULL if the specified left focusable view is not on stage.
+        /// </summary>
+        public View LeftFocusableView
+        {
+            // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa.
+            get
+            {
+                if (LeftFocusableActorId >= 0)
+                {
+                    return ConvertIdToView((uint)LeftFocusableActorId);
+                }
+                return null;
+            }
+            set
+            {
+                LeftFocusableActorId = (int)value.GetId();
+            }
+        }
 
-    public static View GetViewFromPtr(global::System.IntPtr cPtr) {
-      View ret = new View(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    }
+        /// <summary>
+        /// The right focusable view.
+        /// This will return NULL if not set.
+        /// This will also return NULL if the specified right focusable view is not on stage.
+        /// </summary>
+        public View RightFocusableView
+        {
+            // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa.
+            get
+            {
+                if (RightFocusableActorId >= 0)
+                {
+                    return ConvertIdToView((uint)RightFocusableActorId);
+                }
+                return null;
+            }
+            set
+            {
+                RightFocusableActorId = (int)value.GetId();
+            }
+        }
 
-    public Tizen.NUI.Property.Map Tooltip
-    {
-      get
-      {
-        Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-        GetProperty( View.Property.TOOLTIP).Get(  temp );
-        return temp;
-      }
-      set
-      {
-        SetProperty( View.Property.TOOLTIP, new Tizen.NUI.Property.Value( value ) );
-      }
-    }
+        /// <summary>
+        /// The up focusable view.
+        /// This will return NULL if not set.
+        /// This will also return NULL if the specified up focusable view is not on stage.
+        /// </summary>
+        public View UpFocusableView
+        {
+            // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa.
+            get
+            {
+                if (UpFocusableActorId >= 0)
+                {
+                    return ConvertIdToView((uint)UpFocusableActorId);
+                }
+                return null;
+            }
+            set
+            {
+                UpFocusableActorId = (int)value.GetId();
+            }
+        }
 
-    public string TooltipText
-    {
-      set
-      {
-        SetProperty( View.Property.TOOLTIP, new Tizen.NUI.Property.Value( value ) );
-      }
-    }
-  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_View_Property(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get();
-    public static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get();
-    public static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get();
-  
-    public Property() : this(NDalicPINVOKE.new_View_Property(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public static readonly int STYLE_NAME = NDalicPINVOKE.View_Property_STYLE_NAME_get();
-    public static readonly int BACKGROUND_COLOR = NDalicPINVOKE.View_Property_BACKGROUND_COLOR_get();
-    public static readonly int BACKGROUND_IMAGE = NDalicPINVOKE.View_Property_BACKGROUND_IMAGE_get();
-    public static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get();
-    public static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get();
-  
-  }
-
-  public class KeyboardFocus : global::System.IDisposable {
-    private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-    protected bool swigCMemOwn;
-  
-    internal KeyboardFocus(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(KeyboardFocus obj) {
-      return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-    }
-  
-    ~KeyboardFocus() {
-      Dispose();
-    }
-  
-    public virtual void Dispose() {
-      lock(this) {
-        if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-          if (swigCMemOwn) {
-            swigCMemOwn = false;
-            NDalicPINVOKE.delete_View_KeyboardFocus(swigCPtr);
-          }
-          swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-        }
-        global::System.GC.SuppressFinalize(this);
-      }
-    }
-  
-    public KeyboardFocus() : this(NDalicPINVOKE.new_View_KeyboardFocus(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    }
-  
-    public enum Direction {
-      LEFT,
-      RIGHT,
-      UP,
-      DOWN,
-      PAGE_UP,
-      PAGE_DOWN
-    }
-  
-  }
-
-  public View () : this (NDalicPINVOKE.View_New(), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public View(View uiControl) : this(NDalicPINVOKE.new_View__SWIG_1(View.getCPtr(uiControl)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public View Assign(View handle) {
-    View ret = new View(NDalicPINVOKE.View_Assign(swigCPtr, View.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public new static View DownCast(BaseHandle handle) {
-    View ret = new View(NDalicPINVOKE.View_DownCast(BaseHandle.getCPtr(handle)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyInputFocus() {
-    NDalicPINVOKE.View_SetKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool HasKeyInputFocus() {
-    bool ret = NDalicPINVOKE.View_HasKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ClearKeyInputFocus() {
-    NDalicPINVOKE.View_ClearKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PinchGestureDetector GetPinchGestureDetector() {
-    PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.View_GetPinchGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PanGestureDetector GetPanGestureDetector() {
-    PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.View_GetPanGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TapGestureDetector GetTapGestureDetector() {
-    TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.View_GetTapGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public LongPressGestureDetector GetLongPressGestureDetector() {
-    LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.View_GetLongPressGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetStyleName(string styleName) {
-    NDalicPINVOKE.View_SetStyleName(swigCPtr, styleName);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public string GetStyleName() {
-    string ret = NDalicPINVOKE.View_GetStyleName(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundColor(Vector4 color) {
-    NDalicPINVOKE.View_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetBackgroundColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.View_GetBackgroundColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundImage(Image image) {
-    NDalicPINVOKE.View_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void ClearBackground() {
-    NDalicPINVOKE.View_ClearBackground(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ControlKeySignal KeyEventSignal() {
-    ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.View_KeyEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusGainedSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusGainedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusLostSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusLostSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public View(ViewImpl implementation) : this(NDalicPINVOKE.new_View__SWIG_2(ViewImpl.getCPtr(implementation)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public enum PropertyRange {
-    PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX,
-    CONTROL_PROPERTY_START_INDEX = PROPERTY_START_INDEX,
-    CONTROL_PROPERTY_END_INDEX = CONTROL_PROPERTY_START_INDEX+1000
-  }
-
-  public string StyleName
-  {
-    get
-    {
-      string temp;
-      GetProperty( View.Property.STYLE_NAME).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.STYLE_NAME, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 BackgroundColor
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( View.Property.BACKGROUND_COLOR).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND_COLOR, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map BackgroundImage
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( View.Property.BACKGROUND_IMAGE).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND_IMAGE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public bool KeyInputFocus
-  {
-    get
-    {
-      bool temp = false;
-      GetProperty( View.Property.KEY_INPUT_FOCUS).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.KEY_INPUT_FOCUS, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Tizen.NUI.Property.Map Background
-  {
-    get
-    {
-      Tizen.NUI.Property.Map temp = new Tizen.NUI.Property.Map();
-      GetProperty( View.Property.BACKGROUND).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.BACKGROUND, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string State
-  {
-    get
-    {
-      string temp;
-      GetProperty( View.Property.STATE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.STATE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string SubState
-  {
-    get
-    {
-      string temp;
-      GetProperty( View.Property.SUB_STATE).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( View.Property.SUB_STATE, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// The down focusable view.
+        /// This will return NULL if not set.
+        /// This will also return NULL if the specified down focusable view is not on stage.
+        /// </summary>
+        public View DownFocusableView
+        {
+            // As native side will be only storing IDs so need a logic to convert View to ID and vice-versa.
+            get
+            {
+                if (DownFocusableActorId >= 0)
+                {
+                    return ConvertIdToView((uint)DownFocusableActorId);
+                }
+                return null;
+            }
+            set
+            {
+                DownFocusableActorId = (int)value.GetId();
+            }
+        }
 
-  public Vector2 CellIndex
-  {
-    get
-    {
-      Vector2 temp = new Vector2(0.0f,0.0f);
-      GetProperty( TableView.ChildProperty.CELL_INDEX).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_INDEX, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float RowSpan
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TableView.ChildProperty.ROW_SPAN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.ROW_SPAN, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public float ColumnSpan
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( TableView.ChildProperty.COLUMN_SPAN).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.COLUMN_SPAN, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string CellHorizontalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public string CellVerticalAlignment
-  {
-    get
-    {
-      string temp;
-      GetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get( out temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
+        /// <summary>
+        /// whether the view should be focusable by keyboard navigation.
+        /// </summary>
+        public bool Focusable
+        {
+            set
+            {
+                SetKeyboardFocusable(value);
+            }
+            get
+            {
+                return IsKeyboardFocusable();
+            }
+        }
 
-  public float Flex
-  {
-    get
-    {
-      float temp = 0.0f;
-      GetProperty( FlexContainer.ChildProperty.FLEX).Get( ref temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.FLEX, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public int AlignSelf
-  {
-    get
-    {
-      int temp = 0;
-      GetProperty( FlexContainer.ChildProperty.ALIGN_SELF).Get( ref temp );
-      return temp;
     }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.ALIGN_SELF, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-  public Vector4 FlexMargin
-  {
-    get
-    {
-      Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f);
-      GetProperty( FlexContainer.ChildProperty.FLEX_MARGIN).Get(  temp );
-      return temp;
-    }
-    set
-    {
-      SetProperty( FlexContainer.ChildProperty.FLEX_MARGIN, new Tizen.NUI.Property.Value( value ) );
-    }
-  }
-
-}
 
 }
index 85085a5..09d13e1 100755 (executable)
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
+#define DOT_NET_CORE
 
-using System;
-
-#if true
+#if (DOT_NET_CORE)
 using System.Reflection;
 #endif
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
+    public class ViewImpl : CustomActorImpl
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 
-public class ViewImpl : CustomActorImpl {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal ViewImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ViewImpl_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-  internal ViewImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ViewImpl_SWIGUpcast(cPtr), cMemoryOwn) {
-    //Console.WriteLine("[ViewImple] ViewImpl()");             
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewImpl obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        public override void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        throw new global::System.MethodAccessException("C++ destructor does not have public access");
+                    }
+                    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(ViewImpl obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        public static View New()
+        {
+            View ret = new View(NDalicPINVOKE.ViewImpl_New(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public override void Dispose() {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          throw new global::System.MethodAccessException("C++ destructor does not have public access");
+        public void SetStyleName(string styleName)
+        {
+            NDalicPINVOKE.ViewImpl_SetStyleName(swigCPtr, styleName);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public string GetStyleName()
+        {
+            string ret = NDalicPINVOKE.ViewImpl_GetStyleName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetBackgroundColor(Vector4 color)
+        {
+            NDalicPINVOKE.ViewImpl_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public Vector4 GetBackgroundColor()
+        {
+            Vector4 ret = new Vector4(NDalicPINVOKE.ViewImpl_GetBackgroundColor(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal void SetBackgroundImage(Image image)
+        {
+            NDalicPINVOKE.ViewImpl_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetBackground(PropertyMap map)
+        {
+            NDalicPINVOKE.ViewImpl_SetBackground(swigCPtr, PropertyMap.getCPtr(map));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void ClearBackground()
+        {
+            NDalicPINVOKE.ViewImpl_ClearBackground(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void EnableGestureDetection(Gesture.GestureType type)
+        {
+            NDalicPINVOKE.ViewImpl_EnableGestureDetection(swigCPtr, (int)type);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void DisableGestureDetection(Gesture.GestureType type)
+        {
+            NDalicPINVOKE.ViewImpl_DisableGestureDetection(swigCPtr, (int)type);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public PinchGestureDetector GetPinchGestureDetector()
+        {
+            PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.ViewImpl_GetPinchGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public PanGestureDetector GetPanGestureDetector()
+        {
+            PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.ViewImpl_GetPanGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public TapGestureDetector GetTapGestureDetector()
+        {
+            TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.ViewImpl_GetTapGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public LongPressGestureDetector GetLongPressGestureDetector()
+        {
+            LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.ViewImpl_GetLongPressGestureDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetKeyboardNavigationSupport(bool isSupported)
+        {
+            NDalicPINVOKE.ViewImpl_SetKeyboardNavigationSupport(swigCPtr, isSupported);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsKeyboardNavigationSupported()
+        {
+            bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardNavigationSupported(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetKeyInputFocus()
+        {
+            NDalicPINVOKE.ViewImpl_SetKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool HasKeyInputFocus()
+        {
+            bool ret = NDalicPINVOKE.ViewImpl_HasKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void ClearKeyInputFocus()
+        {
+            NDalicPINVOKE.ViewImpl_ClearKeyInputFocus(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetAsKeyboardFocusGroup(bool isFocusGroup)
+        {
+            NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public bool IsKeyboardFocusGroup()
+        {
+            bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void AccessibilityActivate()
+        {
+            NDalicPINVOKE.ViewImpl_AccessibilityActivate(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void KeyboardEnter()
+        {
+            NDalicPINVOKE.ViewImpl_KeyboardEnter(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal ControlKeySignal KeyEventSignal()
+        {
+            ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.ViewImpl_KeyEventSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal KeyInputFocusSignal KeyInputFocusGainedSignal()
+        {
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusGainedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal KeyInputFocusSignal KeyInputFocusLostSignal()
+        {
+            KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusLostSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public bool EmitKeyEventSignal(Key arg0)
+        {
+            bool ret = NDalicPINVOKE.ViewImpl_EmitKeyEventSignal(swigCPtr, Key.getCPtr(arg0));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new void OnStageConnection(int depth)
+        {
+            if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) NDalicPINVOKE.ViewImpl_OnStageConnectionSwigExplicitViewImpl(swigCPtr, depth); else NDalicPINVOKE.ViewImpl_OnStageConnection(swigCPtr, depth);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnStageDisconnection()
+        {
+            if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) NDalicPINVOKE.ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnStageDisconnection(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnChildAdd(Actor child)
+        {
+            if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnChildRemove(Actor child)
+        {
+            if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnPropertySet(int index, PropertyValue propertyValue)
+        {
+            if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4)) NDalicPINVOKE.ViewImpl_OnPropertySetSwigExplicitViewImpl(swigCPtr, index, PropertyValue.getCPtr(propertyValue)); else NDalicPINVOKE.ViewImpl_OnPropertySet(swigCPtr, index, PropertyValue.getCPtr(propertyValue));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnSizeSet(Vector3 targetSize)
+        {
+            if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5)) NDalicPINVOKE.ViewImpl_OnSizeSetSwigExplicitViewImpl(swigCPtr, Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeSet(swigCPtr, Vector3.getCPtr(targetSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnSizeAnimation(Animation animation, Vector3 targetSize)
+        {
+            if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6)) NDalicPINVOKE.ViewImpl_OnSizeAnimationSwigExplicitViewImpl(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeAnimation(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal virtual new bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7) ? NDalicPINVOKE.ViewImpl_OnTouchEventSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new bool OnHoverEvent(Hover arg0)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8) ? NDalicPINVOKE.ViewImpl_OnHoverEventSwigExplicitViewImpl(swigCPtr, Hover.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnHoverEvent(swigCPtr, Hover.getCPtr(arg0)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new bool OnKeyEvent(Key arg0)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9) ? NDalicPINVOKE.ViewImpl_OnKeyEventSwigExplicitViewImpl(swigCPtr, Key.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnKeyEvent(swigCPtr, Key.getCPtr(arg0)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new bool OnWheelEvent(Wheel arg0)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10) ? NDalicPINVOKE.ViewImpl_OnWheelEventSwigExplicitViewImpl(swigCPtr, Wheel.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnWheelEvent(swigCPtr, Wheel.getCPtr(arg0)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new void OnRelayout(Vector2 size, RelayoutContainer container)
+        {
+            if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11)) NDalicPINVOKE.ViewImpl_OnRelayoutSwigExplicitViewImpl(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container)); else NDalicPINVOKE.ViewImpl_OnRelayout(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension)
+        {
+            if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12)) NDalicPINVOKE.ViewImpl_OnSetResizePolicySwigExplicitViewImpl(swigCPtr, (int)policy, (int)dimension); else NDalicPINVOKE.ViewImpl_OnSetResizePolicy(swigCPtr, (int)policy, (int)dimension);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new Vector3 GetNaturalSize()
+        {
+            Vector3 ret = new Vector3((SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13) ? NDalicPINVOKE.ViewImpl_GetNaturalSizeSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_GetNaturalSize(swigCPtr)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new float CalculateChildSize(Actor child, DimensionType dimension)
+        {
+            float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new float GetHeightForWidth(float width)
+        {
+            float ret = (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15) ? NDalicPINVOKE.ViewImpl_GetHeightForWidthSwigExplicitViewImpl(swigCPtr, width) : NDalicPINVOKE.ViewImpl_GetHeightForWidth(swigCPtr, width));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new float GetWidthForHeight(float height)
+        {
+            float ret = (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16) ? NDalicPINVOKE.ViewImpl_GetWidthForHeightSwigExplicitViewImpl(swigCPtr, height) : NDalicPINVOKE.ViewImpl_GetWidthForHeight(swigCPtr, height));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new bool RelayoutDependentOnChildren(DimensionType dimension)
+        {
+            bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(swigCPtr, (int)dimension) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_0(swigCPtr, (int)dimension));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new bool RelayoutDependentOnChildren()
+        {
+            bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(swigCPtr) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_1(swigCPtr));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        protected virtual new void OnCalculateRelayoutSize(DimensionType dimension)
+        {
+            if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19)) NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(swigCPtr, (int)dimension); else NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSize(swigCPtr, (int)dimension);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        protected virtual new void OnLayoutNegotiated(float size, DimensionType dimension)
+        {
+            if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20)) NDalicPINVOKE.ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(swigCPtr, size, (int)dimension); else NDalicPINVOKE.ViewImpl_OnLayoutNegotiated(swigCPtr, size, (int)dimension);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnInitialize()
+        {
+            if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21)) NDalicPINVOKE.ViewImpl_OnInitializeSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnInitialize(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnControlChildAdd(Actor child)
+        {
+            if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnControlChildRemove(Actor child)
+        {
+            if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, Actor.getCPtr(child));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change)
+        {
+            if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24)) NDalicPINVOKE.ViewImpl_OnStyleChangeSwigExplicitViewImpl(swigCPtr, StyleManager.getCPtr(styleManager), (int)change); else NDalicPINVOKE.ViewImpl_OnStyleChange(swigCPtr, StyleManager.getCPtr(styleManager), (int)change);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual bool OnAccessibilityActivated()
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25) ? NDalicPINVOKE.ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityActivated(swigCPtr));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual bool OnAccessibilityPan(PanGesture gesture)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26) ? NDalicPINVOKE.ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(gesture)) : NDalicPINVOKE.ViewImpl_OnAccessibilityPan(swigCPtr, PanGesture.getCPtr(gesture)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal virtual bool OnAccessibilityTouch(SWIGTYPE_p_Dali__TouchEvent touchEvent)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27) ? NDalicPINVOKE.ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)) : NDalicPINVOKE.ViewImpl_OnAccessibilityTouch(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual bool OnAccessibilityValueChange(bool isIncrease)
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28) ? NDalicPINVOKE.ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(swigCPtr, isIncrease) : NDalicPINVOKE.ViewImpl_OnAccessibilityValueChange(swigCPtr, isIncrease));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual bool OnAccessibilityZoom()
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29) ? NDalicPINVOKE.ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityZoom(swigCPtr));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual void OnKeyInputFocusGained()
+        {
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnKeyInputFocusLost()
+        {
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.FocusDirection direction, bool loopEnabled)
+        {
+            Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
+        {
+            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual bool OnKeyboardEnter()
+        {
+            bool ret = (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public virtual void OnPinch(PinchGesture pinch)
+        {
+            if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35)) NDalicPINVOKE.ViewImpl_OnPinchSwigExplicitViewImpl(swigCPtr, PinchGesture.getCPtr(pinch)); else NDalicPINVOKE.ViewImpl_OnPinch(swigCPtr, PinchGesture.getCPtr(pinch));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnPan(PanGesture pan)
+        {
+            if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36)) NDalicPINVOKE.ViewImpl_OnPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(pan)); else NDalicPINVOKE.ViewImpl_OnPan(swigCPtr, PanGesture.getCPtr(pan));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnTap(TapGesture tap)
+        {
+            if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37)) NDalicPINVOKE.ViewImpl_OnTapSwigExplicitViewImpl(swigCPtr, TapGesture.getCPtr(tap)); else NDalicPINVOKE.ViewImpl_OnTap(swigCPtr, TapGesture.getCPtr(tap));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public virtual void OnLongPress(LongPressGesture longPress)
+        {
+            if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38)) NDalicPINVOKE.ViewImpl_OnLongPressSwigExplicitViewImpl(swigCPtr, LongPressGesture.getCPtr(longPress)); else NDalicPINVOKE.ViewImpl_OnLongPress(swigCPtr, LongPressGesture.getCPtr(longPress));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal virtual void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
+        {
+            if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39)) NDalicPINVOKE.ViewImpl_SignalConnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalConnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback)
+        {
+            if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40)) NDalicPINVOKE.ViewImpl_SignalDisconnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        private void SwigDirectorConnect()
+        {
+            if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0))
+                swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnStageConnection);
+            if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1))
+                swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnStageDisconnection);
+            if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2))
+                swigDelegate2 = new SwigDelegateViewImpl_2(SwigDirectorOnChildAdd);
+            if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3))
+                swigDelegate3 = new SwigDelegateViewImpl_3(SwigDirectorOnChildRemove);
+            if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4))
+                swigDelegate4 = new SwigDelegateViewImpl_4(SwigDirectorOnPropertySet);
+            if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5))
+                swigDelegate5 = new SwigDelegateViewImpl_5(SwigDirectorOnSizeSet);
+            if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6))
+                swigDelegate6 = new SwigDelegateViewImpl_6(SwigDirectorOnSizeAnimation);
+            if (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7))
+                swigDelegate7 = new SwigDelegateViewImpl_7(SwigDirectorOnTouchEvent);
+            if (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8))
+                swigDelegate8 = new SwigDelegateViewImpl_8(SwigDirectorOnHoverEvent);
+            if (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9))
+                swigDelegate9 = new SwigDelegateViewImpl_9(SwigDirectorOnKeyEvent);
+            if (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10))
+                swigDelegate10 = new SwigDelegateViewImpl_10(SwigDirectorOnWheelEvent);
+            if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11))
+                swigDelegate11 = new SwigDelegateViewImpl_11(SwigDirectorOnRelayout);
+            if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12))
+                swigDelegate12 = new SwigDelegateViewImpl_12(SwigDirectorOnSetResizePolicy);
+            if (SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13))
+                swigDelegate13 = new SwigDelegateViewImpl_13(SwigDirectorGetNaturalSize);
+            if (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14))
+                swigDelegate14 = new SwigDelegateViewImpl_14(SwigDirectorCalculateChildSize);
+            if (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15))
+                swigDelegate15 = new SwigDelegateViewImpl_15(SwigDirectorGetHeightForWidth);
+            if (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16))
+                swigDelegate16 = new SwigDelegateViewImpl_16(SwigDirectorGetWidthForHeight);
+            if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17))
+                swigDelegate17 = new SwigDelegateViewImpl_17(SwigDirectorRelayoutDependentOnChildren__SWIG_0);
+            if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18))
+                swigDelegate18 = new SwigDelegateViewImpl_18(SwigDirectorRelayoutDependentOnChildren__SWIG_1);
+            if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19))
+                swigDelegate19 = new SwigDelegateViewImpl_19(SwigDirectorOnCalculateRelayoutSize);
+            if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20))
+                swigDelegate20 = new SwigDelegateViewImpl_20(SwigDirectorOnLayoutNegotiated);
+            if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21))
+                swigDelegate21 = new SwigDelegateViewImpl_21(SwigDirectorOnInitialize);
+            if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22))
+                swigDelegate22 = new SwigDelegateViewImpl_22(SwigDirectorOnControlChildAdd);
+            if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23))
+                swigDelegate23 = new SwigDelegateViewImpl_23(SwigDirectorOnControlChildRemove);
+            if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24))
+                swigDelegate24 = new SwigDelegateViewImpl_24(SwigDirectorOnStyleChange);
+            if (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25))
+                swigDelegate25 = new SwigDelegateViewImpl_25(SwigDirectorOnAccessibilityActivated);
+            if (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26))
+                swigDelegate26 = new SwigDelegateViewImpl_26(SwigDirectorOnAccessibilityPan);
+            if (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27))
+                swigDelegate27 = new SwigDelegateViewImpl_27(SwigDirectorOnAccessibilityTouch);
+            if (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28))
+                swigDelegate28 = new SwigDelegateViewImpl_28(SwigDirectorOnAccessibilityValueChange);
+            if (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29))
+                swigDelegate29 = new SwigDelegateViewImpl_29(SwigDirectorOnAccessibilityZoom);
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30))
+                swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained);
+            if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31))
+                swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost);
+            if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32))
+                swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor);
+            if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33))
+                swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted);
+            if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34))
+                swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter);
+            if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35))
+                swigDelegate35 = new SwigDelegateViewImpl_35(SwigDirectorOnPinch);
+            if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36))
+                swigDelegate36 = new SwigDelegateViewImpl_36(SwigDirectorOnPan);
+            if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37))
+                swigDelegate37 = new SwigDelegateViewImpl_37(SwigDirectorOnTap);
+            if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38))
+                swigDelegate38 = new SwigDelegateViewImpl_38(SwigDirectorOnLongPress);
+            if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39))
+                swigDelegate39 = new SwigDelegateViewImpl_39(SwigDirectorSignalConnected);
+            if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40))
+                swigDelegate40 = new SwigDelegateViewImpl_40(SwigDirectorSignalDisconnected);
+            NDalicPINVOKE.ViewImpl_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6, swigDelegate7, swigDelegate8, swigDelegate9, swigDelegate10, swigDelegate11, swigDelegate12, swigDelegate13, swigDelegate14, swigDelegate15, swigDelegate16, swigDelegate17, swigDelegate18, swigDelegate19, swigDelegate20, swigDelegate21, swigDelegate22, swigDelegate23, swigDelegate24, swigDelegate25, swigDelegate26, swigDelegate27, swigDelegate28, swigDelegate29, swigDelegate30, swigDelegate31, swigDelegate32, swigDelegate33, swigDelegate34, swigDelegate35, swigDelegate36, swigDelegate37, swigDelegate38, swigDelegate39, swigDelegate40);
+        }
+
+
+#if (DOT_NET_CORE)
+        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
+        {
+            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);
+            bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ViewImpl));
+
+            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);
+            return hasDerivedMethod;
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-  public static View New() {
-    //Console.WriteLine("[ViewImple] New()");          
-
-    View ret = new View(NDalicPINVOKE.ViewImpl_New(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetStyleName(string styleName) {
-    NDalicPINVOKE.ViewImpl_SetStyleName(swigCPtr, styleName);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public string GetStyleName() {
-    string ret = NDalicPINVOKE.ViewImpl_GetStyleName(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundColor(Vector4 color) {
-    NDalicPINVOKE.ViewImpl_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Vector4 GetBackgroundColor() {
-    Vector4 ret = new Vector4(NDalicPINVOKE.ViewImpl_GetBackgroundColor(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetBackgroundImage(Image image) {
-    NDalicPINVOKE.ViewImpl_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetBackground(Property.Map map) {
-    NDalicPINVOKE.ViewImpl_SetBackground(swigCPtr, Property.Map.getCPtr(map));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void ClearBackground() {
-    NDalicPINVOKE.ViewImpl_ClearBackground(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void EnableGestureDetection(Gesture.GestureType type) {
-    NDalicPINVOKE.ViewImpl_EnableGestureDetection(swigCPtr, (int)type);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void DisableGestureDetection(Gesture.GestureType type) {
-    NDalicPINVOKE.ViewImpl_DisableGestureDetection(swigCPtr, (int)type);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public PinchGestureDetector GetPinchGestureDetector() {
-    PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.ViewImpl_GetPinchGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public PanGestureDetector GetPanGestureDetector() {
-    PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.ViewImpl_GetPanGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public TapGestureDetector GetTapGestureDetector() {
-    TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.ViewImpl_GetTapGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public LongPressGestureDetector GetLongPressGestureDetector() {
-    LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.ViewImpl_GetLongPressGestureDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyboardNavigationSupport(bool isSupported) {
-    NDalicPINVOKE.ViewImpl_SetKeyboardNavigationSupport(swigCPtr, isSupported);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsKeyboardNavigationSupported() {
-    bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardNavigationSupported(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetKeyInputFocus() {
-    NDalicPINVOKE.ViewImpl_SetKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool HasKeyInputFocus() {
-    bool ret = NDalicPINVOKE.ViewImpl_HasKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ClearKeyInputFocus() {
-    NDalicPINVOKE.ViewImpl_ClearKeyInputFocus(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetAsKeyboardFocusGroup(bool isFocusGroup) {
-    NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsKeyboardFocusGroup() {
-    bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void AccessibilityActivate() {
-    NDalicPINVOKE.ViewImpl_AccessibilityActivate(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void KeyboardEnter() {
-    NDalicPINVOKE.ViewImpl_KeyboardEnter(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public ControlKeySignal KeyEventSignal() {
-    ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.ViewImpl_KeyEventSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusGainedSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusGainedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public KeyInputFocusSignal KeyInputFocusLostSignal() {
-    KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusLostSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool EmitKeyEventSignal(Key arg0) {
-    bool ret = NDalicPINVOKE.ViewImpl_EmitKeyEventSignal(swigCPtr, Key.getCPtr(arg0));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnStageConnection(int depth) {
-    if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0)) NDalicPINVOKE.ViewImpl_OnStageConnectionSwigExplicitViewImpl(swigCPtr, depth); else NDalicPINVOKE.ViewImpl_OnStageConnection(swigCPtr, depth);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnStageDisconnection() {
-    if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1)) NDalicPINVOKE.ViewImpl_OnStageDisconnectionSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnStageDisconnection(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnChildAdd(Actor child) {
-    if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2)) NDalicPINVOKE.ViewImpl_OnChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildAdd(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnChildRemove(Actor child) {
-    if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3)) NDalicPINVOKE.ViewImpl_OnChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnChildRemove(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnPropertySet(int index, Property.Value propertyValue) {
-    if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4)) NDalicPINVOKE.ViewImpl_OnPropertySetSwigExplicitViewImpl(swigCPtr, index, Property.Value.getCPtr(propertyValue)); else NDalicPINVOKE.ViewImpl_OnPropertySet(swigCPtr, index, Property.Value.getCPtr(propertyValue));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSizeSet(Vector3 targetSize) {
-    if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5)) NDalicPINVOKE.ViewImpl_OnSizeSetSwigExplicitViewImpl(swigCPtr, Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeSet(swigCPtr, Vector3.getCPtr(targetSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSizeAnimation(Animation animation, Vector3 targetSize) {
-    if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6)) NDalicPINVOKE.ViewImpl_OnSizeAnimationSwigExplicitViewImpl(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize)); else NDalicPINVOKE.ViewImpl_OnSizeAnimation(swigCPtr, Animation.getCPtr(animation), Vector3.getCPtr(targetSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7) ? NDalicPINVOKE.ViewImpl_OnTouchEventSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnHoverEvent(Hover arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8) ? NDalicPINVOKE.ViewImpl_OnHoverEventSwigExplicitViewImpl(swigCPtr, Hover.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnHoverEvent(swigCPtr, Hover.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnKeyEvent(Key arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9) ? NDalicPINVOKE.ViewImpl_OnKeyEventSwigExplicitViewImpl(swigCPtr, Key.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnKeyEvent(swigCPtr, Key.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool OnWheelEvent(Wheel arg0) {
-    bool ret = (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10) ? NDalicPINVOKE.ViewImpl_OnWheelEventSwigExplicitViewImpl(swigCPtr, Wheel.getCPtr(arg0)) : NDalicPINVOKE.ViewImpl_OnWheelEvent(swigCPtr, Wheel.getCPtr(arg0)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnRelayout(Vector2 size, RelayoutContainer container) {
-    if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11)) NDalicPINVOKE.ViewImpl_OnRelayoutSwigExplicitViewImpl(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container)); else NDalicPINVOKE.ViewImpl_OnRelayout(swigCPtr, Vector2.getCPtr(size), RelayoutContainer.getCPtr(container));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnSetResizePolicy(ResizePolicyType policy, DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12)) NDalicPINVOKE.ViewImpl_OnSetResizePolicySwigExplicitViewImpl(swigCPtr, (int)policy, (int)dimension); else NDalicPINVOKE.ViewImpl_OnSetResizePolicy(swigCPtr, (int)policy, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new Vector3 GetNaturalSize() {
-    Vector3 ret = new Vector3((SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13) ? NDalicPINVOKE.ViewImpl_GetNaturalSizeSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_GetNaturalSize(swigCPtr)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float CalculateChildSize(Actor child, DimensionType dimension) {
-    float ret = (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14) ? NDalicPINVOKE.ViewImpl_CalculateChildSizeSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child), (int)dimension) : NDalicPINVOKE.ViewImpl_CalculateChildSize(swigCPtr, Actor.getCPtr(child), (int)dimension));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float GetHeightForWidth(float width) {
-    float ret = (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15) ? NDalicPINVOKE.ViewImpl_GetHeightForWidthSwigExplicitViewImpl(swigCPtr, width) : NDalicPINVOKE.ViewImpl_GetHeightForWidth(swigCPtr, width));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new float GetWidthForHeight(float height) {
-    float ret = (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16) ? NDalicPINVOKE.ViewImpl_GetWidthForHeightSwigExplicitViewImpl(swigCPtr, height) : NDalicPINVOKE.ViewImpl_GetWidthForHeight(swigCPtr, height));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool RelayoutDependentOnChildren(DimensionType dimension) {
-    bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_0(swigCPtr, (int)dimension) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_0(swigCPtr, (int)dimension));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new bool RelayoutDependentOnChildren() {
-    bool ret = (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18) ? NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildrenSwigExplicitViewImpl__SWIG_1(swigCPtr) : NDalicPINVOKE.ViewImpl_RelayoutDependentOnChildren__SWIG_1(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  protected virtual new void OnCalculateRelayoutSize(DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19)) NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSizeSwigExplicitViewImpl(swigCPtr, (int)dimension); else NDalicPINVOKE.ViewImpl_OnCalculateRelayoutSize(swigCPtr, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  protected virtual new void OnLayoutNegotiated(float size, DimensionType dimension) {
-    if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20)) NDalicPINVOKE.ViewImpl_OnLayoutNegotiatedSwigExplicitViewImpl(swigCPtr, size, (int)dimension); else NDalicPINVOKE.ViewImpl_OnLayoutNegotiated(swigCPtr, size, (int)dimension);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnInitialize() {
-    if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21)) NDalicPINVOKE.ViewImpl_OnInitializeSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnInitialize(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnControlChildAdd(Actor child) {
-    if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22)) NDalicPINVOKE.ViewImpl_OnControlChildAddSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildAdd(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnControlChildRemove(Actor child) {
-    if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23)) NDalicPINVOKE.ViewImpl_OnControlChildRemoveSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(child)); else NDalicPINVOKE.ViewImpl_OnControlChildRemove(swigCPtr, Actor.getCPtr(child));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnStyleChange(StyleManager styleManager, StyleChangeType change) {
-    if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24)) NDalicPINVOKE.ViewImpl_OnStyleChangeSwigExplicitViewImpl(swigCPtr, StyleManager.getCPtr(styleManager), (int)change); else NDalicPINVOKE.ViewImpl_OnStyleChange(swigCPtr, StyleManager.getCPtr(styleManager), (int)change);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual bool OnAccessibilityActivated() {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25) ? NDalicPINVOKE.ViewImpl_OnAccessibilityActivatedSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityActivated(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityPan(PanGesture gesture) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26) ? NDalicPINVOKE.ViewImpl_OnAccessibilityPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(gesture)) : NDalicPINVOKE.ViewImpl_OnAccessibilityPan(swigCPtr, PanGesture.getCPtr(gesture)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityTouch(SWIGTYPE_p_Dali__TouchEvent touchEvent) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27) ? NDalicPINVOKE.ViewImpl_OnAccessibilityTouchSwigExplicitViewImpl(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)) : NDalicPINVOKE.ViewImpl_OnAccessibilityTouch(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(touchEvent)));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityValueChange(bool isIncrease) {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28) ? NDalicPINVOKE.ViewImpl_OnAccessibilityValueChangeSwigExplicitViewImpl(swigCPtr, isIncrease) : NDalicPINVOKE.ViewImpl_OnAccessibilityValueChange(swigCPtr, isIncrease));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual bool OnAccessibilityZoom() {
-    bool ret = (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29) ? NDalicPINVOKE.ViewImpl_OnAccessibilityZoomSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnAccessibilityZoom(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnKeyInputFocusGained() {
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnKeyInputFocusLost() {
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled) {
-
-    //Console.WriteLine("[ViewImple] GetNextKeyboardFocusableActor()");                
-    Actor ret = new Actor((SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, Actor.getCPtr(currentFocusedActor), (int)direction, loopEnabled)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) {
-    if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, Actor.getCPtr(commitedFocusableActor)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, Actor.getCPtr(commitedFocusableActor));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual bool OnKeyboardEnter() {
-    bool ret = (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public virtual void OnPinch(PinchGesture pinch) {
-    if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35)) NDalicPINVOKE.ViewImpl_OnPinchSwigExplicitViewImpl(swigCPtr, PinchGesture.getCPtr(pinch)); else NDalicPINVOKE.ViewImpl_OnPinch(swigCPtr, PinchGesture.getCPtr(pinch));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnPan(PanGesture pan) {
-    if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36)) NDalicPINVOKE.ViewImpl_OnPanSwigExplicitViewImpl(swigCPtr, PanGesture.getCPtr(pan)); else NDalicPINVOKE.ViewImpl_OnPan(swigCPtr, PanGesture.getCPtr(pan));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnTap(TapGesture tap) {
-    if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37)) NDalicPINVOKE.ViewImpl_OnTapSwigExplicitViewImpl(swigCPtr, TapGesture.getCPtr(tap)); else NDalicPINVOKE.ViewImpl_OnTap(swigCPtr, TapGesture.getCPtr(tap));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void OnLongPress(LongPressGesture longPress) {
-    if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38)) NDalicPINVOKE.ViewImpl_OnLongPressSwigExplicitViewImpl(swigCPtr, LongPressGesture.getCPtr(longPress)); else NDalicPINVOKE.ViewImpl_OnLongPress(swigCPtr, LongPressGesture.getCPtr(longPress));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void SignalConnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) {
-    if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39)) NDalicPINVOKE.ViewImpl_SignalConnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalConnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) {
-    if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40)) NDalicPINVOKE.ViewImpl_SignalDisconnectedSwigExplicitViewImpl(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); else NDalicPINVOKE.ViewImpl_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  private void SwigDirectorConnect() {
-
-    //Console.WriteLine("[ViewImple] SwigDirectorConnect()");          
-
-    if (SwigDerivedClassHasMethod("OnStageConnection", swigMethodTypes0))
-      swigDelegate0 = new SwigDelegateViewImpl_0(SwigDirectorOnStageConnection);
-    if (SwigDerivedClassHasMethod("OnStageDisconnection", swigMethodTypes1))
-      swigDelegate1 = new SwigDelegateViewImpl_1(SwigDirectorOnStageDisconnection);
-    if (SwigDerivedClassHasMethod("OnChildAdd", swigMethodTypes2))
-      swigDelegate2 = new SwigDelegateViewImpl_2(SwigDirectorOnChildAdd);
-    if (SwigDerivedClassHasMethod("OnChildRemove", swigMethodTypes3))
-      swigDelegate3 = new SwigDelegateViewImpl_3(SwigDirectorOnChildRemove);
-    if (SwigDerivedClassHasMethod("OnPropertySet", swigMethodTypes4))
-      swigDelegate4 = new SwigDelegateViewImpl_4(SwigDirectorOnPropertySet);
-    if (SwigDerivedClassHasMethod("OnSizeSet", swigMethodTypes5))
-      swigDelegate5 = new SwigDelegateViewImpl_5(SwigDirectorOnSizeSet);
-    if (SwigDerivedClassHasMethod("OnSizeAnimation", swigMethodTypes6))
-      swigDelegate6 = new SwigDelegateViewImpl_6(SwigDirectorOnSizeAnimation);
-    if (SwigDerivedClassHasMethod("OnTouchEvent", swigMethodTypes7))
-      swigDelegate7 = new SwigDelegateViewImpl_7(SwigDirectorOnTouchEvent);
-    if (SwigDerivedClassHasMethod("OnHoverEvent", swigMethodTypes8))
-      swigDelegate8 = new SwigDelegateViewImpl_8(SwigDirectorOnHoverEvent);
-    if (SwigDerivedClassHasMethod("OnKeyEvent", swigMethodTypes9))
-      swigDelegate9 = new SwigDelegateViewImpl_9(SwigDirectorOnKeyEvent);
-    if (SwigDerivedClassHasMethod("OnWheelEvent", swigMethodTypes10))
-      swigDelegate10 = new SwigDelegateViewImpl_10(SwigDirectorOnWheelEvent);
-    if (SwigDerivedClassHasMethod("OnRelayout", swigMethodTypes11))
-      swigDelegate11 = new SwigDelegateViewImpl_11(SwigDirectorOnRelayout);
-    if (SwigDerivedClassHasMethod("OnSetResizePolicy", swigMethodTypes12))
-      swigDelegate12 = new SwigDelegateViewImpl_12(SwigDirectorOnSetResizePolicy);
-    if (SwigDerivedClassHasMethod("GetNaturalSize", swigMethodTypes13))
-      swigDelegate13 = new SwigDelegateViewImpl_13(SwigDirectorGetNaturalSize);
-    if (SwigDerivedClassHasMethod("CalculateChildSize", swigMethodTypes14))
-      swigDelegate14 = new SwigDelegateViewImpl_14(SwigDirectorCalculateChildSize);
-    if (SwigDerivedClassHasMethod("GetHeightForWidth", swigMethodTypes15))
-      swigDelegate15 = new SwigDelegateViewImpl_15(SwigDirectorGetHeightForWidth);
-    if (SwigDerivedClassHasMethod("GetWidthForHeight", swigMethodTypes16))
-      swigDelegate16 = new SwigDelegateViewImpl_16(SwigDirectorGetWidthForHeight);
-    if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes17))
-      swigDelegate17 = new SwigDelegateViewImpl_17(SwigDirectorRelayoutDependentOnChildren__SWIG_0);
-    if (SwigDerivedClassHasMethod("RelayoutDependentOnChildren", swigMethodTypes18))
-      swigDelegate18 = new SwigDelegateViewImpl_18(SwigDirectorRelayoutDependentOnChildren__SWIG_1);
-    if (SwigDerivedClassHasMethod("OnCalculateRelayoutSize", swigMethodTypes19))
-      swigDelegate19 = new SwigDelegateViewImpl_19(SwigDirectorOnCalculateRelayoutSize);
-    if (SwigDerivedClassHasMethod("OnLayoutNegotiated", swigMethodTypes20))
-      swigDelegate20 = new SwigDelegateViewImpl_20(SwigDirectorOnLayoutNegotiated);
-    if (SwigDerivedClassHasMethod("OnInitialize", swigMethodTypes21))
-      swigDelegate21 = new SwigDelegateViewImpl_21(SwigDirectorOnInitialize);
-    if (SwigDerivedClassHasMethod("OnControlChildAdd", swigMethodTypes22))
-      swigDelegate22 = new SwigDelegateViewImpl_22(SwigDirectorOnControlChildAdd);
-    if (SwigDerivedClassHasMethod("OnControlChildRemove", swigMethodTypes23))
-      swigDelegate23 = new SwigDelegateViewImpl_23(SwigDirectorOnControlChildRemove);
-    if (SwigDerivedClassHasMethod("OnStyleChange", swigMethodTypes24))
-      swigDelegate24 = new SwigDelegateViewImpl_24(SwigDirectorOnStyleChange);
-    if (SwigDerivedClassHasMethod("OnAccessibilityActivated", swigMethodTypes25))
-      swigDelegate25 = new SwigDelegateViewImpl_25(SwigDirectorOnAccessibilityActivated);
-    if (SwigDerivedClassHasMethod("OnAccessibilityPan", swigMethodTypes26))
-      swigDelegate26 = new SwigDelegateViewImpl_26(SwigDirectorOnAccessibilityPan);
-    if (SwigDerivedClassHasMethod("OnAccessibilityTouch", swigMethodTypes27))
-      swigDelegate27 = new SwigDelegateViewImpl_27(SwigDirectorOnAccessibilityTouch);
-    if (SwigDerivedClassHasMethod("OnAccessibilityValueChange", swigMethodTypes28))
-      swigDelegate28 = new SwigDelegateViewImpl_28(SwigDirectorOnAccessibilityValueChange);
-    if (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29))
-      swigDelegate29 = new SwigDelegateViewImpl_29(SwigDirectorOnAccessibilityZoom);
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30))
-      swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained);
-    if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31))
-      swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost);
-    if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableActor", swigMethodTypes32))
-      swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableActor);
-    if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33))
-      swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted);
-    if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34))
-      swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter);
-    if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35))
-      swigDelegate35 = new SwigDelegateViewImpl_35(SwigDirectorOnPinch);
-    if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36))
-      swigDelegate36 = new SwigDelegateViewImpl_36(SwigDirectorOnPan);
-    if (SwigDerivedClassHasMethod("OnTap", swigMethodTypes37))
-      swigDelegate37 = new SwigDelegateViewImpl_37(SwigDirectorOnTap);
-    if (SwigDerivedClassHasMethod("OnLongPress", swigMethodTypes38))
-      swigDelegate38 = new SwigDelegateViewImpl_38(SwigDirectorOnLongPress);
-    if (SwigDerivedClassHasMethod("SignalConnected", swigMethodTypes39))
-      swigDelegate39 = new SwigDelegateViewImpl_39(SwigDirectorSignalConnected);
-    if (SwigDerivedClassHasMethod("SignalDisconnected", swigMethodTypes40))
-      swigDelegate40 = new SwigDelegateViewImpl_40(SwigDirectorSignalDisconnected);
-    NDalicPINVOKE.ViewImpl_director_connect(swigCPtr, swigDelegate0, swigDelegate1, swigDelegate2, swigDelegate3, swigDelegate4, swigDelegate5, swigDelegate6, swigDelegate7, swigDelegate8, swigDelegate9, swigDelegate10, swigDelegate11, swigDelegate12, swigDelegate13, swigDelegate14, swigDelegate15, swigDelegate16, swigDelegate17, swigDelegate18, swigDelegate19, swigDelegate20, swigDelegate21, swigDelegate22, swigDelegate23, swigDelegate24, swigDelegate25, swigDelegate26, swigDelegate27, swigDelegate28, swigDelegate29, swigDelegate30, swigDelegate31, swigDelegate32, swigDelegate33, swigDelegate34, swigDelegate35, swigDelegate36, swigDelegate37, swigDelegate38, swigDelegate39, swigDelegate40);
-  }\r
-\r
-\r
-#if true
-        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)\r
-        {\r
-            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes);\r
-            bool hasDerivedMethod = methodInfo.GetType().GetTypeInfo().IsSubclassOf(typeof(ViewImpl));\r
-\r
-            Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod);\r
-            return hasDerivedMethod;\r
-        }\r
 #else
-//original
-  private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) {
-    global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
-    bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ViewImpl));
-
-    //Console.WriteLine("[ViewImple] hasDerivedMethod=" + hasDerivedMethod);           
-    return hasDerivedMethod;
-  }
+        private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes)
+        {
+            global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, global::System.Reflection.BindingFlags.Public | global::System.Reflection.BindingFlags.NonPublic | global::System.Reflection.BindingFlags.Instance, null, methodTypes, null);
+            bool hasDerivedMethod = methodInfo.DeclaringType.IsSubclassOf(typeof(ViewImpl));
+            return hasDerivedMethod;
+        }
 #endif
-\r
-\r
-        private void SwigDirectorOnStageConnection(int depth) {
-    OnStageConnection(depth);
-  }
 
-  private void SwigDirectorOnStageDisconnection() {
-    OnStageDisconnection();
-  }
+        private void SwigDirectorOnStageConnection(int depth)
+        {
+            OnStageConnection(depth);
+        }
 
-  private void SwigDirectorOnChildAdd(global::System.IntPtr child) {
-    OnChildAdd(new Actor(child, false));
-  }
+        private void SwigDirectorOnStageDisconnection()
+        {
+            OnStageDisconnection();
+        }
 
-  private void SwigDirectorOnChildRemove(global::System.IntPtr child) {
-    OnChildRemove(new Actor(child, false));
-  }
+        private void SwigDirectorOnChildAdd(global::System.IntPtr child)
+        {
+            OnChildAdd(new Actor(child, false));
+        }
 
-  private void SwigDirectorOnPropertySet(int index, global::System.IntPtr propertyValue) {
-    OnPropertySet(index, new Property.Value(propertyValue, true));
-  }
+        private void SwigDirectorOnChildRemove(global::System.IntPtr child)
+        {
+            OnChildRemove(new Actor(child, false));
+        }
 
-  private void SwigDirectorOnSizeSet(global::System.IntPtr targetSize) {
-    OnSizeSet(new Vector3(targetSize, false));
-  }
+        private void SwigDirectorOnPropertySet(int index, global::System.IntPtr propertyValue)
+        {
+            OnPropertySet(index, new PropertyValue(propertyValue, true));
+        }
 
-  private void SwigDirectorOnSizeAnimation(global::System.IntPtr animation, global::System.IntPtr targetSize) {
-    OnSizeAnimation(new Animation(animation, false), new Vector3(targetSize, false));
-  }
+        private void SwigDirectorOnSizeSet(global::System.IntPtr targetSize)
+        {
+            OnSizeSet(new Vector3(targetSize, false));
+        }
 
-  private bool SwigDirectorOnTouchEvent(global::System.IntPtr arg0) {
-    return OnTouchEvent(new SWIGTYPE_p_Dali__TouchEvent(arg0, false));
-  }
+        private void SwigDirectorOnSizeAnimation(global::System.IntPtr animation, global::System.IntPtr targetSize)
+        {
+            OnSizeAnimation(new Animation(animation, false), new Vector3(targetSize, false));
+        }
 
-  private bool SwigDirectorOnHoverEvent(global::System.IntPtr arg0) {
-    return OnHoverEvent(new Hover(arg0, false));
-  }
+        private bool SwigDirectorOnTouchEvent(global::System.IntPtr arg0)
+        {
+            return OnTouchEvent(new SWIGTYPE_p_Dali__TouchEvent(arg0, false));
+        }
 
-  private bool SwigDirectorOnKeyEvent(global::System.IntPtr arg0) {
-    return OnKeyEvent(new Key(arg0, false));
-  }
+        private bool SwigDirectorOnHoverEvent(global::System.IntPtr arg0)
+        {
+            return OnHoverEvent(new Hover(arg0, false));
+        }
 
-  private bool SwigDirectorOnWheelEvent(global::System.IntPtr arg0) {
-    return OnWheelEvent(new Wheel(arg0, false));
-  }
+        private bool SwigDirectorOnKeyEvent(global::System.IntPtr arg0)
+        {
+            return OnKeyEvent(new Key(arg0, false));
+        }
 
-  private void SwigDirectorOnRelayout(global::System.IntPtr size, global::System.IntPtr container) {
-    OnRelayout(new Vector2(size, false), new RelayoutContainer(container, false));
-  }
+        private bool SwigDirectorOnWheelEvent(global::System.IntPtr arg0)
+        {
+            return OnWheelEvent(new Wheel(arg0, false));
+        }
 
-  private void SwigDirectorOnSetResizePolicy(int policy, int dimension) {
-    OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);
-  }
+        private void SwigDirectorOnRelayout(global::System.IntPtr size, global::System.IntPtr container)
+        {
+            OnRelayout(new Vector2(size, false), new RelayoutContainer(container, false));
+        }
 
-  private global::System.IntPtr SwigDirectorGetNaturalSize() {
-    return Vector3.getCPtr(GetNaturalSize()).Handle;
-  }
+        private void SwigDirectorOnSetResizePolicy(int policy, int dimension)
+        {
+            OnSetResizePolicy((ResizePolicyType)policy, (DimensionType)dimension);
+        }
 
-  private float SwigDirectorCalculateChildSize(global::System.IntPtr child, int dimension) {
-    return CalculateChildSize(new Actor(child, false), (DimensionType)dimension);
-  }
+        private global::System.IntPtr SwigDirectorGetNaturalSize()
+        {
+            return Vector3.getCPtr(GetNaturalSize()).Handle;
+        }
 
-  private float SwigDirectorGetHeightForWidth(float width) {
-    return GetHeightForWidth(width);
-  }
+        private float SwigDirectorCalculateChildSize(global::System.IntPtr child, int dimension)
+        {
+            return CalculateChildSize(new Actor(child, false), (DimensionType)dimension);
+        }
 
-  private float SwigDirectorGetWidthForHeight(float height) {
-    return GetWidthForHeight(height);
-  }
-
-  private bool SwigDirectorRelayoutDependentOnChildren__SWIG_0(int dimension) {
-    return RelayoutDependentOnChildren((DimensionType)dimension);
-  }
-
-  private bool SwigDirectorRelayoutDependentOnChildren__SWIG_1() {
-    return RelayoutDependentOnChildren();
-  }
-
-  private void SwigDirectorOnCalculateRelayoutSize(int dimension) {
-    OnCalculateRelayoutSize((DimensionType)dimension);
-  }
-
-  private void SwigDirectorOnLayoutNegotiated(float size, int dimension) {
-    OnLayoutNegotiated(size, (DimensionType)dimension);
-  }
-
-  private void SwigDirectorOnInitialize() {
-    OnInitialize();
-  }
-
-  private void SwigDirectorOnControlChildAdd(global::System.IntPtr child) {
-    OnControlChildAdd(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnControlChildRemove(global::System.IntPtr child) {
-    OnControlChildRemove(new Actor(child, false));
-  }
-
-  private void SwigDirectorOnStyleChange(global::System.IntPtr styleManager, int change) {
-    OnStyleChange(new StyleManager(styleManager, true), (StyleChangeType)change);
-  }
-
-  private bool SwigDirectorOnAccessibilityActivated() {
-    return OnAccessibilityActivated();
-  }
-
-  private bool SwigDirectorOnAccessibilityPan(global::System.IntPtr gesture) {
-    return OnAccessibilityPan(new PanGesture(gesture, true));
-  }
-
-  private bool SwigDirectorOnAccessibilityTouch(global::System.IntPtr touchEvent) {
-    return OnAccessibilityTouch(new SWIGTYPE_p_Dali__TouchEvent(touchEvent, false));
-  }
-
-  private bool SwigDirectorOnAccessibilityValueChange(bool isIncrease) {
-    return OnAccessibilityValueChange(isIncrease);
-  }
-
-  private bool SwigDirectorOnAccessibilityZoom() {
-    return OnAccessibilityZoom();
-  }
-
-  private void SwigDirectorOnKeyInputFocusGained() {
-    OnKeyInputFocusGained();
-  }
-
-  private void SwigDirectorOnKeyInputFocusLost() {
-    OnKeyInputFocusLost();
-  }
-
-  private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) {
-    return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, true), (View.KeyboardFocus.Direction)direction, loopEnabled)).Handle;
-  }
-
-  private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) {
-    OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, true));
-  }
-
-  private bool SwigDirectorOnKeyboardEnter() {
-    return OnKeyboardEnter();
-  }
-
-  private void SwigDirectorOnPinch(global::System.IntPtr pinch) {
-    OnPinch(new PinchGesture(pinch, false));
-  }
-
-  private void SwigDirectorOnPan(global::System.IntPtr pan) {
-    OnPan(new PanGesture(pan, false));
-  }
-
-  private void SwigDirectorOnTap(global::System.IntPtr tap) {
-    OnTap(new TapGesture(tap, false));
-  }
-
-  private void SwigDirectorOnLongPress(global::System.IntPtr longPress) {
-    OnLongPress(new LongPressGesture(longPress, false));
-  }
-
-  private void SwigDirectorSignalConnected(global::System.IntPtr slotObserver, global::System.IntPtr callback) {
-    SignalConnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-  }
-
-  private void SwigDirectorSignalDisconnected(global::System.IntPtr slotObserver, global::System.IntPtr callback) {
-    SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-  }
-
-  public delegate void SwigDelegateViewImpl_0(int depth);
-  public delegate void SwigDelegateViewImpl_1();
-  public delegate void SwigDelegateViewImpl_2(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_3(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_4(int index, global::System.IntPtr propertyValue);
-  public delegate void SwigDelegateViewImpl_5(global::System.IntPtr targetSize);
-  public delegate void SwigDelegateViewImpl_6(global::System.IntPtr animation, global::System.IntPtr targetSize);
-  public delegate bool SwigDelegateViewImpl_7(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_8(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_9(global::System.IntPtr arg0);
-  public delegate bool SwigDelegateViewImpl_10(global::System.IntPtr arg0);
-  public delegate void SwigDelegateViewImpl_11(global::System.IntPtr size, global::System.IntPtr container);
-  public delegate void SwigDelegateViewImpl_12(int policy, int dimension);
-  public delegate global::System.IntPtr SwigDelegateViewImpl_13();
-  public delegate float SwigDelegateViewImpl_14(global::System.IntPtr child, int dimension);
-  public delegate float SwigDelegateViewImpl_15(float width);
-  public delegate float SwigDelegateViewImpl_16(float height);
-  public delegate bool SwigDelegateViewImpl_17(int dimension);
-  public delegate bool SwigDelegateViewImpl_18();
-  public delegate void SwigDelegateViewImpl_19(int dimension);
-  public delegate void SwigDelegateViewImpl_20(float size, int dimension);
-  public delegate void SwigDelegateViewImpl_21();
-  public delegate void SwigDelegateViewImpl_22(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_23(global::System.IntPtr child);
-  public delegate void SwigDelegateViewImpl_24(global::System.IntPtr styleManager, int change);
-  public delegate bool SwigDelegateViewImpl_25();
-  public delegate bool SwigDelegateViewImpl_26(global::System.IntPtr gesture);
-  public delegate bool SwigDelegateViewImpl_27(global::System.IntPtr touchEvent);
-  public delegate bool SwigDelegateViewImpl_28(bool isIncrease);
-  public delegate bool SwigDelegateViewImpl_29();
-  public delegate void SwigDelegateViewImpl_30();
-  public delegate void SwigDelegateViewImpl_31();
-  public delegate global::System.IntPtr SwigDelegateViewImpl_32(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled);
-  public delegate void SwigDelegateViewImpl_33(global::System.IntPtr commitedFocusableActor);
-  public delegate bool SwigDelegateViewImpl_34();
-  public delegate void SwigDelegateViewImpl_35(global::System.IntPtr pinch);
-  public delegate void SwigDelegateViewImpl_36(global::System.IntPtr pan);
-  public delegate void SwigDelegateViewImpl_37(global::System.IntPtr tap);
-  public delegate void SwigDelegateViewImpl_38(global::System.IntPtr longPress);
-  public delegate void SwigDelegateViewImpl_39(global::System.IntPtr slotObserver, global::System.IntPtr callback);
-  public delegate void SwigDelegateViewImpl_40(global::System.IntPtr slotObserver, global::System.IntPtr callback);
-
-  private SwigDelegateViewImpl_0 swigDelegate0;
-  private SwigDelegateViewImpl_1 swigDelegate1;
-  private SwigDelegateViewImpl_2 swigDelegate2;
-  private SwigDelegateViewImpl_3 swigDelegate3;
-  private SwigDelegateViewImpl_4 swigDelegate4;
-  private SwigDelegateViewImpl_5 swigDelegate5;
-  private SwigDelegateViewImpl_6 swigDelegate6;
-  private SwigDelegateViewImpl_7 swigDelegate7;
-  private SwigDelegateViewImpl_8 swigDelegate8;
-  private SwigDelegateViewImpl_9 swigDelegate9;
-  private SwigDelegateViewImpl_10 swigDelegate10;
-  private SwigDelegateViewImpl_11 swigDelegate11;
-  private SwigDelegateViewImpl_12 swigDelegate12;
-  private SwigDelegateViewImpl_13 swigDelegate13;
-  private SwigDelegateViewImpl_14 swigDelegate14;
-  private SwigDelegateViewImpl_15 swigDelegate15;
-  private SwigDelegateViewImpl_16 swigDelegate16;
-  private SwigDelegateViewImpl_17 swigDelegate17;
-  private SwigDelegateViewImpl_18 swigDelegate18;
-  private SwigDelegateViewImpl_19 swigDelegate19;
-  private SwigDelegateViewImpl_20 swigDelegate20;
-  private SwigDelegateViewImpl_21 swigDelegate21;
-  private SwigDelegateViewImpl_22 swigDelegate22;
-  private SwigDelegateViewImpl_23 swigDelegate23;
-  private SwigDelegateViewImpl_24 swigDelegate24;
-  private SwigDelegateViewImpl_25 swigDelegate25;
-  private SwigDelegateViewImpl_26 swigDelegate26;
-  private SwigDelegateViewImpl_27 swigDelegate27;
-  private SwigDelegateViewImpl_28 swigDelegate28;
-  private SwigDelegateViewImpl_29 swigDelegate29;
-  private SwigDelegateViewImpl_30 swigDelegate30;
-  private SwigDelegateViewImpl_31 swigDelegate31;
-  private SwigDelegateViewImpl_32 swigDelegate32;
-  private SwigDelegateViewImpl_33 swigDelegate33;
-  private SwigDelegateViewImpl_34 swigDelegate34;
-  private SwigDelegateViewImpl_35 swigDelegate35;
-  private SwigDelegateViewImpl_36 swigDelegate36;
-  private SwigDelegateViewImpl_37 swigDelegate37;
-  private SwigDelegateViewImpl_38 swigDelegate38;
-  private SwigDelegateViewImpl_39 swigDelegate39;
-  private SwigDelegateViewImpl_40 swigDelegate40;
-
-  private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(int) };
-  private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes4 = new global::System.Type[] { typeof(int), typeof(Property.Value) };
-  private static global::System.Type[] swigMethodTypes5 = new global::System.Type[] { typeof(Vector3) };
-  private static global::System.Type[] swigMethodTypes6 = new global::System.Type[] { typeof(Animation), typeof(Vector3) };
-  private static global::System.Type[] swigMethodTypes7 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
-  private static global::System.Type[] swigMethodTypes8 = new global::System.Type[] { typeof(Hover) };
-  private static global::System.Type[] swigMethodTypes9 = new global::System.Type[] { typeof(Key) };
-  private static global::System.Type[] swigMethodTypes10 = new global::System.Type[] { typeof(Wheel) };
-  private static global::System.Type[] swigMethodTypes11 = new global::System.Type[] { typeof(Vector2), typeof(RelayoutContainer) };
-  private static global::System.Type[] swigMethodTypes12 = new global::System.Type[] { typeof(ResizePolicyType), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes13 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(Actor), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes15 = new global::System.Type[] { typeof(float) };
-  private static global::System.Type[] swigMethodTypes16 = new global::System.Type[] { typeof(float) };
-  private static global::System.Type[] swigMethodTypes17 = new global::System.Type[] { typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes18 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes19 = new global::System.Type[] { typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes20 = new global::System.Type[] { typeof(float), typeof(DimensionType) };
-  private static global::System.Type[] swigMethodTypes21 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes24 = new global::System.Type[] { typeof(StyleManager), typeof(StyleChangeType) };
-  private static global::System.Type[] swigMethodTypes25 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes26 = new global::System.Type[] { typeof(PanGesture) };
-  private static global::System.Type[] swigMethodTypes27 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
-  private static global::System.Type[] swigMethodTypes28 = new global::System.Type[] { typeof(bool) };
-  private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(Actor), typeof(View.KeyboardFocus.Direction), typeof(bool) };
-  private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(Actor) };
-  private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] {  };
-  private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) };
-  private static global::System.Type[] swigMethodTypes36 = new global::System.Type[] { typeof(PanGesture) };
-  private static global::System.Type[] swigMethodTypes37 = new global::System.Type[] { typeof(TapGesture) };
-  private static global::System.Type[] swigMethodTypes38 = new global::System.Type[] { typeof(LongPressGesture) };
-  private static global::System.Type[] swigMethodTypes39 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
-  private static global::System.Type[] swigMethodTypes40 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
-}
+        private float SwigDirectorGetHeightForWidth(float width)
+        {
+            return GetHeightForWidth(width);
+        }
+
+        private float SwigDirectorGetWidthForHeight(float height)
+        {
+            return GetWidthForHeight(height);
+        }
+
+        private bool SwigDirectorRelayoutDependentOnChildren__SWIG_0(int dimension)
+        {
+            return RelayoutDependentOnChildren((DimensionType)dimension);
+        }
+
+        private bool SwigDirectorRelayoutDependentOnChildren__SWIG_1()
+        {
+            return RelayoutDependentOnChildren();
+        }
+
+        private void SwigDirectorOnCalculateRelayoutSize(int dimension)
+        {
+            OnCalculateRelayoutSize((DimensionType)dimension);
+        }
+
+        private void SwigDirectorOnLayoutNegotiated(float size, int dimension)
+        {
+            OnLayoutNegotiated(size, (DimensionType)dimension);
+        }
+
+        private void SwigDirectorOnInitialize()
+        {
+            OnInitialize();
+        }
+
+        private void SwigDirectorOnControlChildAdd(global::System.IntPtr child)
+        {
+            OnControlChildAdd(new Actor(child, false));
+        }
+
+        private void SwigDirectorOnControlChildRemove(global::System.IntPtr child)
+        {
+            OnControlChildRemove(new Actor(child, false));
+        }
+
+        private void SwigDirectorOnStyleChange(global::System.IntPtr styleManager, int change)
+        {
+            OnStyleChange(new StyleManager(styleManager, true), (StyleChangeType)change);
+        }
+
+        private bool SwigDirectorOnAccessibilityActivated()
+        {
+            return OnAccessibilityActivated();
+        }
+
+        private bool SwigDirectorOnAccessibilityPan(global::System.IntPtr gesture)
+        {
+            return OnAccessibilityPan(new PanGesture(gesture, true));
+        }
+
+        private bool SwigDirectorOnAccessibilityTouch(global::System.IntPtr touchEvent)
+        {
+            return OnAccessibilityTouch(new SWIGTYPE_p_Dali__TouchEvent(touchEvent, false));
+        }
+
+        private bool SwigDirectorOnAccessibilityValueChange(bool isIncrease)
+        {
+            return OnAccessibilityValueChange(isIncrease);
+        }
+
+        private bool SwigDirectorOnAccessibilityZoom()
+        {
+            return OnAccessibilityZoom();
+        }
+
+        private void SwigDirectorOnKeyInputFocusGained()
+        {
+            OnKeyInputFocusGained();
+        }
+
+        private void SwigDirectorOnKeyInputFocusLost()
+        {
+            OnKeyInputFocusLost();
+        }
+
+        private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)
+        {
+            return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, true), (View.FocusDirection)direction, loopEnabled)).Handle;
+        }
+
+        private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor)
+        {
+            OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, true));
+        }
+
+        private bool SwigDirectorOnKeyboardEnter()
+        {
+            return OnKeyboardEnter();
+        }
+
+        private void SwigDirectorOnPinch(global::System.IntPtr pinch)
+        {
+            OnPinch(new PinchGesture(pinch, false));
+        }
+
+        private void SwigDirectorOnPan(global::System.IntPtr pan)
+        {
+            OnPan(new PanGesture(pan, false));
+        }
+
+        private void SwigDirectorOnTap(global::System.IntPtr tap)
+        {
+            OnTap(new TapGesture(tap, false));
+        }
+
+        private void SwigDirectorOnLongPress(global::System.IntPtr longPress)
+        {
+            OnLongPress(new LongPressGesture(longPress, false));
+        }
+
+        private void SwigDirectorSignalConnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)
+        {
+            SignalConnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
+        }
+
+        private void SwigDirectorSignalDisconnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)
+        {
+            SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
+        }
+
+        public delegate void SwigDelegateViewImpl_0(int depth);
+        public delegate void SwigDelegateViewImpl_1();
+        public delegate void SwigDelegateViewImpl_2(global::System.IntPtr child);
+        public delegate void SwigDelegateViewImpl_3(global::System.IntPtr child);
+        public delegate void SwigDelegateViewImpl_4(int index, global::System.IntPtr propertyValue);
+        public delegate void SwigDelegateViewImpl_5(global::System.IntPtr targetSize);
+        public delegate void SwigDelegateViewImpl_6(global::System.IntPtr animation, global::System.IntPtr targetSize);
+        public delegate bool SwigDelegateViewImpl_7(global::System.IntPtr arg0);
+        public delegate bool SwigDelegateViewImpl_8(global::System.IntPtr arg0);
+        public delegate bool SwigDelegateViewImpl_9(global::System.IntPtr arg0);
+        public delegate bool SwigDelegateViewImpl_10(global::System.IntPtr arg0);
+        public delegate void SwigDelegateViewImpl_11(global::System.IntPtr size, global::System.IntPtr container);
+        public delegate void SwigDelegateViewImpl_12(int policy, int dimension);
+        public delegate global::System.IntPtr SwigDelegateViewImpl_13();
+        public delegate float SwigDelegateViewImpl_14(global::System.IntPtr child, int dimension);
+        public delegate float SwigDelegateViewImpl_15(float width);
+        public delegate float SwigDelegateViewImpl_16(float height);
+        public delegate bool SwigDelegateViewImpl_17(int dimension);
+        public delegate bool SwigDelegateViewImpl_18();
+        public delegate void SwigDelegateViewImpl_19(int dimension);
+        public delegate void SwigDelegateViewImpl_20(float size, int dimension);
+        public delegate void SwigDelegateViewImpl_21();
+        public delegate void SwigDelegateViewImpl_22(global::System.IntPtr child);
+        public delegate void SwigDelegateViewImpl_23(global::System.IntPtr child);
+        public delegate void SwigDelegateViewImpl_24(global::System.IntPtr styleManager, int change);
+        public delegate bool SwigDelegateViewImpl_25();
+        public delegate bool SwigDelegateViewImpl_26(global::System.IntPtr gesture);
+        public delegate bool SwigDelegateViewImpl_27(global::System.IntPtr touchEvent);
+        public delegate bool SwigDelegateViewImpl_28(bool isIncrease);
+        public delegate bool SwigDelegateViewImpl_29();
+        public delegate void SwigDelegateViewImpl_30();
+        public delegate void SwigDelegateViewImpl_31();
+        public delegate global::System.IntPtr SwigDelegateViewImpl_32(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled);
+        public delegate void SwigDelegateViewImpl_33(global::System.IntPtr commitedFocusableActor);
+        public delegate bool SwigDelegateViewImpl_34();
+        public delegate void SwigDelegateViewImpl_35(global::System.IntPtr pinch);
+        public delegate void SwigDelegateViewImpl_36(global::System.IntPtr pan);
+        public delegate void SwigDelegateViewImpl_37(global::System.IntPtr tap);
+        public delegate void SwigDelegateViewImpl_38(global::System.IntPtr longPress);
+        public delegate void SwigDelegateViewImpl_39(global::System.IntPtr slotObserver, global::System.IntPtr callback);
+        public delegate void SwigDelegateViewImpl_40(global::System.IntPtr slotObserver, global::System.IntPtr callback);
+
+        private SwigDelegateViewImpl_0 swigDelegate0;
+        private SwigDelegateViewImpl_1 swigDelegate1;
+        private SwigDelegateViewImpl_2 swigDelegate2;
+        private SwigDelegateViewImpl_3 swigDelegate3;
+        private SwigDelegateViewImpl_4 swigDelegate4;
+        private SwigDelegateViewImpl_5 swigDelegate5;
+        private SwigDelegateViewImpl_6 swigDelegate6;
+        private SwigDelegateViewImpl_7 swigDelegate7;
+        private SwigDelegateViewImpl_8 swigDelegate8;
+        private SwigDelegateViewImpl_9 swigDelegate9;
+        private SwigDelegateViewImpl_10 swigDelegate10;
+        private SwigDelegateViewImpl_11 swigDelegate11;
+        private SwigDelegateViewImpl_12 swigDelegate12;
+        private SwigDelegateViewImpl_13 swigDelegate13;
+        private SwigDelegateViewImpl_14 swigDelegate14;
+        private SwigDelegateViewImpl_15 swigDelegate15;
+        private SwigDelegateViewImpl_16 swigDelegate16;
+        private SwigDelegateViewImpl_17 swigDelegate17;
+        private SwigDelegateViewImpl_18 swigDelegate18;
+        private SwigDelegateViewImpl_19 swigDelegate19;
+        private SwigDelegateViewImpl_20 swigDelegate20;
+        private SwigDelegateViewImpl_21 swigDelegate21;
+        private SwigDelegateViewImpl_22 swigDelegate22;
+        private SwigDelegateViewImpl_23 swigDelegate23;
+        private SwigDelegateViewImpl_24 swigDelegate24;
+        private SwigDelegateViewImpl_25 swigDelegate25;
+        private SwigDelegateViewImpl_26 swigDelegate26;
+        private SwigDelegateViewImpl_27 swigDelegate27;
+        private SwigDelegateViewImpl_28 swigDelegate28;
+        private SwigDelegateViewImpl_29 swigDelegate29;
+        private SwigDelegateViewImpl_30 swigDelegate30;
+        private SwigDelegateViewImpl_31 swigDelegate31;
+        private SwigDelegateViewImpl_32 swigDelegate32;
+        private SwigDelegateViewImpl_33 swigDelegate33;
+        private SwigDelegateViewImpl_34 swigDelegate34;
+        private SwigDelegateViewImpl_35 swigDelegate35;
+        private SwigDelegateViewImpl_36 swigDelegate36;
+        private SwigDelegateViewImpl_37 swigDelegate37;
+        private SwigDelegateViewImpl_38 swigDelegate38;
+        private SwigDelegateViewImpl_39 swigDelegate39;
+        private SwigDelegateViewImpl_40 swigDelegate40;
+
+        private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(int) };
+        private static global::System.Type[] swigMethodTypes1 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes2 = new global::System.Type[] { typeof(Actor) };
+        private static global::System.Type[] swigMethodTypes3 = new global::System.Type[] { typeof(Actor) };
+        private static global::System.Type[] swigMethodTypes4 = new global::System.Type[] { typeof(int), typeof(PropertyValue) };
+        private static global::System.Type[] swigMethodTypes5 = new global::System.Type[] { typeof(Vector3) };
+        private static global::System.Type[] swigMethodTypes6 = new global::System.Type[] { typeof(Animation), typeof(Vector3) };
+        private static global::System.Type[] swigMethodTypes7 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
+        private static global::System.Type[] swigMethodTypes8 = new global::System.Type[] { typeof(Hover) };
+        private static global::System.Type[] swigMethodTypes9 = new global::System.Type[] { typeof(Key) };
+        private static global::System.Type[] swigMethodTypes10 = new global::System.Type[] { typeof(Wheel) };
+        private static global::System.Type[] swigMethodTypes11 = new global::System.Type[] { typeof(Vector2), typeof(RelayoutContainer) };
+        private static global::System.Type[] swigMethodTypes12 = new global::System.Type[] { typeof(ResizePolicyType), typeof(DimensionType) };
+        private static global::System.Type[] swigMethodTypes13 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes14 = new global::System.Type[] { typeof(Actor), typeof(DimensionType) };
+        private static global::System.Type[] swigMethodTypes15 = new global::System.Type[] { typeof(float) };
+        private static global::System.Type[] swigMethodTypes16 = new global::System.Type[] { typeof(float) };
+        private static global::System.Type[] swigMethodTypes17 = new global::System.Type[] { typeof(DimensionType) };
+        private static global::System.Type[] swigMethodTypes18 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes19 = new global::System.Type[] { typeof(DimensionType) };
+        private static global::System.Type[] swigMethodTypes20 = new global::System.Type[] { typeof(float), typeof(DimensionType) };
+        private static global::System.Type[] swigMethodTypes21 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes22 = new global::System.Type[] { typeof(Actor) };
+        private static global::System.Type[] swigMethodTypes23 = new global::System.Type[] { typeof(Actor) };
+        private static global::System.Type[] swigMethodTypes24 = new global::System.Type[] { typeof(StyleManager), typeof(StyleChangeType) };
+        private static global::System.Type[] swigMethodTypes25 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes26 = new global::System.Type[] { typeof(PanGesture) };
+        private static global::System.Type[] swigMethodTypes27 = new global::System.Type[] { typeof(SWIGTYPE_p_Dali__TouchEvent) };
+        private static global::System.Type[] swigMethodTypes28 = new global::System.Type[] { typeof(bool) };
+        private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(Actor), typeof(View.FocusDirection), typeof(bool) };
+        private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(Actor) };
+        private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] { };
+        private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) };
+        private static global::System.Type[] swigMethodTypes36 = new global::System.Type[] { typeof(PanGesture) };
+        private static global::System.Type[] swigMethodTypes37 = new global::System.Type[] { typeof(TapGesture) };
+        private static global::System.Type[] swigMethodTypes38 = new global::System.Type[] { typeof(LongPressGesture) };
+        private static global::System.Type[] swigMethodTypes39 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
+        private static global::System.Type[] swigMethodTypes40 = new global::System.Type[] { typeof(SlotObserver), typeof(SWIGTYPE_p_Dali__CallbackBase) };
+    }
 
 }
index 68a6b94..efe0d34 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public enum ViewMode {
+    internal enum ViewMode {
   MONO,
   STEREO_HORIZONTAL,
   STEREO_VERTICAL,
index 6803b4f..e808f34 100755 (executable)
-using System;
+#define DOT_NET_CORE
+
+using System;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
-
-#if true
+#if (DOT_NET_CORE)
 using System.Reflection;
 #endif
 
 namespace Tizen.NUI
 {
-  /// <summary>
-  /// Add this attribute to any property belonging to a View (control) you want to be scriptable from JSON
-  /// </summary>
-  /// <remarks>
-  /// Example:
-  ///
-  /// class MyView : public CustomView
-  /// {
-  ///  [ScriptableProperty()]
-  ///  public int MyProperty
-  ///  {
-  ///   get
-  ///   {
-  ///     return _myProperty;
-  ///   }
-  ///   set
-  ///   {
-  ///    _myProperty = value;
-  ///   }
-  ///  }
-  /// }
-  ///
-  /// Internally the following occurs for property registration ( this only occurs once per Type, not per Instance):
-  ///
-  /// - The controls static constructor should call ViewRegistry.Register()  (only called once for the lifecycle of the app)
-  /// - Within Register() the code will introspect the Controls properties, looking for the ScriptableProperty() attribute
-  /// - For every property with the ScriptableProperty() attribute, TypeRegistration.RegisterProperty is called.
-  /// - TypeRegistration.RegisterProperty calls in to DALi C++ Code Dali::CSharpTypeRegistry::RegisterProperty()
-  /// - DALi C++ now knows the existance of the property and will try calling SetProperty, if it finds the property in a JSON file (loaded using builder).
-  ///
-  ///  The DALi C# example
-  ///
-  ///  class MyView : public CustomView
-  ///  {
-  ///
-  ///    [ScriptableProperty()]
-  ///    public double Hours
-  ///    {
-  ///     get { return seconds / 3600; }
-  ///     set { seconds = value * 3600; }
-  ///    }
-  ///  }
-  ///
-  ///  Equivalent code in DALi C++:
-  ///  in MyControl.h
-  ///  class MyControl : public Control
-  ///  {
-  ///      struct Property
-  ///      {
-  ///         enum
-  ///        {
-  ///              HOURS =  Control::CONTROL_PROPERTY_END_INDEX + 1
-  ///        }
-  ///     }
-  ///
-  ///
-  /// in MyControl-impl.cpp
-  ///
-  /// DALI_TYPE_REGISTRATION_BEGIN( Toolkit::MyControl, Toolkit::Control, Create );
-  /// DALI_PROPERTY_REGISTRATION( Toolkit, MyControl, "Hours",  INTEGER, DISABLED                     )
-  /// DALI_TYPE_REGISTRATION_END()
-  /// </remarks>
-  ///
-  ///
-  public class ScriptableProperty : System.Attribute
-  {
-    public enum ScriptableType
+    /// <summary>
+    /// Add this attribute to any property belonging to a View (control) you want to be scriptable from JSON
+    /// </summary>
+    /// <remarks>
+    /// Example:
+    ///
+    /// class MyView : public CustomView
+    /// {
+    ///  [ScriptableProperty()]
+    ///  public int MyProperty
+    ///  {
+    ///   get
+    ///   {
+    ///     return _myProperty;
+    ///   }
+    ///   set
+    ///   {
+    ///    _myProperty = value;
+    ///   }
+    ///  }
+    /// }
+    ///
+    /// Internally the following occurs for property registration ( this only occurs once per Type, not per Instance):
+    ///
+    /// - The controls static constructor should call ViewRegistry.Register()  (only called once for the lifecycle of the app)
+    /// - Within Register() the code will introspect the Controls properties, looking for the ScriptableProperty() attribute
+    /// - For every property with the ScriptableProperty() attribute, TypeRegistration.RegisterProperty is called.
+    /// - TypeRegistration.RegisterProperty calls in to DALi C++ Code Dali::CSharpTypeRegistry::RegisterProperty()
+    /// - DALi C++ now knows the existance of the property and will try calling SetProperty, if it finds the property in a JSON file (loaded using builder).
+    ///
+    ///  The DALi C# example
+    ///
+    ///  class MyView : public CustomView
+    ///  {
+    ///
+    ///    [ScriptableProperty()]
+    ///    public double Hours
+    ///    {
+    ///     get { return seconds / 3600; }
+    ///     set { seconds = value * 3600; }
+    ///    }
+    ///  }
+    ///
+    ///  Equivalent code in DALi C++:
+    ///  in MyControl.h
+    ///  class MyControl : public Control
+    ///  {
+    ///    struct Property
+    ///    {
+    ///      enum
+    ///      {
+    ///        HOURS =  Control::CONTROL_PROPERTY_END_INDEX + 1
+    ///      }
+    ///    }
+    ///  }
+    ///
+    /// in MyControl-impl.cpp
+    ///
+    /// DALI_TYPE_REGISTRATION_BEGIN( Toolkit::MyControl, Toolkit::Control, Create );
+    /// DALI_PROPERTY_REGISTRATION( Toolkit, MyControl, "Hours",  INTEGER, DISABLED                     )
+    /// DALI_TYPE_REGISTRATION_END()
+    /// </remarks>
+    ///
+    ///
+    public class ScriptableProperty : System.Attribute
     {
-      Default,    // Read Writable, non-animatable property, event thread only
-    //  Animatable // Animatable property, Currently disabled, UK
-    }
-    public readonly ScriptableType type;
+        public enum ScriptableType
+        {
+            Default,    // Read Writable, non-animatable property, event thread only
+                        //  Animatable // Animatable property, Currently disabled, UK
+        }
+        public readonly ScriptableType type;
 
-    public ScriptableProperty(ScriptableType type = ScriptableType.Default )
-    {
-      this.type = type;
+        public ScriptableProperty(ScriptableType type = ScriptableType.Default)
+        {
+            this.type = type;
+        }
     }
-  }
-
-  /// <summary>
-  /// View Registry singleton.
-  /// Used for registering controls and any scriptable properties they have ( see ScriptableProperty )
-  ///
-  /// Internal Design from C# to C++
-  ///
-  /// - Each custom C# view should have it's static constructor called before any JSON file is loaded.
-  /// Static constructors for a class will only run once ( they are run per control type, not per instance).
-  /// Example of running a static constructor:
-  ///      System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (typeof(Spin).TypeHandle);
-  /// Inside the static constructor the control should register it's type with the ViewRegistry
-  /// e.g.
-  ///
-  ///  static Spin()
-  ///  {
-  ///     ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
-  ///  }
-  ///
-  ///  The control should also provide a CreateInstance function, which gets passed to the ViewRegistry
-  ///  // Eventually it will be called if DALi Builderfinds a Spin control in a JSON file
-  ///  static CustomView CreateInstance()
-  ///  {
-  ///    return new Spin();
-  ///  }
-  ///
-  ///
-  ///
-  /// The DALi C++ equivalent of this is
-  ///
-  ///  TypeRegistration mType( typeid(Toolkit::Spin), typeid(Toolkit::Control), CreateInstance );
-  ///
-  ///
-  ///
-  /// </summary>
-  public sealed class ViewRegistry
-  {
+
     /// <summary>
-    /// ViewRegistry is a singleton
+    /// View Registry singleton.
+    /// Used for registering controls and any scriptable properties they have ( see ScriptableProperty )
+    ///
+    /// Internal Design from C# to C++
+    ///
+    /// - Each custom C# view should have it's static constructor called before any JSON file is loaded.
+    /// Static constructors for a class will only run once ( they are run per control type, not per instance).
+    /// Example of running a static constructor:
+    ///      System.Runtime.CompilerServices.RuntimeHelpers.RunClassConstructor (typeof(Spin).TypeHandle);
+    /// Inside the static constructor the control should register it's type with the ViewRegistry
+    /// e.g.
+    ///
+    ///  static Spin()
+    ///  {
+    ///     ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
+    ///  }
+    ///
+    ///  The control should also provide a CreateInstance function, which gets passed to the ViewRegistry
+    ///  // Eventually it will be called if DALi Builderfinds a Spin control in a JSON file
+    ///  static CustomView CreateInstance()
+    ///  {
+    ///    return new Spin();
+    ///  }
+    ///
+    ///
+    ///
+    /// The DALi C++ equivalent of this is
+    ///
+    ///  TypeRegistration mType( typeid(Toolkit::Spin), typeid(Toolkit::Control), CreateInstance );
+    ///
+    ///
+    ///
     /// </summary>
-    private static ViewRegistry instance = null;
+    public sealed class ViewRegistry
+    {
+        /// <summary>
+        /// ViewRegistry is a singleton
+        /// </summary>
+        private static ViewRegistry instance = null;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        delegate IntPtr CreateControlDelegate(IntPtr cPtrControlName);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        delegate IntPtr GetPropertyDelegate(IntPtr controlPtr, IntPtr propertyName);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        delegate void SetPropertyDelegate(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue);
+
+        private CreateControlDelegate _createCallback;
+        private SetPropertyDelegate _setPropertyCallback;
+        private GetPropertyDelegate _getPropertyCallback;
+        private PropertyRangeManager _propertyRangeManager;
+
+        /// <summary>
+        /// Given a C++ control the dictionary allows us to find which C# control (View) it belongs to.
+        /// By keeping the weak reference only, it will allow the object to be garbage collected.
+        /// </summary>
+        private Dictionary<IntPtr, WeakReference> _controlMap;
+
+        ///<summary>
+        // Maps the name of a custom view to a create instance function
+        /// E.g. given a string "Spin", we can get a function used to create the Spin View.
+        ///</summary>
+        private Dictionary<String, Func<CustomView>> _constructorMap;
+
+        /// <summary>
+        /// Lookup table to match C# types to DALi types, used for the automatic property registration
+        /// </summary>
+        private static readonly Dictionary<string, Tizen.NUI.PropertyType> _daliPropertyTypeLookup
+        = new Dictionary<string, Tizen.NUI.PropertyType>
+        {
+      { "float",   PropertyType.Float },
+      { "int",     PropertyType.Integer },
+      { "Int32",   PropertyType.Integer },
+      { "Boolean", PropertyType.Boolean },
+      { "string",  PropertyType.String },
+      { "Vector2", PropertyType.Vector2 },
+      { "Vector3", PropertyType.Vector3 },
+      { "Vector4", PropertyType.Vector4 },
+      { "Size",    PropertyType.Vector2 },
+      { "Position",PropertyType.Vector3 },
+      { "Color",   PropertyType.Vector4 },
+            //  { "Matrix3", PropertyType.MATRIX3 }, commented out until we need to use Matrices from JSON
+            //  { "Matrix",  PropertyType.MATRIX },
+        };
+
+
+        public ViewRegistry()
+        {
+            _createCallback = new CreateControlDelegate(CreateControl);
+            _getPropertyCallback = new GetPropertyDelegate(GetProperty);
+            _setPropertyCallback = new SetPropertyDelegate(SetProperty);
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate IntPtr CreateControlDelegate( IntPtr cPtrControlName );
+            _controlMap = new Dictionary<IntPtr, WeakReference>();
+            _constructorMap = new Dictionary<string, Func<CustomView>>();
+            _propertyRangeManager = new PropertyRangeManager();
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate IntPtr GetPropertyDelegate( IntPtr controlPtr, IntPtr propertyName );
+        }
 
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    delegate void SetPropertyDelegate( IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue );
+        private Tizen.NUI.PropertyType GetDaliPropertyType(string cSharpTypeName)
+        {
+            Tizen.NUI.PropertyType daliType;
+            if (_daliPropertyTypeLookup.TryGetValue(cSharpTypeName, out daliType))
+            {
+                //Console.WriteLine("mapped "+ cSharpTypeName + " to dAli type " +daliType );
+                return daliType;
+            }
+            else
+            {
+                // Console.WriteLine("Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type");
+                return PropertyType.None;
+            }
+        }
 
-    private CreateControlDelegate _createCallback;
-    private SetPropertyDelegate _setPropertyCallback;
-    private GetPropertyDelegate _getPropertyCallback;
-    private PropertyRangeManager _propertyRangeManager;
+        /// <summary>
+        /// Called directly from DALi C++ type registry to create a control (View) using no marshalling.
+        /// </summary>
+        /// <returns>Pointer to the Control (Views) handle </returns>
+        /// <param name="cPtrControlName"> C pointer to the Control (View) name</param>
+        private static IntPtr CreateControl(IntPtr cPtrControlName)
+        {
+            string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(cPtrControlName);
+            // Console.WriteLine ("Create controlled called from C++ create a " + controlName);
 
-    /// <summary>
-    /// Given a C++ custom control the dictionary allows us to find what CustomView it belongs to
-    /// </summary>
-    private Dictionary<IntPtr, Tizen.NUI.CustomView> _controlMap;
+            Func<CustomView> controlConstructor;
 
-    ///<summary>
-    // Maps the name of a custom view to a create instance function
-    /// E.g. given a string "Spin", we can get a function used to create the Spin View.
-    ///</summary>
-    private Dictionary<String, Func< CustomView > > _constructorMap;
+            // find the control constructor
+            if (Instance._constructorMap.TryGetValue(controlName, out controlConstructor))
+            {
+                // Create the control
+                CustomView newControl = controlConstructor();
+                return newControl.GetPtrfromActor();  // return pointer to handle
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("C# View not registererd with ViewRegistry" + controlName);
+                return IntPtr.Zero;
+            }
+        }
 
-    /// <summary>
-    /// Lookup table to match C# types to DALi types, used for the automatic property registration
-    /// </summary>
-    private static readonly Dictionary<string, Tizen.NUI.Property.Type> _daliPropertyTypeLookup
-    = new Dictionary< string, Tizen.NUI.Property.Type  >
-    {
-      { "float",   Property.Type.FLOAT },
-      { "int",     Property.Type.INTEGER },
-      { "Int32",   Property.Type.INTEGER },
-      { "Boolean", Property.Type.BOOLEAN },
-      { "string",  Property.Type.STRING },
-      { "Vector2", Property.Type.VECTOR2 },
-      { "Vector3", Property.Type.VECTOR3 },
-      { "Vector4", Property.Type.VECTOR4 },
-      { "Size",    Property.Type.VECTOR2 },
-      { "Position",Property.Type.VECTOR3 },
-      { "Color",   Property.Type.VECTOR4 },
-    //  { "Matrix3", Property.Type.MATRIX3 }, commented out until we need to use Matrices from JSON
-    //  { "Matrix",  Property.Type.MATRIX },
-    };
-
-
-    public ViewRegistry()
-    {
-      _createCallback = new CreateControlDelegate( CreateControl );
-      _getPropertyCallback = new GetPropertyDelegate (GetProperty);
-      _setPropertyCallback  = new SetPropertyDelegate (SetProperty);
+        /// <summary>
+        /// Store the mapping between this instance of control (View) and native part.
+        /// </summary>
+        /// <param name="view"> The instance of control (View)</param>
+        public static void RegisterView(View view)
+        {
+            // We store a pointer to the RefObject for the control
+            RefObject refObj = view.GetObjectPtr();
+            IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj);
 
-      _controlMap = new Dictionary<IntPtr, CustomView>();
-      _constructorMap = new Dictionary<string, Func<CustomView>>();
-      _propertyRangeManager = new PropertyRangeManager();
+            //Console.WriteLine ("________Storing ref object cptr in control map Hex: {0:X}", refCptr);
+            if (!Instance._controlMap.ContainsKey(refCptr))
+            {
+                Instance._controlMap.Add(refCptr, new WeakReference(view, false));
+            }
 
-    }
+            return;
+        }
 
-    private Tizen.NUI.Property.Type GetDaliPropertyType( string cSharpTypeName )
-    {
-      Tizen.NUI.Property.Type daliType;
-      if ( _daliPropertyTypeLookup.TryGetValue (cSharpTypeName, out daliType) )
-      {
-        //Console.WriteLine("[ViewRegistry]mapped "+ cSharpTypeName + " to dAli type " +daliType );
-        return daliType;
-      }
-      else
-      {
-        //Console.WriteLine("[ViewRegistry]Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type");
-        return Property.Type.NONE;
-      }
-    }
+        /// <summary>
+        /// Remove the this instance of control (View) and native part from the mapping table.
+        /// </summary>
+        /// <param name="view"> The instance of control (View)</param>
+        public static void UnregisterView(View view)
+        {
+            RefObject refObj = view.GetObjectPtr();
+            IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj);
 
-    /// <summary>
-    /// Called directly from DALi C++ type registry to create a control (View)  uses no marshalling.
-    /// </summary>
-    /// <returns>Pointer to the Control (Views) handle </returns>
-    /// <param name="cPtrControlName"> C pointer to the Control (View) name</param>
-    private static IntPtr CreateControl( IntPtr cPtrControlName )
-    {
-      string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi (cPtrControlName);
-       //Console.WriteLine ("[ViewRegistry]Create controlled called from C++ create a " + controlName);
-
-      Func< CustomView > controlConstructor;
-
-      // find the control constructor
-      if ( Instance._constructorMap.TryGetValue (controlName, out controlConstructor) )
-      {
-        // Create the control
-        CustomView newControl = controlConstructor ();
-
-        // Store the mapping between this instance of the custom control and native part
-        // We store a pointer to the RefObject for the control
-        IntPtr cPtr = newControl.GetPtrfromActor();
-        RefObject refObj = newControl.GetObjectPtr ();
-        IntPtr refCptr = (IntPtr) RefObject.getCPtr(refObj);
-
-        //Console.WriteLine ("[ViewRegistry]________Storing ref object cptr in control map Hex: {0:X}", refCptr);
-        Instance._controlMap.Add (refCptr , newControl );
-
-        return cPtr;  // return pointer to handle
-      }
-      else
-      {
-        throw new global::System.InvalidOperationException("C# View not registererd with ViewRegistry"+ controlName );
-        return IntPtr.Zero;
-      }
-    }
+            if (Instance._controlMap.ContainsKey(refCptr))
+            {
+                Instance._controlMap.Remove(refCptr);
+            }
 
-    private static IntPtr GetProperty( IntPtr controlPtr, IntPtr propertyName )
-    {
-      string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi (propertyName);
-      return Instance.GetPropertyValue ( controlPtr, name);
-    }
+            return;
+        }
 
-    private static void SetProperty(  IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue )
-    {
-      string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi (propertyName);
-      //Console.WriteLine ( "[ViewRegistry]SetControlProperty  called for:" + name );
-      Instance.SetPropertyValue ( controlPtr, name, propertyValue);
+        private static IntPtr GetProperty(IntPtr controlPtr, IntPtr propertyName)
+        {
+            string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName);
+            return Instance.GetPropertyValue(controlPtr, name);
+        }
 
-    }
+        private static void SetProperty(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue)
+        {
+            string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName);
+            //Console.WriteLine ( SetControlProperty  called for:" + name );
+            Instance.SetPropertyValue(controlPtr, name, propertyValue);
 
-    public static ViewRegistry Instance
-    {
-      get
-      {
-        if (instance==null)
+        }
+
+        public static ViewRegistry Instance
         {
-          instance = new ViewRegistry();
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new ViewRegistry();
+                }
+                return instance;
+            }
         }
-        return instance;
-      }
-    }
 
-    public static CustomView GetCustomViewFromActor( Actor actor )
-    {
-      // we store a dictionary of ref-obects (C++ land) to custom views (C# land)
-      Tizen.NUI.CustomView view;
+        public static View GetViewFromActor(Actor actor)
+        {
+            // we store a dictionary of ref-obects (C++ land) to custom views (C# land)
 
-      RefObject refObj = actor.GetObjectPtr ();
-      IntPtr refObjectPtr = (IntPtr) RefObject.getCPtr(refObj);
+            RefObject refObj = actor.GetObjectPtr();
+            IntPtr refObjectPtr = (IntPtr)RefObject.getCPtr(refObj);
 
-      if ( Instance._controlMap.TryGetValue ( refObjectPtr, out view) )
-      {
+            WeakReference viewReference;
+            if (Instance._controlMap.TryGetValue(refObjectPtr, out viewReference))
+            {
+                View view = viewReference.Target as View;
+                return view;
+            }
+            else
+            {
+                return null;
+            }
+        }
 
-        // call the get property function
 
-        return view;
-      }
-      else
-      {
-        return null;
-      }
-    }
+        /// <summary>
+        /// Function which registers a view and all it's scriptable properties with DALi's type registry.
+        /// Means the View can be created / configured from a JSON script.
+        ///
+        /// The function uses introspection to scan a Views C# properties, then selects the ones with
+        ///[ScriptableProperty] attribute to be registered.
+        /// Example of a Spin view registering itself
+        ///   static Spin()
+        /// {
+        ///   ViewRegistry registers control type with DALi type registery
+        ///   also uses introspection to find any properties that need to be registered with type registry
+        ///   ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
+        /// }
+        ///
+        /// </summary>
+        public void Register(Func<CustomView> createFunction, System.Type viewType)
+        {
+            // add the mapping between the view name and it's create function
+            _constructorMap.Add(viewType.Name, createFunction);
 
+            // Call into DALi C++ to register the control with the type registry
+            TypeRegistration.RegisterControl(viewType.Name, _createCallback);
 
-    /// <summary>
-    /// Function which registers a view and all it's scriptable properties with DALi's type registry.
-    /// Means the View can be created / configured from a JSON script.
-    ///
-    /// The function uses introspection to scan a Views C# properties, then selects the ones with
-    ///[ScriptableProperty] attribute to be registered.
-    /// Example of a Spin view registering itself
-    ///   static Spin()
-    /// {
-    ///   ViewRegistry registers control type with DALi type registery
-    ///   also uses introspection to find any properties that need to be registered with type registry
-    ///   ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
-    /// }
-    ///
-    /// </summary>
-    public void Register(Func< CustomView > createFunction, System.Type viewType )
-    {
-      // add the mapping between the view name and it's create function
-      _constructorMap.Add (viewType.Name, createFunction);
-
-      // Call into DALi C++ to register the control with the type registry
-      TypeRegistration.RegisterControl( viewType.Name, _createCallback );
-
-      // Cycle through each property in the class
-      foreach (System.Reflection.PropertyInfo propertyInfo in viewType.GetProperties())
-      {
-
-        if ( propertyInfo.CanRead )
-        {\r
-\r
-#if true\r
-                    IEnumerable<Attribute> ie_attrs = propertyInfo.GetCustomAttributes<Attribute>();\r
-                    List<Attribute> li_attrs = new List<Attribute>(ie_attrs);\r
-                    System.Attribute[] attrs = li_attrs.ToArray();\r
-#else\r
-                    //original\r
-                    System.Attribute[] attrs = System.Attribute.GetCustomAttributes(propertyInfo);\r
-#endif\r
-\r
-                    foreach (System.Attribute attr in attrs)
-          {
-            // If the Scriptable attribute exists, then register it with the type registry.
-            if (attr is ScriptableProperty)
+            // Cycle through each property in the class
+            foreach (System.Reflection.PropertyInfo propertyInfo in viewType.GetProperties())
             {
-              //Console.WriteLine ("[ViewRegistry]Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name);
 
-              // first get the attribute type, ( default, or animatable)
-              ScriptableProperty scriptableProp = attr as ScriptableProperty;
+                if (propertyInfo.CanRead)
+                {
 
-              // we get the start property index, based on the type and it's heirachy, e.g. DateView (70,000)-> Spin (60,000) -> View (50,000)
-              int propertyIndex =  _propertyRangeManager.GetPropertyIndex( viewType.Name, viewType, scriptableProp.type );
-
-              // get the enum for the property type... E.g. registering a string property returns Tizen.NUI.PropertyType.String
-              Tizen.NUI.Property.Type propertyType = GetDaliPropertyType( propertyInfo.PropertyType.Name );
+#if (DOT_NET_CORE)
+                    IEnumerable<Attribute> ie_attrs = propertyInfo.GetCustomAttributes<Attribute>();
+                    List<Attribute> li_attrs = new List<Attribute>(ie_attrs);
+                    System.Attribute[] attrs = li_attrs.ToArray();
+#else
+                    System.Attribute[] attrs = System.Attribute.GetCustomAttributes(propertyInfo);
+#endif
 
-              // Example   RegisterProperty("spin","maxValue", 50001, FLOAT, set, get );
-              // Native call to register the property
-              TypeRegistration.RegisterProperty (viewType.Name, propertyInfo.Name , propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
+                    foreach (System.Attribute attr in attrs)
+                    {
+                        // If the Scriptable attribute exists, then register it with the type registry.
+                        if (attr is ScriptableProperty)
+                        {
+                            //Console.WriteLine ("Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name);
+
+                            // first get the attribute type, ( default, or animatable)
+                            ScriptableProperty scriptableProp = attr as ScriptableProperty;
+
+                            // we get the start property index, based on the type and it's heirachy, e.g. DateView (70,000)-> Spin (60,000) -> View (50,000)
+                            int propertyIndex = _propertyRangeManager.GetPropertyIndex(viewType.Name, viewType, scriptableProp.type);
+
+                            // get the enum for the property type... E.g. registering a string property returns Tizen.NUI.PropertyType.String
+                            Tizen.NUI.PropertyType propertyType = GetDaliPropertyType(propertyInfo.PropertyType.Name);
+
+                            // Example   RegisterProperty("spin","maxValue", 50001, FLOAT, set, get );
+                            // Native call to register the property
+                            TypeRegistration.RegisterProperty(viewType.Name, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback);
+                        }
+                    }
+                    // Console.WriteLine ("property name = " + propertyInfo.Name);
+                }
             }
-          }
-           //Console.WriteLine ("[ViewRegistry]property name = " + propertyInfo.Name);
         }
-      }
-    }
 
-    /// <summary>
-    /// Get a property value from a View
-    ///
-    /// </summary>
-    private IntPtr GetPropertyValue ( IntPtr controlPtr, string propertyName)
-    {
-      // Get the C# control that maps to the C++ control
-      Tizen.NUI.CustomView view;
-
-      BaseHandle baseHandle = new BaseHandle (controlPtr, false);
-
-      RefObject refObj = baseHandle.GetObjectPtr ();
-
-      IntPtr refObjectPtr = (IntPtr) RefObject.getCPtr(refObj);
-
-      if ( _controlMap.TryGetValue ( refObjectPtr, out view) )
-      {
+        /// <summary>
+        /// Get a property value from a View
+        ///
+        /// </summary>
+        private IntPtr GetPropertyValue(IntPtr controlPtr, string propertyName)
+        {
+            // Get the C# control that maps to the C++ control
+            BaseHandle baseHandle = new BaseHandle(controlPtr, false);
 
-        // call the get property function
-        System.Object val = view.GetType ().GetProperty (propertyName).GetAccessors () [0].Invoke (view, null);
+            RefObject refObj = baseHandle.GetObjectPtr();
 
-        Property.Value value = Property.Value.CreateFromObject (val);
+            IntPtr refObjectPtr = (IntPtr)RefObject.getCPtr(refObj);
 
-        return (IntPtr)Property.Value.getCPtr (value);
-      }
-      else
-      {
-        return IntPtr.Zero;
-      }
-    }
+            WeakReference viewReference;
+            if (_controlMap.TryGetValue(refObjectPtr, out viewReference))
+            {
+                View view = viewReference.Target as View;
 
-    /// <summary>
-    /// Set a property value on a View
-    ///
-    /// </summary>
-    private void SetPropertyValue ( IntPtr controlPtr, string propertyName, IntPtr propertyValuePtr)
-    {
-      // Get the C# control that maps to the C++ control
-      Tizen.NUI.CustomView view;
+                // call the get property function
+                System.Object val = view.GetType().GetProperty(propertyName).GetAccessors()[0].Invoke(view, null);
 
-      //Console.WriteLine ("[ViewRegistry]SetPropertyValue   refObjectPtr = {0:X}", controlPtr);
+                PropertyValue value = PropertyValue.CreateFromObject(val);
 
-      Property.Value propValue = new Property.Value (propertyValuePtr, false);
+                return (IntPtr)PropertyValue.getCPtr(value);
+            }
+            else
+            {
+                return IntPtr.Zero;
+            }
+        }
 
-      if ( _controlMap.TryGetValue ( controlPtr, out view) )
-      {
+        /// <summary>
+        /// Set a property value on a View
+        ///
+        /// </summary>
+        private void SetPropertyValue(IntPtr controlPtr, string propertyName, IntPtr propertyValuePtr)
+        {
+            // Get the C# control that maps to the C++ control
 
-        System.Reflection.PropertyInfo propertyInfo = view.GetType().GetProperty(propertyName);
+            //Console.WriteLine ("SetPropertyValue   refObjectPtr = {0:X}", controlPtr);
 
-        // We know the property name, we know it's type, we just need to convert from a DALi property value to native C# type
-        System.Type type = propertyInfo.PropertyType;
-        bool ok = false;
+            PropertyValue propValue = new PropertyValue(propertyValuePtr, false);
 
-        if ( type.Equals (typeof(Int32)) )
-        {
-          int value = 0;
-          ok = propValue.Get( ref value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(bool)) )
-        {
-          bool value = false;
-          ok = propValue.Get( ref value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(float)) )
-        {
-          float value = 0;
-          ok = propValue.Get( ref value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(string)) )
-        {
-          string value = "";
-          ok = propValue.Get( out value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(Vector2)) )
-        {
-          Vector2 value = new Vector2 ();
-          ok = propValue.Get( value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(Vector3)) )
-        {
-          Vector3 value = new Vector3 ();
-          ok = propValue.Get( value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(Vector4)) )
-        {
-          Vector4 value = new Vector4 ();
-          ok = propValue.Get( value );
+            WeakReference viewReference;
+            if (_controlMap.TryGetValue(controlPtr, out viewReference))
+            {
+                View view = viewReference.Target as View;
+                System.Reflection.PropertyInfo propertyInfo = view.GetType().GetProperty(propertyName);
+
+                // We know the property name, we know it's type, we just need to convert from a DALi property value to native C# type
+                System.Type type = propertyInfo.PropertyType;
+                bool ok = false;
+
+                if (type.Equals(typeof(Int32)))
+                {
+                    int value = 0;
+                    ok = propValue.Get(ref value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(bool)))
+                {
+                    bool value = false;
+                    ok = propValue.Get(ref value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(float)))
+                {
+                    float value = 0;
+                    ok = propValue.Get(ref value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(string)))
+                {
+                    string value = "";
+                    ok = propValue.Get(out value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(Vector2)))
+                {
+                    Vector2 value = new Vector2();
+                    ok = propValue.Get(value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(Vector3)))
+                {
+                    Vector3 value = new Vector3();
+                    ok = propValue.Get(value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(Vector4)))
+                {
+                    Vector4 value = new Vector4();
+                    ok = propValue.Get(value);
+
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(Position)))
+                {
+                    Position value = new Position();
+                    ok = propValue.Get(value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, value);
+                    }
+                }
+                else if (type.Equals(typeof(Size)))
+                {
+                    Size value = new Size();
+                    ok = propValue.Get(value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, new Size(value.Width, value.Height, value.Depth));
+                    };
+                }
+                else if (type.Equals(typeof(Color)))
+                {
+                    // Colors are stored as Vector4's in DALi
+                    Color value = new Color();
+                    ok = propValue.Get(value);
+                    if (ok)
+                    {
+                        propertyInfo.SetValue(view, (Color)value);
+                    };
+                }
+                else
+                {
+                    throw new global::System.InvalidOperationException("SetPropertyValue Unimplemented type for Property Value");
+                }
+                if (!ok)
+                {
+                    throw new global::System.InvalidOperationException("SetPropertyValue propValue.Get failed");
+                }
+            }
+            else
+            {
+                throw new global::System.InvalidOperationException("failed to find the control to write a property to: cptr = " + controlPtr);
+            }
 
-          if ( ok )
-          {
-           propertyInfo.SetValue (view, value);
-          }
-        }
-        else if ( type.Equals (typeof(Position)) )
-        {
-          Position value = new Position ();
-          ok = propValue.Get( value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, value);
-          }
         }
-        else if ( type.Equals (typeof(Size)) )
-        {
-          // DALi sizes are Vector3
-          Vector3 value = new Vector3();
-          ok = propValue.Get( value );
-          if ( ok )
-          {
-            propertyInfo.SetValue(view, new Size(value.X,value.Y));
-          };
-        }
-        else if ( type.Equals (typeof(Color)) )
-        {
-          // Colors are stored as Vector4's in DALi
-          Vector4 value = new Vector4();
-          ok = propValue.Get( value );
-          if ( ok )
-          {
-            propertyInfo.SetValue (view, (Color)value);
-          };
-        }
-        else
-        {
-          throw new global::System.InvalidOperationException("SetPropertyValue Unimplemented type for Property Value");
-        }
-        if ( !ok )
-        {
-          throw new global::System.InvalidOperationException("SetPropertyValue propValue.Get failed");
-        }
-      }
-      else
-      {
-        throw new global::System.InvalidOperationException("failed to find the control to write a property to: cptr = " + controlPtr);
-      }
 
     }
 
-  }
-
 
 }
\ No newline at end of file
index 95054f6..6df88e5 100755 (executable)
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 // include all custom views here which will be
 namespace Tizen.NUI
index 75c04e8..5342294 100755 (executable)
@@ -24,7 +24,7 @@ namespace Tizen.NUI
         public delegate void OnStageDisconnectionDelegate();
         public delegate void OnChildAddDelegate(Actor actor);
         public delegate void OnChildRemoveDelegate(Actor actor);
-        public delegate void OnPropertySetDelegate(int index, Property.Value propertyValue);
+        public delegate void OnPropertySetDelegate(int index, PropertyValue propertyValue);
         public delegate void OnSizeSetDelegate(Vector3 targetSize);
         public delegate void OnSizeAnimationDelegate(Animation animation, Vector3 targetSize);
         public delegate bool OnTouchDelegate(Touch touch);
@@ -33,7 +33,7 @@ namespace Tizen.NUI
         public delegate bool OnWheelDelegate(Wheel wheel);
         public delegate void OnRelayoutDelegate(Vector2 size, RelayoutContainer container);
         public delegate void OnSetResizePolicyDelegate(ResizePolicyType policy, DimensionType dimension);
-        public delegate Vector3 GetNaturalSizeDelegate();
+        public delegate Size GetNaturalSizeDelegate();
         public delegate float CalculateChildSizeDelegate(Actor child, DimensionType dimension);
         public delegate float GetHeightForWidthDelegate(float width);
         public delegate float GetWidthForHeightDelegate(float height);
@@ -51,15 +51,13 @@ namespace Tizen.NUI
         public delegate bool OnAccessibilityZoomDelegate();
         public delegate void OnKeyInputFocusGainedDelegate();
         public delegate void OnKeyInputFocusLostDelegate();
-        public delegate Actor GetNextKeyboardFocusableActorDelegate(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled);
-        public delegate void OnKeyboardFocusChangeCommittedDelegate(Actor commitedFocusableActor);
+        public delegate View GetNextKeyboardFocusableViewDelegate(View currentFocusedView, View.FocusDirection direction, bool loopEnabled);
+        public delegate void OnKeyboardFocusChangeCommittedDelegate(View commitedFocusableView);
         public delegate bool OnKeyboardEnterDelegate();
         public delegate void OnPinchDelegate(PinchGesture pinch);
         public delegate void OnPanDelegate(PanGesture pan);
         public delegate void OnTapDelegate(TapGesture tap);
         public delegate void OnLongPressDelegate(LongPressGesture longPress);
-        public delegate void SignalConnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
-        public delegate void SignalDisconnectedDelegate(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback);
 
         public OnStageConnectionDelegate OnStageConnection;
         public OnStageDisconnectionDelegate OnStageDisconnection;
@@ -92,15 +90,13 @@ namespace Tizen.NUI
         public OnAccessibilityZoomDelegate OnAccessibilityZoom;
         public OnKeyInputFocusGainedDelegate OnKeyInputFocusGained;
         public OnKeyInputFocusLostDelegate OnKeyInputFocusLost;
-        public GetNextKeyboardFocusableActorDelegate GetNextKeyboardFocusableActor;
+        public GetNextKeyboardFocusableViewDelegate GetNextKeyboardFocusableView;
         public OnKeyboardFocusChangeCommittedDelegate OnKeyboardFocusChangeCommitted;
         public OnKeyboardEnterDelegate OnKeyboardEnter;
         public OnPinchDelegate OnPinch;
         public OnPanDelegate OnPan;
         public OnTapDelegate OnTap;
         public OnLongPressDelegate OnLongPress;
-        public SignalConnectedDelegate SignalConnected;
-        public SignalDisconnectedDelegate SignalDisconnected;
 
         internal ViewWrapperImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapperImpl_SWIGUpcast(cPtr), cMemoryOwn)
         {
@@ -135,7 +131,7 @@ namespace Tizen.NUI
             }
         }
 
-        public ViewWrapperImpl(ViewWrapperImpl.CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true)
+        public ViewWrapperImpl(CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             DirectorConnect();
@@ -312,7 +308,10 @@ namespace Tizen.NUI
 
         private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue)
         {
-            OnPropertySet(index, new Property.Value(propertyValue, true));
+            if ( OnPropertySet != null )
+            {
+                OnPropertySet(index, new PropertyValue(propertyValue, true));
+            }
         }
 
         private void DirectorOnSizeSet(global::System.IntPtr targetSize)
@@ -357,7 +356,7 @@ namespace Tizen.NUI
 
         private global::System.IntPtr DirectorGetNaturalSize()
         {
-            return Vector3.getCPtr(GetNaturalSize()).Handle;
+            return Size.getCPtr(GetNaturalSize()).Handle;
         }
 
         private float DirectorCalculateChildSize(global::System.IntPtr child, int dimension)
@@ -411,7 +410,10 @@ namespace Tizen.NUI
 
         private void DirectorOnStyleChange(global::System.IntPtr styleManager, int change)
         {
-            OnStyleChange(new StyleManager(styleManager, false), (StyleChangeType)change);
+            if (OnStyleChange != null)
+            {
+                OnStyleChange(new StyleManager(styleManager, false), (StyleChangeType)change);
+            }
         }
 
         private bool DirectorOnAccessibilityActivated()
@@ -451,12 +453,12 @@ namespace Tizen.NUI
 
         private global::System.IntPtr DirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled)
         {
-            return Actor.getCPtr(GetNextKeyboardFocusableActor(new Actor(currentFocusedActor, false), (View.KeyboardFocus.Direction)direction, loopEnabled)).Handle;
+            return Actor.getCPtr(GetNextKeyboardFocusableView(new View(currentFocusedActor, false), (View.FocusDirection)direction, loopEnabled)).Handle;
         }
 
-        private void DirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor)
+        private void DirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableView)
         {
-            OnKeyboardFocusChangeCommitted(new Actor(commitedFocusableActor, false));
+            OnKeyboardFocusChangeCommitted(new View(commitedFocusableView, false));
         }
 
         private bool DirectorOnKeyboardEnter()
@@ -484,16 +486,6 @@ namespace Tizen.NUI
             OnLongPress(new LongPressGesture(longPress, false));
         }
 
-        private void DirectorSignalConnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)
-        {
-            SignalConnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-        }
-
-        private void DirectorSignalDisconnected(global::System.IntPtr slotObserver, global::System.IntPtr callback)
-        {
-            SignalDisconnected((slotObserver == global::System.IntPtr.Zero) ? null : new SlotObserver(slotObserver, false), (callback == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_Dali__CallbackBase(callback, false));
-        }
-
         public delegate void DelegateViewWrapperImpl_0(int depth);
         public delegate void DelegateViewWrapperImpl_1();
         public delegate void DelegateViewWrapperImpl_2(global::System.IntPtr child);
@@ -578,15 +570,6 @@ namespace Tizen.NUI
         private DelegateViewWrapperImpl_39 Delegate39;
         private DelegateViewWrapperImpl_40 Delegate40;
 
-        public enum CustomViewBehaviour
-        {
-            VIEW_BEHAVIOUR_DEFAULT = 0,
-            DISABLE_SIZE_NEGOTIATION = 1 << 0,
-            REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << 5,
-            DISABLE_STYLE_CHANGE_SIGNALS = 1 << 6,
-            LAST_VIEW_BEHAVIOUR_FLAG
-        }
-
         public static readonly int VIEW_BEHAVIOUR_FLAG_COUNT = NDalicManualPINVOKE.ViewWrapperImpl_CONTROL_BEHAVIOUR_FLAG_COUNT_get();
     }
 }
index 8bd7679..91bb66e 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
-
-public class VisualBase : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-
-  internal VisualBase(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualBase_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
-
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualBase obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
-
-  ~VisualBase() {
-    Dispose();
-  }
-
-  public override void Dispose() {
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_VisualBase(swigCPtr);
-        }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-  public VisualBase() : this(NDalicPINVOKE.new_VisualBase__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VisualBase(VisualBase handle) : this(NDalicPINVOKE.new_VisualBase__SWIG_1(VisualBase.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VisualBase Assign(VisualBase handle) {
-    VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetName(string name) {
-    NDalicPINVOKE.VisualBase_SetName(swigCPtr, name);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public string GetName() {
-    string ret = NDalicPINVOKE.VisualBase_GetName(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void SetTransformAndSize(Property.Map transform, Vector2 controlSize) {
-    NDalicPINVOKE.VisualBase_SetTransformAndSize(swigCPtr, Property.Map.getCPtr(transform), Vector2.getCPtr(controlSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetHeightForWidth(float width) {
-    float ret = NDalicPINVOKE.VisualBase_GetHeightForWidth(swigCPtr, width);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public float GetWidthForHeight(float height) {
-    float ret = NDalicPINVOKE.VisualBase_GetWidthForHeight(swigCPtr, height);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void GetNaturalSize(Vector2 naturalSize) {
-    NDalicPINVOKE.VisualBase_GetNaturalSize(swigCPtr, Vector2.getCPtr(naturalSize));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetDepthIndex(float index) {
-    NDalicPINVOKE.VisualBase_SetDepthIndex(swigCPtr, index);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public float GetDepthIndex() {
-    float ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void CreatePropertyMap(Property.Map map) {
-    NDalicPINVOKE.VisualBase_CreatePropertyMap(swigCPtr, Property.Map.getCPtr(map));
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// Sets whether the actor should be focusable by keyboard navigation.
+    /// Visuals reuse geometry, shader etc. across controls. They ensure that the renderer and texture sets exist only when control is on-stage.
+    /// Each visual also responds to actor size and color change, and provides clipping at the renderer level.
+    /// Note: The visual responds to the the Actor::COLOR by blending it with the 'Multiply' operator.
+    /// </summary>
+    public class VisualBase : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal VisualBase(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualBase_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-}
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualBase obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
+
+        ~VisualBase()
+        {
+            Dispose();
+        }
+
+        public override void Dispose()
+        {
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_VisualBase(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Create an empty Visual Handle
+        /// </summary>
+        public VisualBase() : this(NDalicPINVOKE.new_VisualBase__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase(VisualBase handle) : this(NDalicPINVOKE.new_VisualBase__SWIG_1(VisualBase.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase Assign(VisualBase handle)
+        {
+            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// name of the visual
+        /// </summary>
+        public string Name
+        {
+            set
+            {
+                SetName(value);
+            }
+            get
+            {
+                return GetName();
+            }
+        }
+
+        internal void SetName(string name)
+        {
+            NDalicPINVOKE.VisualBase_SetName(swigCPtr, name);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal string GetName()
+        {
+            string ret = NDalicPINVOKE.VisualBase_GetName(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets the transform and the control size
+        /// </summary>
+        /// <param name="transform">A property map describing the transform</param>
+        /// <param name="controlSize">The size of the parent control for visuals that need to scale internally.</param>
+        public void SetTransformAndSize(PropertyMap transform, Vector2 controlSize)
+        {
+            NDalicPINVOKE.VisualBase_SetTransformAndSize(swigCPtr, PropertyMap.getCPtr(transform), Vector2.getCPtr(controlSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Returns the height for a given width.
+        /// </summary>
+        /// <param name="width">Width to use.</param>
+        /// <returns>The height based on the width.</returns>
+        public float GetHeightForWidth(float width)
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetHeightForWidth(swigCPtr, width);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the width for a given height.
+        /// </summary>
+        /// <param name="height">Height to use.</param>
+        /// <returns>The width based on the height.</returns>
+        public float GetWidthForHeight(float height)
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetWidthForHeight(swigCPtr, height);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Return the natural size of the visual.
+        /// Deriving classes stipulate the natural size and by default a visual has a ZERO natural size.
+        /// A visual may not actually have a natural size until it has been placed on stage and acquired all it's resources.
+        /// </summary>
+        /// <param name="naturalSize">The visual's natural size</param>
+        public void GetNaturalSize(Size2D naturalSize)
+        {
+            NDalicPINVOKE.VisualBase_GetNaturalSize(swigCPtr, Size2D.getCPtr(naturalSize));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// the depth index of this visual.
+        /// </summary>
+        public float DepthIndex
+        {
+            set
+            {
+                SetDepthIndex(value);
+            }
+            get
+            {
+                return GetDepthIndex();
+            }
+        }
+        internal void SetDepthIndex(float index)
+        {
+            NDalicPINVOKE.VisualBase_SetDepthIndex(swigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal float GetDepthIndex()
+        {
+            float ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Create the property map representing this visual.
+        /// </summary>
+        public PropertyMap Creation
+        {
+            set
+            {
+                CreatePropertyMap(value);
+            }
+        }
+        internal void CreatePropertyMap(PropertyMap map)
+        {
+            NDalicPINVOKE.VisualBase_CreatePropertyMap(swigCPtr, PropertyMap.getCPtr(map));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+    }
 
 }
index 8d0514b..1ca74fb 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+
+    /// <summary>
+    /// VisualFactory is a singleton object that provides and shares visuals between views
+    /// </summary>
+    public class VisualFactory : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal VisualFactory(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualFactory_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class VisualFactory : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualFactory obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal VisualFactory(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VisualFactory_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~VisualFactory()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VisualFactory 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;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_VisualFactory(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~VisualFactory() {
-    DisposeQueue.Instance.Add(this);
-  }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        /// <summary>
+        /// Create or retrieve VisualFactory singleton.
+        /// </summary>
+        /// <returns>A handle to the VisualFactory control.</returns>
+        public static VisualFactory Get()
+        {
+            VisualFactory ret = new VisualFactory(NDalicPINVOKE.VisualFactory_Get(), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_VisualFactory(swigCPtr);
+        internal VisualFactory() : this(NDalicPINVOKE.new_VisualFactory__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-  public static VisualFactory Get() {
-    VisualFactory ret = new VisualFactory(NDalicPINVOKE.VisualFactory_Get(), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VisualFactory() : this(NDalicPINVOKE.new_VisualFactory__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VisualFactory(VisualFactory handle) : this(NDalicPINVOKE.new_VisualFactory__SWIG_1(VisualFactory.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public VisualFactory Assign(VisualFactory handle) {
-    VisualFactory ret = new VisualFactory(NDalicPINVOKE.VisualFactory_Assign(swigCPtr, VisualFactory.getCPtr(handle)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VisualBase CreateVisual(Property.Map propertyMap) {
-    VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_0(swigCPtr, Property.Map.getCPtr(propertyMap)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VisualBase CreateVisual(Image image) {
-    VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_1(swigCPtr, Image.getCPtr(image)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public VisualBase CreateVisual(string url, Uint16Pair size) {
-    VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size)), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
 
-}
+        internal VisualFactory(VisualFactory handle) : this(NDalicPINVOKE.new_VisualFactory__SWIG_1(VisualFactory.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal VisualFactory Assign(VisualFactory handle)
+        {
+            VisualFactory ret = new VisualFactory(NDalicPINVOKE.VisualFactory_Assign(swigCPtr, VisualFactory.getCPtr(handle)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Request the visual
+        /// </summary>
+        /// <param name="propertyMap">The map contains the properties required by the visual. The content of the map determines the type of visual that will be returned.</param>
+        /// <returns>The handle to the created visual</returns>
+        public VisualBase CreateVisual(PropertyMap propertyMap)
+        {
+            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_0(swigCPtr, PropertyMap.getCPtr(propertyMap)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VisualBase CreateVisual(Image image)
+        {
+            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_1(swigCPtr, Image.getCPtr(image)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal VisualBase CreateVisual(string url, Uint16Pair size)
+        {
+            VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+        private static readonly VisualFactory instance = VisualFactory.Get();
+
+        /// <summary>
+        /// retrieve VisualFactory singleton.
+        /// </summary>
+        public static VisualFactory Instance
+        {
+            get
+            {
+                return instance;
+            }
+        }
+
+    }
 
 }
diff --git a/src/Tizen.NUI/devel-src/VisualMaps.cs b/src/Tizen.NUI/devel-src/VisualMaps.cs
new file mode 100755 (executable)
index 0000000..2a1b65d
--- /dev/null
@@ -0,0 +1,1516 @@
+// 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.
+//
+
+namespace Tizen.NUI
+{
+    using System;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// A class encapsulating the transform map of visual.
+    /// </summary>
+    public class VisualMap
+    {
+        private Vector2 _visualSize = Vector2.Zero;
+        private Vector2 _visualOffset = Vector2.Zero;
+        private Vector2 _visualOffsetPolicy = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute); // default absolute
+        private Vector2 _visualSizePolicy = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute); // default absolute
+        private AlignType _visualOrigin = AlignType.TopBegin;
+        private AlignType _visualAnchorPoint = AlignType.TopBegin;
+
+        private PropertyMap _visualTransformMap = null;
+
+        private float _depthIndex = 0.0f;
+        protected PropertyMap _outputVisualMap = null;
+
+        public VisualMap()
+        {
+        }
+
+        /// <summary>
+        /// Get or set size of the visual.
+        /// It can be either relative (percentage of the parent)
+        /// or absolute (in world units).
+        /// </summary>
+        public Vector2 VisualSize
+        {
+            get
+            {
+                return _visualSize;
+            }
+            set
+            {
+                _visualSize = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set offset of the visual.
+        /// It can be either relative (percentage of the parent)
+        /// or absolute (in world units).
+        /// </summary>
+        public Vector2 Offset
+        {
+            get
+            {
+                return _visualOffset;
+            }
+            set
+            {
+                _visualOffset = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set offset policy of the visual.
+        /// Indicates which components of the offset are relative
+        /// (percentage of the parent) or absolute (in world units).
+        /// 0 indicates the component is relative, and 1 absolute.
+        /// </summary>
+        public Vector2 OffsetPolicy
+        {
+            get
+            {
+                return _visualOffsetPolicy;
+            }
+            set
+            {
+                _visualOffsetPolicy = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set size policy of the visual.
+        /// Indicates which components of the size are relative
+        /// (percentage of the parent) or absolute (in world units).
+        /// 0 indicates the component is relative, and 1 absolute.
+        /// </summary>
+        public Vector2 SizePolicy
+        {
+            get
+            {
+                return _visualSizePolicy;
+            }
+            set
+            {
+                _visualSizePolicy = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the origin of the visual within its control area.
+        /// </summary>
+        public AlignType Origin
+        {
+            get
+            {
+                return _visualOrigin;
+            }
+            set
+            {
+                _visualOrigin = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the anchor-point of the visual.
+        /// </summary>
+        public AlignType AnchorPoint
+        {
+            get
+            {
+                return _visualAnchorPoint;
+            }
+            set
+            {
+                _visualAnchorPoint = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the depth index of the visual.
+        /// </summary>
+        public float DepthIndex
+        {
+            get
+            {
+                return _depthIndex;
+            }
+            set
+            {
+                _depthIndex = value;
+            }
+        }
+
+        private void ComposingTransformMap()
+        {
+            if (_visualSize != Vector2.Zero)
+            {
+                _visualTransformMap = new PropertyMap();
+                _visualTransformMap.Add((int)VisualTransformPropertyType.Size, new PropertyValue(_visualSize));
+                _visualTransformMap.Add((int)VisualTransformPropertyType.Offset, new PropertyValue(_visualOffset));
+                _visualTransformMap.Add((int)VisualTransformPropertyType.OffsetPolicy, new PropertyValue(_visualOffsetPolicy));
+                _visualTransformMap.Add((int)VisualTransformPropertyType.SizePolicy, new PropertyValue(_visualSizePolicy));
+                _visualTransformMap.Add((int)VisualTransformPropertyType.Origin, new PropertyValue((int)_visualOrigin));
+                _visualTransformMap.Add((int)VisualTransformPropertyType.AnchorPoint, new PropertyValue((int)_visualAnchorPoint));
+            }
+        }
+
+        /// <summary>
+        /// Get the transform map used by the visual.
+        /// </summary>
+        public PropertyMap OutputTransformMap
+        {
+            get
+            {
+                ComposingTransformMap();
+                return _visualTransformMap;
+            }
+        }
+
+        protected virtual void ComposingPropertyMap()
+        {
+            _outputVisualMap = new PropertyMap();
+        }
+
+        /// <summary>
+        /// Get the property map to create the visual.
+        /// </summary>
+        public PropertyMap OutputVisualMap
+        {
+            get
+            {
+                ComposingPropertyMap();
+                return _outputVisualMap;
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a image visual.
+    /// </summary>
+    public class ImageVisualMap : VisualMap
+    {
+        public ImageVisualMap() : base()
+        {
+        }
+
+        private string _url = "";
+        private FittingModeType _fittingMode = FittingModeType.ShrinkToFit;
+        private SamplingModeType _samplingMode = SamplingModeType.Box;
+        private int _desiredWidth = 0;
+        private int _desiredHeight = 0;
+        private bool _synchronousLoading = false;
+        private bool _borderOnly = false;
+        private Vector4 _pixelArea = new Vector4(0.0f, 0.0f, 1.0f, 1.0f);
+        private WrapModeType _wrapModeU = WrapModeType.ClampToEdge;
+        private WrapModeType _wrapModeV = WrapModeType.ClampToEdge;
+
+        /// <summary>
+        /// Get or set the URL of the image.
+        /// </summary>
+        public string URL
+        {
+            get
+            {
+                return _url;
+            }
+            set
+            {
+                _url = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set fitting options, used when resizing images to fit desired dimensions.
+        /// If not supplied, default is FittingMode::SHRINK_TO_FIT.
+        /// For Normal Quad images only.
+        /// </summary>
+        public FittingModeType FittingMode
+        {
+            get
+            {
+                return _fittingMode;
+            }
+            set
+            {
+                _fittingMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set filtering options, used when resizing images to sample original pixels.
+        /// If not supplied, default is SamplingMode::BOX.
+        /// For Normal Quad images only.
+        /// </summary>
+        public SamplingModeType SamplingMode
+        {
+            get
+            {
+                return _samplingMode;
+            }
+            set
+            {
+                _samplingMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the desired image width.
+        /// If not specified, the actual image width is used.
+        /// For Normal Quad images only.
+        /// </summary>
+        public int DesiredWidth
+        {
+            get
+            {
+                return _desiredWidth;
+            }
+            set
+            {
+                _desiredWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the desired image height.
+        /// If not specified, the actual image height is used.
+        /// For Normal Quad images only.
+        /// </summary>
+        public int DesiredHeight
+        {
+            get
+            {
+                return _desiredHeight;
+            }
+            set
+            {
+                _desiredHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether to load the image synchronously.
+        /// If not specified, the default is false, i.e. the image is loaded asynchronously.
+        /// For Normal Quad images only.
+        /// </summary>
+        public bool SynchronousLoading
+        {
+            get
+            {
+                return _synchronousLoading;
+            }
+            set
+            {
+                _synchronousLoading = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether to draws the borders only(If true).
+        /// If not specified, the default is false.
+        /// For N-Patch images only.
+        /// </summary>
+        public bool BorderOnly
+        {
+            get
+            {
+                return _borderOnly;
+            }
+            set
+            {
+                _borderOnly = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the image area to be displayed.
+        /// It is a rectangular area.
+        /// The first two elements indicate the top-left position of the area, and the last two elements are the area width and height respectively.
+        /// If not specified, the default value is [0.0, 0.0, 1.0, 1.0], i.e. the entire area of the image.
+        /// For For Normal QUAD image only.
+        /// </summary>
+        public Vector4 PixelArea
+        {
+            get
+            {
+                return _pixelArea;
+            }
+            set
+            {
+                _pixelArea = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the wrap mode for u coordinate.
+        /// It decides how the texture should be sampled when the u coordinate exceeds the range of 0.0 to 1.0.
+        /// If not specified, the default is CLAMP.
+        /// For Normal QUAD image only.
+        /// </summary>
+        public WrapModeType WrapModeU
+        {
+            get
+            {
+                return _wrapModeU;
+            }
+            set
+            {
+                _wrapModeU = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the wrap mode for v coordinate.
+        /// It decides how the texture should be sampled when the v coordinate exceeds the range of 0.0 to 1.0.
+        /// The first two elements indicate the top-left position of the area, and the last two elements are the area width and height respectively.
+        /// If not specified, the default is CLAMP.
+        /// For Normal QUAD image only.
+        /// </summary>
+        public WrapModeType WrapModeV
+        {
+            get
+            {
+                return _wrapModeV;
+            }
+            set
+            {
+                _wrapModeV = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            if (_url != "")
+            {
+                _outputVisualMap = new PropertyMap();
+                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
+                _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url));
+                _outputVisualMap.Add(ImageVisualProperty.FittingMode, new PropertyValue((int)_fittingMode));
+                _outputVisualMap.Add(ImageVisualProperty.SamplingMode, new PropertyValue((int)_samplingMode));
+
+                if (_desiredWidth != 0)
+                {
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, new PropertyValue(_desiredWidth));
+                }
+
+                if (_desiredHeight != 0)
+                {
+                    _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, new PropertyValue(_desiredHeight));
+                }
+
+                _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, new PropertyValue(_synchronousLoading));
+                _outputVisualMap.Add(ImageVisualProperty.BorderOnly, new PropertyValue(_borderOnly));
+                _outputVisualMap.Add(ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea));
+                _outputVisualMap.Add(ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU));
+                _outputVisualMap.Add(ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV));
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a text visual.
+    /// </summary>
+    public class TextVisualMap : VisualMap
+    {
+        public TextVisualMap() : base()
+        {
+        }
+
+        private string _text = "";
+        private string _fontFamily = "";
+        private PropertyMap _fontStyle = null;
+        private float _pointSize = 0.0f;
+        private bool _multiLine = false;
+        private string _horizontalAlignment = "BEGIN";
+        private string _verticalAlignment = "TOP";
+        private Color _textColor = Color.Black;
+        private bool _enableMarkup = false;
+
+        /// <summary>
+        /// Get or set the text to display in UTF-8 format.
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                return _text;
+            }
+            set
+            {
+                _text = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the requested font family to use.
+        /// </summary>
+        public string FontFamily
+        {
+            get
+            {
+                return _fontFamily;
+            }
+            set
+            {
+                _fontFamily = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the requested font style to use.
+        /// </summary>
+        public PropertyMap FontStyle
+        {
+            get
+            {
+                return _fontStyle;
+            }
+            set
+            {
+                _fontStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the size of font in points.
+        /// </summary>
+        public float PointSize
+        {
+            get
+            {
+                return _pointSize;
+            }
+            set
+            {
+                _pointSize = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the single-line or multi-line layout option.
+        /// </summary>
+        public bool MultiLine
+        {
+            get
+            {
+                return _multiLine;
+            }
+            set
+            {
+                _multiLine = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the line horizontal alignment.
+        /// If not specified, the default is BEGIN.
+        /// </summary>
+        public string HorizontalAlignment
+        {
+            get
+            {
+                return _horizontalAlignment;
+            }
+            set
+            {
+                _horizontalAlignment = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the line vertical alignment.
+        /// If not specified, the default is TOP.
+        /// </summary>
+        public string VerticalAlignment
+        {
+            get
+            {
+                return _verticalAlignment;
+            }
+            set
+            {
+                _verticalAlignment = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the color of the text.
+        /// </summary>
+        public Color TextColor
+        {
+            get
+            {
+                return _textColor;
+            }
+            set
+            {
+                _textColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether the mark-up processing is enabled.
+        /// </summary>
+        public bool EnableMarkup
+        {
+            get
+            {
+                return _enableMarkup;
+            }
+            set
+            {
+                _enableMarkup = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            if (_text != "")
+            {
+                _outputVisualMap = new PropertyMap();
+                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text));
+                _outputVisualMap.Add(TextVisualProperty.Text, new PropertyValue(_text));
+
+                if (_fontFamily != "")
+                {
+                    _outputVisualMap.Add(TextVisualProperty.FontFamily, new PropertyValue(_fontFamily));
+                }
+
+                if (_fontStyle != null)
+                {
+                    _outputVisualMap.Add(TextVisualProperty.FontStyle, new PropertyValue(_fontStyle));
+                }
+
+                if (_pointSize != 0)
+                {
+                    _outputVisualMap.Add(TextVisualProperty.PointSize, new PropertyValue(_pointSize));
+                }
+
+                _outputVisualMap.Add(TextVisualProperty.MultiLine, new PropertyValue(_multiLine));
+                _outputVisualMap.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue(_horizontalAlignment));
+                _outputVisualMap.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(_verticalAlignment));
+                _outputVisualMap.Add(TextVisualProperty.TextColor, new PropertyValue(_textColor));
+                _outputVisualMap.Add(TextVisualProperty.EnableMarkup, new PropertyValue(_enableMarkup));
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a border visual.
+    /// </summary>
+    public class BorderVisualMap : VisualMap
+    {
+        public BorderVisualMap() : base()
+        {
+        }
+
+        private Color _color = Color.Black;
+        private float _size = 0.000001f;
+        private bool _antiAliasing = false;
+
+        /// <summary>
+        /// Get or set the color of the border.
+        /// </summary>
+        public Color Color
+        {
+            get
+            {
+                return _color;
+            }
+            set
+            {
+                _color = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the width of the border (in pixels).
+        /// </summary>
+        public float Size
+        {
+            get
+            {
+                return _size;
+            }
+            set
+            {
+                _size = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether anti-aliasing of the border is required.
+        /// If not supplied, default is false.
+        /// </summary>
+        public bool AntiAliasing
+        {
+            get
+            {
+                return _antiAliasing;
+            }
+            set
+            {
+                _antiAliasing = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            if (_size > 0.000001f)
+            {
+                _outputVisualMap = new PropertyMap();
+                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Border));
+                _outputVisualMap.Add(BorderVisualProperty.Color, new PropertyValue(_color));
+                _outputVisualMap.Add(BorderVisualProperty.Size, new PropertyValue(_size));
+                _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, new PropertyValue(_antiAliasing));
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a color visual.
+    /// </summary>
+    public class ColorVisualMap : VisualMap
+    {
+        public ColorVisualMap() : base()
+        {
+        }
+
+        private Color _mixColor = Color.Black;
+
+        /// <summary>
+        /// Get or set the solid color required.
+        /// </summary>
+        public Color MixColor
+        {
+            get
+            {
+                return _mixColor;
+            }
+            set
+            {
+                _mixColor = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            _outputVisualMap = new PropertyMap();
+            _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Color));
+            _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(_mixColor));
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a gradient visual.
+    /// </summary>
+    public class GradientVisualMap : VisualMap
+    {
+        public GradientVisualMap() : base()
+        {
+        }
+
+        private Vector2 _startPosition = Vector2.Zero;
+        private Vector2 _endPosition = Vector2.Zero;
+        private Vector2 _center = Vector2.Zero;
+        private float _radius = 0.000001f;
+        private PropertyArray _stopOffset = null; //0.0, 1.0
+        private PropertyArray _stopColor = null; // Color.Black, Color.Blue
+        private GradientVisualUnitsType _units = GradientVisualUnitsType.ObjectBoundingBox;
+        private GradientVisualSpreadMethodType _spreadMethod = GradientVisualSpreadMethodType.Pad;
+
+        /// <summary>
+        /// Get or set the start position of a linear gradient.
+        /// Mandatory for Linear.
+        /// </summary>
+        public Vector2 StartPosition
+        {
+            get
+            {
+                return _startPosition;
+            }
+            set
+            {
+                _startPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the end position of a linear gradient.
+        /// Mandatory for Linear.
+        /// </summary>
+        public Vector2 EndPosition
+        {
+            get
+            {
+                return _endPosition;
+            }
+            set
+            {
+                _endPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the center point of a radial gradient.
+        /// Mandatory for Radial.
+        /// </summary>
+        public Vector2 Center
+        {
+            get
+            {
+                return _center;
+            }
+            set
+            {
+                _center = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the size of the radius of a radial gradient.
+        /// Mandatory for Radial.
+        /// </summary>
+        public float Radius
+        {
+            get
+            {
+                return _radius;
+            }
+            set
+            {
+                _radius = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set all the stop offsets.
+        /// A PropertyArray of float.
+        /// If not supplied, default is 0.0f and 1.0f.
+        /// </summary>
+        public PropertyArray StopOffset
+        {
+            get
+            {
+                return _stopOffset;
+            }
+            set
+            {
+                _stopOffset = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the color at the stop offsets.
+        /// A PropertyArray of Color.
+        /// At least 2 values required to show a gradient.
+        /// </summary>
+        public PropertyArray StopColor
+        {
+            get
+            {
+                return _stopColor;
+            }
+            set
+            {
+                _stopColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set defines the coordinate system for certain attributes of the points in a gradient.
+        /// If not supplied, default is GradientVisualUnitsType.OBJECT_BOUNDING_BOX.
+        /// </summary>
+        public GradientVisualUnitsType Units
+        {
+            get
+            {
+                return _units;
+            }
+            set
+            {
+                _units = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set indicates what happens if the gradient starts or ends inside the bounds of the target rectangle.
+        /// If not supplied, default is GradientVisualSpreadMethodType.PAD.
+        /// </summary>
+        public GradientVisualSpreadMethodType SpreadMethod
+        {
+            get
+            {
+                return _spreadMethod;
+            }
+            set
+            {
+                _spreadMethod = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            if (_startPosition != Vector2.Zero && _endPosition != Vector2.Zero && _center != Vector2.Zero
+                && _radius > 0.000001f && _stopColor != null)
+            {
+                _outputVisualMap = new PropertyMap();
+                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Gradient));
+                _outputVisualMap.Add(GradientVisualProperty.StartPosition, new PropertyValue(_startPosition));
+                _outputVisualMap.Add(GradientVisualProperty.EndPosition, new PropertyValue(_endPosition));
+                _outputVisualMap.Add(GradientVisualProperty.Center, new PropertyValue(_center));
+                _outputVisualMap.Add(GradientVisualProperty.Radius, new PropertyValue(_radius));
+
+                if (_stopOffset != null)
+                {
+                    _outputVisualMap.Add(GradientVisualProperty.StopOffset, new PropertyValue(_stopOffset));
+                }
+
+                _outputVisualMap.Add(GradientVisualProperty.StopColor, new PropertyValue(_stopColor));
+                _outputVisualMap.Add(GradientVisualProperty.Units, new PropertyValue((int)_units));
+                _outputVisualMap.Add(GradientVisualProperty.SpreadMethod, new PropertyValue((int)_spreadMethod));
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a mesh visual.
+    /// </summary>
+    public class MeshVisualMap : VisualMap
+    {
+        public MeshVisualMap() : base()
+        {
+        }
+
+        private string _objectURL = "";
+        private string _materialtURL = "";
+        private string _texturesPath = "";
+        private MeshVisualShadingModeValue _shadingMode = MeshVisualShadingModeValue.TexturedWithDetailedSpecularLighting;
+        private bool _useMipmapping = true;
+        private bool _useSoftNormals = true;
+        private Vector3 _lightPosition = null; //default center of screen
+
+        /// <summary>
+        /// Get or set the location of the ".obj" file.
+        /// </summary>
+        public string ObjectURL
+        {
+            get
+            {
+                return _objectURL;
+            }
+            set
+            {
+                _objectURL = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the location of the ".mtl" file.
+        /// If not specified, then a textureless object is assumed.
+        /// </summary>
+        public string MaterialtURL
+        {
+            get
+            {
+                return _materialtURL;
+            }
+            set
+            {
+                _materialtURL = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set path to the directory the textures (including gloss and normal) are stored in.
+        /// Mandatory if using material.
+        /// </summary>
+        public string TexturesPath
+        {
+            get
+            {
+                return _texturesPath;
+            }
+            set
+            {
+                _texturesPath = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the type of shading mode that the mesh will use.
+        /// If anything the specified shading mode requires is missing, a simpler mode that can be handled with what has been supplied will be used instead.
+        /// If not specified, it will use the best it can support (will try MeshVisualShadingModeValue.TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING first).
+        /// </summary>
+        public MeshVisualShadingModeValue ShadingMode
+        {
+            get
+            {
+                return _shadingMode;
+            }
+            set
+            {
+                _shadingMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether to use mipmaps for textures or not.
+        /// If not specified, the default is true.
+        /// </summary>
+        public bool UseMipmapping
+        {
+            get
+            {
+                return _useMipmapping;
+            }
+            set
+            {
+                _useMipmapping = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set whether to average normals at each point to smooth textures or not.
+        /// If not specified, the default is true.
+        /// </summary>
+        public bool UseSoftNormals
+        {
+            get
+            {
+                return _useSoftNormals;
+            }
+            set
+            {
+                _useSoftNormals = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the position, in stage space, of the point light that applies lighting to the model.
+        /// This is based off the stage's dimensions, so using the width and height of the stage halved will correspond to the center,
+        /// and using all zeroes will place the light at the top left corner.
+        /// If not specified, the default is an offset outwards from the center of the screen.
+        /// </summary>
+        public Vector3 LightPosition
+        {
+            get
+            {
+                return _lightPosition;
+            }
+            set
+            {
+                _lightPosition = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            if (_objectURL != "")
+            {
+                _outputVisualMap = new PropertyMap();
+                _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Mesh));
+                _outputVisualMap.Add(MeshVisualProperty.ObjectURL, new PropertyValue(_objectURL));
+
+                if (_materialtURL != "" && _texturesPath != "")
+                {
+                    _outputVisualMap.Add(MeshVisualProperty.MaterialtURL, new PropertyValue(_materialtURL));
+                    _outputVisualMap.Add(MeshVisualProperty.TexturesPath, new PropertyValue(_texturesPath));
+                }
+
+                _outputVisualMap.Add(MeshVisualProperty.ShadingMode, new PropertyValue((int)_shadingMode));
+                _outputVisualMap.Add(MeshVisualProperty.UseMipmapping, new PropertyValue(_useMipmapping));
+                _outputVisualMap.Add(MeshVisualProperty.UseSoftNormals, new PropertyValue(_useSoftNormals));
+
+                if (_lightPosition != null)
+                {
+                    _outputVisualMap.Add(MeshVisualProperty.LightPosition, new PropertyValue(_lightPosition));
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// A class encapsulating the property map of a primetive visual.
+    /// </summary>
+    public class PrimitiveVisualMap : VisualMap
+    {
+        public PrimitiveVisualMap() : base()
+        {
+        }
+
+        private PrimitiveVisualShapeType _shape = PrimitiveVisualShapeType.Sphere;
+        private Color _mixColor = new Color(0.5f, 0.5f, 0.5f, 1.0f);
+        private int _slices = 128;
+        private int _stacks = 128;
+        private float _scaleTopRadius = 1.0f;
+        private float _scaleBottomRadius = 1.5f;
+        private float _scaleHeight = 3.0f;
+        private float _scaleRadius = 1.0f;
+        private Vector3 _scaleDimensions = Vector3.One;
+        private float _bevelPercentage = 0.0f;
+        private float _bevelSmoothness = 0.0f;
+        private Vector3 _lightPosition = null; // default ?? center of screen
+
+        /// <summary>
+        /// Get or set the specific shape to render.
+        /// If not specified, the default is PrimitiveVisualShapeType.SPHERE.
+        /// </summary>
+        public PrimitiveVisualShapeType Shape
+        {
+            get
+            {
+                return _shape;
+            }
+            set
+            {
+                _shape = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the color of the shape.
+        /// If not specified, the default is Color(0.5, 0.5, 0.5, 1.0).
+        /// Applies to ALL shapes.
+        /// </summary>
+        public Color MixColor
+        {
+            get
+            {
+                return _mixColor;
+            }
+            set
+            {
+                _mixColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the number of slices as you go around the shape.
+        /// For spheres and conical frustrums, this determines how many divisions there are as you go around the object.
+        /// If not specified, the default is 128.
+        /// The range is from 1 to 255.
+        /// </summary>
+        public int Slices
+        {
+            get
+            {
+                return _slices;
+            }
+            set
+            {
+                _slices = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the number of stacks as you go down the shape.
+        /// For spheres, 'stacks' determines how many layers there are as you go down the object.
+        /// If not specified, the default is 128.
+        /// The range is from 1 to 255.
+        /// </summary>
+        public int Stacks
+        {
+            get
+            {
+                return _stacks;
+            }
+            set
+            {
+                _stacks = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the scale of the radius of the top circle of a conical frustrum.
+        /// If not specified, the default is 1.0f.
+        /// Applies to: - PrimitiveVisualShapeType.CONICAL_FRUSTRUM
+        /// Only values greater than or equal to 0.0f are accepted.
+        /// </summary>
+        public float ScaleTopRadius
+        {
+            get
+            {
+                return _scaleTopRadius;
+            }
+            set
+            {
+                _scaleTopRadius = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the scale of the radius of the bottom circle of a conical frustrum.
+        /// If not specified, the default is 1.5f.
+        /// Applies to:  - PrimitiveVisualShapeType.CONICAL_FRUSTRUM
+        ///              - PrimitiveVisualShapeType.CONE
+        /// Only values greater than or equal to 0.0f are accepted.
+        /// </summary>
+        public float ScaleBottomRadius
+        {
+            get
+            {
+                return _scaleBottomRadius;
+            }
+            set
+            {
+                _scaleBottomRadius = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the scale of the height of a conic.
+        /// If not specified, the default is 3.0f.
+        /// Applies to:
+        ///      - Shape::CONICAL_FRUSTRUM
+        ///      - Shape::CONE
+        ///      - Shape::CYLINDER
+        /// Only values greater than or equal to 0.0f are accepted.
+        /// </summary>
+        public float ScaleHeight
+        {
+            get
+            {
+                return _scaleHeight;
+            }
+            set
+            {
+                _scaleHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the scale of the radius of a cylinder.
+        /// If not specified, the default is 1.0f.
+        /// Applies to:
+        ///      - Shape::CYLINDER
+        /// Only values greater than or equal to 0.0f are accepted.
+        /// </summary>
+        public float ScaleRadius
+        {
+            get
+            {
+                return _scaleRadius;
+            }
+            set
+            {
+                _scaleRadius = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the dimensions of a cuboid. Scales in the same fashion as a 9-patch image.
+        /// If not specified, the default is Vector3.One.
+        /// Applies to:
+        ///      - Shape::CUBE
+        ///      - Shape::OCTAHEDRON
+        ///      - Shape::BEVELLED_CUBE
+        /// Each vector3 parameter should be greater than or equal to 0.0f.
+        /// </summary>
+        public Vector3 ScaleDimensions
+        {
+            get
+            {
+                return _scaleDimensions;
+            }
+            set
+            {
+                _scaleDimensions = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set determines how bevelled the cuboid should be, based off the smallest dimension.
+        /// Bevel percentage ranges from 0.0 to 1.0. It affects the ratio of the outer face widths to the width of the overall cube.
+        /// If not specified, the default is 0.0f (no bevel).
+        /// Applies to:
+        ///      - Shape::BEVELLED_CUBE
+        /// The range is from 0.0f to 1.0f.
+        /// </summary>
+        public float BevelPercentage
+        {
+            get
+            {
+                return _bevelPercentage;
+            }
+            set
+            {
+                _bevelPercentage = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set defines how smooth the bevelled edges should be.
+        /// If not specified, the default is 0.0f (sharp edges).
+        /// Applies to:
+        ///      - Shape::BEVELLED_CUBE
+        /// The range is from 0.0f to 1.0f.
+        /// </summary>
+        public float BevelSmoothness
+        {
+            get
+            {
+                return _bevelSmoothness;
+            }
+            set
+            {
+                _bevelSmoothness = value;
+            }
+        }
+
+        /// <summary>
+        /// Get or set the position, in stage space, of the point light that applies lighting to the model.
+        /// This is based off the stage's dimensions, so using the width and height of the stage halved will correspond to the center,
+        /// and using all zeroes will place the light at the top left corner.
+        /// If not specified, the default is an offset outwards from the center of the screen.
+        /// Applies to ALL shapes.
+        /// </summary>
+        public Vector3 LightPosition
+        {
+            get
+            {
+                return _lightPosition;
+            }
+            set
+            {
+                _lightPosition = value;
+            }
+        }
+
+        protected override void ComposingPropertyMap()
+        {
+            _outputVisualMap = new PropertyMap(); ;
+            _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Primitive));
+            _outputVisualMap.Add(PrimitiveVisualProperty.Shape, new PropertyValue((int)_shape));
+            _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColor));
+            _outputVisualMap.Add(PrimitiveVisualProperty.Slices, new PropertyValue(_slices));
+            _outputVisualMap.Add(PrimitiveVisualProperty.Stacks, new PropertyValue(_stacks));
+            _outputVisualMap.Add(PrimitiveVisualProperty.ScaleTopRadius, new PropertyValue(_scaleTopRadius));
+            _outputVisualMap.Add(PrimitiveVisualProperty.ScaleBottomRadius, new PropertyValue(_scaleBottomRadius));
+            _outputVisualMap.Add(PrimitiveVisualProperty.ScaleHeight, new PropertyValue(_scaleHeight));
+            _outputVisualMap.Add(PrimitiveVisualProperty.ScaleRadius, new PropertyValue(_scaleRadius));
+            _outputVisualMap.Add(PrimitiveVisualProperty.ScaleDimensions, new PropertyValue(_scaleDimensions));
+            _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, new PropertyValue(_bevelPercentage));
+            _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, new PropertyValue(_bevelSmoothness));
+
+            if (_lightPosition != null)
+            {
+                _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition));
+            }
+        }
+    }
+
+
+    public enum WrapModeType
+    {
+        Default = 0,
+        ClampToEdge,
+        Repeat,
+        MirroredRepeat
+    }
+
+    public enum GradientVisualUnitsType
+    {
+        ObjectBoundingBox,
+        UserSpace
+    }
+
+    public enum GradientVisualSpreadMethodType
+    {
+        Pad,
+        Reflect,
+        Repeat
+    }
+
+    public enum MeshVisualShadingModeValue
+    {
+        TexturelessWithDiffuseLighting,
+        TexturedWithSpecularLighting,
+        TexturedWithDetailedSpecularLighting
+    }
+
+    public enum PrimitiveVisualShapeType
+    {
+        Sphere,
+        ConicalFrustrum,
+        Cone,
+        Cylinder,
+        Cube,
+        Octahedron,
+        BevelledCube
+    }
+
+    public enum FittingModeType
+    {
+        ShrinkToFit,
+        ScaleToFill,
+        FitWidth,
+        FitHeight
+    }
+
+    public enum SamplingModeType
+    {
+        Box,
+        Nearest,
+        Linear,
+        BoxThenNearest,
+        BoxThenLinear,
+        NoFilter,
+        DontCare
+    }
+
+    public enum VisualTransformPolicyType
+    {
+        Relative = 0,
+        Absolute = 1
+    }
+
+    public enum AlignType
+    {
+        TopBegin = 0,
+        TopCenter,
+        TopEnd,
+        CenterBegin,
+        Center,
+        CenterEnd,
+        BottomBegin,
+        BottomCenter,
+        BottomEnd
+    }
+
+    public enum VisualTransformPropertyType
+    {
+        Offset,
+        Size,
+        Origin,
+        AnchorPoint,
+        OffsetPolicy,
+        SizePolicy
+    }
+
+    public struct Visual
+    {
+        public enum Type
+        {
+            Border,
+            Color,
+            Gradient,
+            Image,
+            Mesh,
+            Primitive,
+            Wireframe,
+            Text
+        }
+
+        public struct Property
+        {
+            public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE;
+            public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER;
+            public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM;
+            public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA;
+            public static readonly int MixColor = NDalic.VISUAL_PROPERTY_MIX_COLOR;
+        }
+
+        public struct ShaderProperty
+        {
+            public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX;
+            public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT;
+            public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X;
+            public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y;
+            public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS;
+        }
+    }
+
+    public struct BorderVisualProperty
+    {
+        public static readonly int Color = NDalic.BORDER_VISUAL_COLOR;
+        public static readonly int Size = NDalic.BORDER_VISUAL_SIZE;
+        public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING;
+    }
+
+    public struct ColorVisualProperty
+    {
+        public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR;
+    }
+
+    public struct GradientVisualProperty
+    {
+        public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION;
+        public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION;
+        public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER;
+        public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS;
+        public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET;
+        public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR;
+        public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS;
+        public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD;
+    }
+
+    public struct ImageVisualProperty
+    {
+        public static readonly int URL = NDalic.IMAGE_VISUAL_URL;
+        public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE;
+        public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE;
+        public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH;
+        public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT;
+        public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING;
+        public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY;
+        public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA;
+        public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U;
+        public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V;
+    }
+
+    public struct MeshVisualProperty
+    {
+        public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL;
+        public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL;
+        public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH;
+        public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE;
+        public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING;
+        public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS;
+        public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION;
+    }
+
+    public struct PrimitiveVisualProperty
+    {
+        public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE;
+        public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR;
+        public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES;
+        public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS;
+        public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS;
+        public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS;
+        public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT;
+        public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS;
+        public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS;
+        public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE;
+        public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS;
+        public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION;
+    }
+
+    public struct TextVisualProperty
+    {
+        public static readonly int Text = NDalic.TEXT_VISUAL_TEXT;
+        public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY;
+        public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE;
+        public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE;
+        public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE;
+        public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT;
+        public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT;
+        public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR;
+        public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP;
+    }
+
+
+}
similarity index 77%
rename from src/Tizen.NUI/devel-src/DimensionType.cs
rename to src/Tizen.NUI/devel-src/VisualTransformPolicyType.cs
index 5e69106..11ff2ef 100755 (executable)
@@ -2,18 +2,19 @@
 // <auto-generated />
 //
 // This file was automatically generated by SWIG (http://www.swig.org).
-// Version 3.0.9
+// Version 3.0.12
 //
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
+/* moved to VisualMaps.cs 
 namespace Tizen.NUI {
 
-public enum DimensionType {
-  WIDTH = 0x1,
-  HEIGHT = 0x2,
-  ALL_DIMENSIONS = 0x3
+public enum VisualTransformPolicyType {
+  RELATIVE = 0,
+  ABSOLUTE = 1
 }
 
 }
+*/
\ No newline at end of file
index 816a8e5..e57ac85 100755 (executable)
@@ -8,6 +8,7 @@
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
+/* moved to VisualMaps.cs 
 namespace Tizen.NUI {
 
 public enum VisualTransformPropertyType {
@@ -15,7 +16,9 @@ public enum VisualTransformPropertyType {
   SIZE,
   ORIGIN,
   ANCHOR_POINT,
-  OFFSET_SIZE_MODE
+  OFFSET_POLICY,
+  SIZE_POLICY
 }
 
 }
+*/
\ No newline at end of file
index 147003d..81164c4 100755 (executable)
@@ -7,10 +7,10 @@
 // Do not make changes to this file unless you know what you are doing--modify
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
-
+/* moved to VisualMaps.cs 
 namespace Tizen.NUI {
 
-public enum VisualType {
+    internal enum VisualType {
   BORDER,
   COLOR,
   GRADIENT,
@@ -24,3 +24,4 @@ public enum VisualType {
 }
 
 }
+*/
\ No newline at end of file
index ffe7204..b34dfba 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class VoidSignal : global::System.IDisposable {
+    internal class VoidSignal : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 2033798..280956f 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
 
-public class Wheel : global::System.IDisposable {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
-  protected bool swigCMemOwn;
+    /// <summary>
+    /// The wheel event structure is used to store a wheel rolling, it facilitates
+    /// processing of the wheel rolling and passing to other libraries like Toolkit.
+    /// 
+    /// There is a key modifier which relates to keys like alt, shift and control functions are
+    /// supplied to check if they have been pressed when the wheel is being rolled.
+    /// 
+    /// We support a mouse device and there may be another custom device that support the wheel event. The device type is specified as \e type.
+    /// The mouse wheel event can be sent to the specific actor but the custom wheel event will be sent to the stage.
+    /// </summary>
+    public class Wheel : global::System.IDisposable
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        protected bool swigCMemOwn;
 
-  internal Wheel(global::System.IntPtr cPtr, bool cMemoryOwn) {
-    swigCMemOwn = cMemoryOwn;
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        internal Wheel(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(Wheel obj) {
-    return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
-  }
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Wheel obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  ~Wheel() {
-    DisposeQueue.Instance.Add(this);
-  }
+        ~Wheel()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  public virtual void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        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_Wheel(swigCPtr);
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Wheel(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+            }
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-    }
-  }
 
 
-  public static Wheel GetWheelFromPtr(global::System.IntPtr cPtr) {
-    Wheel ret = new Wheel(cPtr, false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
+        internal static Wheel GetWheelFromPtr(global::System.IntPtr cPtr)
+        {
+            Wheel ret = new Wheel(cPtr, false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
 
-  public Wheel.WheelType Type
-  {
-    get
-    {
-      return type;
-    }
-  }
+        /// <summary>
+        /// The type of the wheel event
+        /// </summary>
+        public Wheel.WheelType Type
+        {
+            get
+            {
+                return type;
+            }
+        }
 
-  public int Direction
-  {
-    get
-    {
-      return direction;
-    }
-  }
+        /// <summary>
+        /// he direction of wheel rolling (0 = default vertical wheel, 1 = horizontal wheel)
+        /// </summary>
+        public int Direction
+        {
+            get
+            {
+                return direction;
+            }
+        }
 
-  public uint Modifiers
-  {
-    get
-    {
-      return modifiers;
-    }
-  }
+        /// <summary>
+        /// Modifier keys pressed during the event (such as shift, alt and control)
+        /// </summary>
+        public uint Modifiers
+        {
+            get
+            {
+                return modifiers;
+            }
+        }
 
-  public Vector2 Point
-  {
-    get
-    {
-      return point;
-    }
-  }
+        /// <summary>
+        /// The co-ordinates of the cursor relative to the top-left of the screen
+        /// </summary>
+        public Vector2 Point
+        {
+            get
+            {
+                return point;
+            }
+        }
 
-  public int Z
-  {
-    get
-    {
-      return z;
-    }
-  }
+        /// <summary>
+        /// The offset of rolling (positive value means roll down or clockwise, and negative value means roll up or counter-clockwise)
+        /// </summary>
+        public int Z
+        {
+            get
+            {
+                return z;
+            }
+        }
 
-  public uint TimeStamp
-  {
-    get
-    {
-      return timeStamp;
-    }
-  }
-
-  public Wheel() : this(NDalicPINVOKE.new_Wheel__SWIG_0(), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Wheel(Wheel.WheelType type, int direction, uint modifiers, Vector2 point, int z, uint timeStamp) : this(NDalicPINVOKE.new_Wheel__SWIG_1((int)type, direction, modifiers, Vector2.getCPtr(point), z, timeStamp), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public bool IsShiftModifier() {
-    bool ret = NDalicPINVOKE.Wheel_IsShiftModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsCtrlModifier() {
-    bool ret = NDalicPINVOKE.Wheel_IsCtrlModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public bool IsAltModifier() {
-    bool ret = NDalicPINVOKE.Wheel_IsAltModifier(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  private Wheel.WheelType type {
-    set {
-      NDalicPINVOKE.Wheel_type_set(swigCPtr, (int)value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      Wheel.WheelType ret = (Wheel.WheelType)NDalicPINVOKE.Wheel_type_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int direction {
-    set {
-      NDalicPINVOKE.Wheel_direction_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Wheel_direction_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint modifiers {
-    set {
-      NDalicPINVOKE.Wheel_modifiers_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.Wheel_modifiers_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private Vector2 point {
-    set {
-      NDalicPINVOKE.Wheel_point_set(swigCPtr, Vector2.getCPtr(value));
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      global::System.IntPtr cPtr = NDalicPINVOKE.Wheel_point_get(swigCPtr);
-      Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private int z {
-    set {
-      NDalicPINVOKE.Wheel_z_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      int ret = NDalicPINVOKE.Wheel_z_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  private uint timeStamp {
-    set {
-      NDalicPINVOKE.Wheel_timeStamp_set(swigCPtr, value);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    } 
-    get {
-      uint ret = NDalicPINVOKE.Wheel_timeStamp_get(swigCPtr);
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-      return ret;
-    } 
-  }
-
-  public enum WheelType {
-    MOUSE_WHEEL,
-    CUSTOM_WHEEL
-  }
+        /// <summary>
+        /// The time the wheel is being rolled
+        /// </summary>
+        public uint TimeStamp
+        {
+            get
+            {
+                return timeStamp;
+            }
+        }
 
-}
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public Wheel() : this(NDalicPINVOKE.new_Wheel__SWIG_0(), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="type">The type of the wheel event</param>
+        /// <param name="direction">The direction of wheel rolling (0 = default vertical wheel, 1 = horizontal wheel)</param>
+        /// <param name="modifiers">Modifier keys pressed during the event (such as shift, alt and control)</param>
+        /// <param name="point">The co-ordinates of the cursor relative to the top-left of the screen</param>
+        /// <param name="z">The offset of rolling (positive value means roll down or clockwise, and negative value means roll up or counter-clockwise)</param>
+        /// <param name="timeStamp">The time the wheel is being rolled</param>
+        public Wheel(Wheel.WheelType type, int direction, uint modifiers, Vector2 point, int z, uint timeStamp) : this(NDalicPINVOKE.new_Wheel__SWIG_1((int)type, direction, modifiers, Vector2.getCPtr(point), z, timeStamp), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Checks to see if Shift key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if shift modifier</returns>
+        public bool IsShiftModifier()
+        {
+            bool ret = NDalicPINVOKE.Wheel_IsShiftModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Checks to see if Ctrl (control) key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if ctrl modifier</returns>
+        public bool IsCtrlModifier()
+        {
+            bool ret = NDalicPINVOKE.Wheel_IsCtrlModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Checks to see if Alt key modifier has been supplied.
+        /// </summary>
+        /// <returns>True if alt modifier</returns>
+        public bool IsAltModifier()
+        {
+            bool ret = NDalicPINVOKE.Wheel_IsAltModifier(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        private Wheel.WheelType type
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_type_set(swigCPtr, (int)value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                Wheel.WheelType ret = (Wheel.WheelType)NDalicPINVOKE.Wheel_type_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int direction
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_direction_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Wheel_direction_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint modifiers
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_modifiers_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.Wheel_modifiers_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private Vector2 point
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_point_set(swigCPtr, Vector2.getCPtr(value));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                global::System.IntPtr cPtr = NDalicPINVOKE.Wheel_point_get(swigCPtr);
+                Vector2 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector2(cPtr, false);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private int z
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_z_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                int ret = NDalicPINVOKE.Wheel_z_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        private uint timeStamp
+        {
+            set
+            {
+                NDalicPINVOKE.Wheel_timeStamp_set(swigCPtr, value);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            }
+            get
+            {
+                uint ret = NDalicPINVOKE.Wheel_timeStamp_get(swigCPtr);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
+            }
+        }
+
+        /// <summary>
+        /// The type of the wheel event
+        /// </summary>
+        public enum WheelType
+        {
+            MouseWheel,
+            CustomWheel
+        }
+
+    }
 
 }
index df7ed83..fac98d1 100755 (executable)
 // the SWIG interface file instead.
 //------------------------------------------------------------------------------
 
-namespace Tizen.NUI {
+namespace Tizen.NUI
+{
+    /// <summary>
+    /// The window class is used internally for drawing.
+    /// A Window has an orientation and indicator properties.
+    /// </summary>
+    public class Window : BaseHandle
+    {
+        private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+
+        internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn)
+        {
+            swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
+        }
 
-public class Window : BaseHandle {
-  private global::System.Runtime.InteropServices.HandleRef swigCPtr;
+        internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Window obj)
+        {
+            return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+        }
 
-  internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn) {
-    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
-  }
+        ~Window()
+        {
+            DisposeQueue.Instance.Add(this);
+        }
 
-  internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Window 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;
+            }
+
+            lock (this)
+            {
+                if (swigCPtr.Handle != global::System.IntPtr.Zero)
+                {
+                    if (swigCMemOwn)
+                    {
+                        swigCMemOwn = false;
+                        NDalicPINVOKE.delete_Window(swigCPtr);
+                    }
+                    swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                }
+                global::System.GC.SuppressFinalize(this);
+                base.Dispose();
+            }
+        }
 
-  ~Window() {
-    DisposeQueue.Instance.Add(this);
-  }
+        public void Show()
+        {
+            NDalicPINVOKE.Show(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-  public override void Dispose() {
-    if (!Stage.IsInstalled()) {
-      DisposeQueue.Instance.Add(this);
-      return;
-    }
+        public void Hide()
+        {
+            NDalicPINVOKE.Hide(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
 
-    lock(this) {
-      if (swigCPtr.Handle != global::System.IntPtr.Zero) {
-        if (swigCMemOwn) {
-          swigCMemOwn = false;
-          NDalicPINVOKE.delete_Window(swigCPtr);
+        public void IsVisible()
+        {
+            NDalicPINVOKE.IsVisible(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-        swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-      }
-      global::System.GC.SuppressFinalize(this);
-      base.Dispose();
-    }
-  }
-
-
-  public Window (Rectangle windowPosition, string name, bool isTransparent) : this (NDalicPINVOKE.Window_New__SWIG_0(Rectangle.getCPtr(windowPosition), name, isTransparent), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Window (Rectangle windowPosition, string name) : this (NDalicPINVOKE.Window_New__SWIG_1(Rectangle.getCPtr(windowPosition), name), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Window (Rectangle windowPosition, string name, string className, bool isTransparent) : this (NDalicPINVOKE.Window_New__SWIG_2(Rectangle.getCPtr(windowPosition), name, className, isTransparent), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Window (Rectangle windowPosition, string name, string className) : this (NDalicPINVOKE.Window_New__SWIG_3(Rectangle.getCPtr(windowPosition), name, className), true) {
-      if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-
-  }
-  public Window(Window handle) : this(NDalicPINVOKE.new_Window__SWIG_1(Window.getCPtr(handle)), true) {
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Window Assign(Window rhs) {
-    Window ret = new Window(NDalicPINVOKE.Window_Assign(swigCPtr, Window.getCPtr(rhs)), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public void ShowIndicator(Window.IndicatorVisibleMode visibleMode) {
-    NDalicPINVOKE.Window_ShowIndicator(swigCPtr, (int)visibleMode);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity) {
-    NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RotateIndicator(Window.WindowOrientation orientation) {
-    NDalicPINVOKE.Window_RotateIndicator(swigCPtr, (int)orientation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetClass(string name, string klass) {
-    NDalicPINVOKE.Window_SetClass(swigCPtr, name, klass);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Raise() {
-    NDalicPINVOKE.Window_Raise(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Lower() {
-    NDalicPINVOKE.Window_Lower(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void Activate() {
-    NDalicPINVOKE.Window_Activate(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void AddAvailableOrientation(Window.WindowOrientation orientation) {
-    NDalicPINVOKE.Window_AddAvailableOrientation(swigCPtr, (int)orientation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void RemoveAvailableOrientation(Window.WindowOrientation orientation) {
-    NDalicPINVOKE.Window_RemoveAvailableOrientation(swigCPtr, (int)orientation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public void SetPreferredOrientation(Window.WindowOrientation orientation) {
-    NDalicPINVOKE.Window_SetPreferredOrientation(swigCPtr, (int)orientation);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-  }
-
-  public Window.WindowOrientation GetPreferredOrientation() {
-    Window.WindowOrientation ret = (Window.WindowOrientation)NDalicPINVOKE.Window_GetPreferredOrientation(swigCPtr);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public DragAndDropDetector GetDragAndDropDetector() {
-    DragAndDropDetector ret = new DragAndDropDetector(NDalicPINVOKE.Window_GetDragAndDropDetector(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public Any GetNativeHandle() {
-    Any ret = new Any(NDalicPINVOKE.Window_GetNativeHandle(swigCPtr), true);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public SWIGTYPE_p_Dali__SignalT_void_fboolF_t IndicatorVisibilityChangedSignal() {
-    SWIGTYPE_p_Dali__SignalT_void_fboolF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fboolF_t(NDalicPINVOKE.Window_IndicatorVisibilityChangedSignal(swigCPtr), false);
-    if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-    return ret;
-  }
-
-  public enum WindowOrientation {
-    PORTRAIT = 0,
-    LANDSCAPE = 90,
-    PORTRAIT_INVERSE = 180,
-    LANDSCAPE_INVERSE = 270
-  }
-
-  public enum IndicatorBgOpacity {
-    OPAQUE = 100,
-    TRANSLUCENT = 50,
-    TRANSPARENT = 0
-  }
-
-  public enum IndicatorVisibleMode {
-    INVISIBLE = 0,
-    VISIBLE = 1,
-    AUTO = 2
-  }
 
-}
+        /// <summary>
+        /// Creates an initialized handle to a new Window.
+        /// </summary>
+        /// <param name="windowPosition">The position and size of the Window</param>
+        /// <param name="name">The Window title</param>
+        /// <param name="isTransparent">Whether Window is transparent</param>
+        public Window(Rectangle windowPosition, string name, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_0(Rectangle.getCPtr(windowPosition), name, isTransparent), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized handle to a new Window.
+        /// </summary>
+        /// <param name="windowPosition">The position and size of the Window</param>
+        /// <param name="name">The Window title</param>
+        public Window(Rectangle windowPosition, string name) : this(NDalicPINVOKE.Window_New__SWIG_1(Rectangle.getCPtr(windowPosition), name), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized handle to a new Window.
+        /// </summary>
+        /// <param name="windowPosition">The position and size of the Window</param>
+        /// <param name="name">The Window title</param>
+        /// <param name="className">The Window class name</param>
+        /// <param name="isTransparent">Whether Window is transparent</param>
+        public Window(Rectangle windowPosition, string name, string className, bool isTransparent) : this(NDalicPINVOKE.Window_New__SWIG_2(Rectangle.getCPtr(windowPosition), name, className, isTransparent), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+
+        /// <summary>
+        /// Creates an initialized handle to a new Window.
+        /// </summary>
+        /// <param name="windowPosition">The position and size of the Window</param>
+        /// <param name="name">The Window title</param>
+        /// <param name="className">The Window class name</param>
+        public Window(Rectangle windowPosition, string name, string className) : this(NDalicPINVOKE.Window_New__SWIG_3(Rectangle.getCPtr(windowPosition), name, className), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+        }
+        internal Window(Window handle) : this(NDalicPINVOKE.new_Window__SWIG_1(Window.getCPtr(handle)), true)
+        {
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Window Assign(Window rhs)
+        {
+            Window ret = new Window(NDalicPINVOKE.Window_Assign(swigCPtr, Window.getCPtr(rhs)), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// This sets whether the indicator bar should be shown or not.
+        /// </summary>
+        /// <param name="visibleMode">Visible mode for indicator bar, Visible in default</param>
+        internal void ShowIndicator(Window.IndicatorVisibleMode visibleMode)
+        {
+            NDalicPINVOKE.Window_ShowIndicator(swigCPtr, (int)visibleMode);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// This sets the opacity mode of indicator bar.
+        /// </summary>
+        /// <param name="opacity">The opacity mode</param>
+        internal void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity)
+        {
+            NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// This sets the orientation of indicator bar.
+        /// It does not implicitly show the indicator if it is currently hidden.
+        /// </summary>
+        /// <param name="orientation">The orientation</param>
+        internal void RotateIndicator(Window.WindowOrientation orientation)
+        {
+            NDalicPINVOKE.Window_RotateIndicator(swigCPtr, (int)orientation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetClass(string name, string klass)
+        {
+            NDalicPINVOKE.Window_SetClass(swigCPtr, name, klass);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Raises window to the top of Window stack.
+        /// </summary>
+        public void Raise()
+        {
+            NDalicPINVOKE.Window_Raise(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Lowers window to the bottom of Window stack.
+        /// </summary>
+        public void Lower()
+        {
+            NDalicPINVOKE.Window_Lower(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Activates window to the top of Window stack even it is iconified.
+        /// </summary>
+        public void Activate()
+        {
+            NDalicPINVOKE.Window_Activate(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void AddAvailableOrientation(Window.WindowOrientation orientation)
+        {
+            NDalicPINVOKE.Window_AddAvailableOrientation(swigCPtr, (int)orientation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void RemoveAvailableOrientation(Window.WindowOrientation orientation)
+        {
+            NDalicPINVOKE.Window_RemoveAvailableOrientation(swigCPtr, (int)orientation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal void SetPreferredOrientation(Window.WindowOrientation orientation)
+        {
+            NDalicPINVOKE.Window_SetPreferredOrientation(swigCPtr, (int)orientation);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        internal Window.WindowOrientation GetPreferredOrientation()
+        {
+            Window.WindowOrientation ret = (Window.WindowOrientation)NDalicPINVOKE.Window_GetPreferredOrientation(swigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal DragAndDropDetector GetDragAndDropDetector()
+        {
+            DragAndDropDetector ret = new DragAndDropDetector(NDalicPINVOKE.Window_GetDragAndDropDetector(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal Any GetNativeHandle()
+        {
+            Any ret = new Any(NDalicPINVOKE.Window_GetNativeHandle(swigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        internal SWIGTYPE_p_Dali__SignalT_void_fboolF_t IndicatorVisibilityChangedSignal()
+        {
+            SWIGTYPE_p_Dali__SignalT_void_fboolF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fboolF_t(NDalicPINVOKE.Window_IndicatorVisibilityChangedSignal(swigCPtr), false);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        /// <summary>
+        /// Enumeration for orientation of the window is the way in which a rectangular page is oriented for normal viewing.
+        /// </summary>
+        public enum WindowOrientation
+        {
+            Portrait = 0,
+            Landscape = 90,
+            PortraitInverse = 180,
+            LandscapeInverse = 270
+        }
+
+        /// <summary>
+        /// Enumeration for opacity of the indicator.
+        /// </summary>
+        internal enum IndicatorBgOpacity
+        {
+            Opaque = 100,
+            Translucent = 50,
+            Transparent = 0
+        }
+
+        /// <summary>
+        /// Enumeration for visible mode of the indicator.
+        /// </summary>
+        internal enum IndicatorVisibleMode
+        {
+            Invisible = 0,
+            Visible = 1,
+            Auto = 2
+        }
+
+    }
 
 }
index 3e57514..e22022f 100755 (executable)
@@ -9,12 +9,12 @@
 //------------------------------------------------------------------------------
 
 namespace Tizen.NUI {
-
-public enum WrapModeType {
+/* move to VisualMap.cs
+    internal enum WrapModeType {
   DEFAULT = 0,
   CLAMP_TO_EDGE,
   REPEAT,
   MIRRORED_REPEAT
 }
-
+*/
 }
@@ -1,54 +1,54 @@
-/** 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.
-*
-*/
-
-namespace System
-{
-    public class ApplicationException : Exception
-    {
-        public ApplicationException()
-        {
-          new global::System.InvalidCastException();
-        }
-
-        public ApplicationException(string message)
-        {
-          new global::System.InvalidCastException(message);
-        }
-
-        public ApplicationException(string message, Exception innerException)
-        {
-          new global::System.InvalidCastException(message, innerException);
-        }
-    }
-
-    public class SystemException : Exception
-    {
-        public SystemException()
-        {
-            new global::System.InvalidCastException();
-        }
-
-        public SystemException(string message)
-        {
-            new global::System.InvalidCastException(message);
-        }
-
-        public SystemException(string message, Exception innerException)
-        {
-            new global::System.InvalidCastException(message, innerException);
-        }
-    }
-}
+/** Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
+*\r
+* Licensed under the Apache License, Version 2.0 (the "License");\r
+* you may not use this file except in compliance with the License.\r
+* You may obtain a copy of the License at\r
+*\r
+* http://www.apache.org/licenses/LICENSE-2.0\r
+*\r
+* Unless required by applicable law or agreed to in writing, software\r
+* distributed under the License is distributed on an "AS IS" BASIS,\r
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+* See the License for the specific language governing permissions and\r
+* limitations under the License.\r
+*\r
+*/\r
+\r
+namespace System\r
+{\r
+    public class ApplicationException : Exception\r
+    {\r
+        public ApplicationException()\r
+        {\r
+            new global::System.InvalidCastException();\r
+        }\r
+\r
+        public ApplicationException(string message)\r
+        {\r
+            new global::System.InvalidCastException(message);\r
+        }\r
+\r
+        public ApplicationException(string message, Exception innerException)\r
+        {\r
+            new global::System.InvalidCastException(message, innerException);\r
+        }\r
+    }\r
+\r
+    public class SystemException : Exception\r
+    {\r
+        public SystemException()\r
+        {\r
+            new global::System.InvalidCastException();\r
+        }\r
+\r
+        public SystemException(string message)\r
+        {\r
+            new global::System.InvalidCastException(message);\r
+        }\r
+\r
+        public SystemException(string message, Exception innerException)\r
+        {\r
+            new global::System.InvalidCastException(message, innerException);\r
+        }\r
+    }\r
+}\r
similarity index 81%
rename from src/Tizen.NUI/devel-src/dotnetcore/handleref.cs
rename to src/Tizen.NUI/devel-src/dotnetcore/HandleRef.cs
index b2a181a..c83d431 100755 (executable)
@@ -1,51 +1,55 @@
-// ==++==
-// 
-//   Copyright (c) Microsoft Corporation.  All rights reserved.
-// 
-// ==--==
-namespace System.Runtime.InteropServices
-{
-    
-    using System;
-
-    [System.Runtime.InteropServices.ComVisible(true)]
-    public struct HandleRef
-    {
-
-        // ! Do not add or rearrange fields as the EE depends on this layout.
-        //------------------------------------------------------------------
-        internal Object m_wrapper;
-        internal IntPtr m_handle;
-        //------------------------------------------------------------------
-
-
-        public HandleRef(Object wrapper, IntPtr handle)
-        {
-            m_wrapper = wrapper;
-            m_handle  = handle;
-        }
-
-        public Object Wrapper {
-            get {
-                return m_wrapper;
-            }
-        }
-    
-        public IntPtr Handle {
-            get {
-                return m_handle;
-            }
-        }
-    
-    
-        public static explicit operator IntPtr(HandleRef value)
-        {
-            return value.m_handle;
-        }
-
-        public static IntPtr ToIntPtr(HandleRef value)
-        {
-            return value.m_handle;
-        }
-    }
-}
+// ==++==\r
+// \r
+//   Copyright (c) Microsoft Corporation.  All rights reserved.\r
+// \r
+// ==--==\r
+namespace System.Runtime.InteropServices\r
+{\r
+\r
+    using System;\r
+\r
+    [System.Runtime.InteropServices.ComVisible(true)]\r
+    public struct HandleRef\r
+    {\r
+\r
+        // ! Do not add or rearrange fields as the EE depends on this layout.\r
+        //------------------------------------------------------------------\r
+        internal Object m_wrapper;\r
+        internal IntPtr m_handle;\r
+        //------------------------------------------------------------------\r
+\r
+\r
+        public HandleRef(Object wrapper, IntPtr handle)\r
+        {\r
+            m_wrapper = wrapper;\r
+            m_handle = handle;\r
+        }\r
+\r
+        public Object Wrapper\r
+        {\r
+            get\r
+            {\r
+                return m_wrapper;\r
+            }\r
+        }\r
+\r
+        public IntPtr Handle\r
+        {\r
+            get\r
+            {\r
+                return m_handle;\r
+            }\r
+        }\r
+\r
+\r
+        public static explicit operator IntPtr(HandleRef value)\r
+        {\r
+            return value.m_handle;\r
+        }\r
+\r
+        public static IntPtr ToIntPtr(HandleRef value)\r
+        {\r
+            return value.m_handle;\r
+        }\r
+    }\r
+}\r
index 0faeaad..43abc54 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class doublep : global::System.IDisposable {
+    internal class doublep : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index 5f18c5e..fa16cba 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class floatp : global::System.IDisposable {
+    internal class floatp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index aed5e07..bf3418e 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class intp : global::System.IDisposable {
+    internal class intp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
diff --git a/src/Tizen.NUI/devel-src/spin.cs b/src/Tizen.NUI/devel-src/spin.cs
deleted file mode 100755 (executable)
index 5504d87..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-using System;
-using System.Runtime.InteropServices;
-using Tizen.NUI;
-
-// A spin control (for continously changing values when users can easily predict a set of values)
-
-namespace Tizen.NUI
-{
-public class Spin : CustomView
-  {
-    private VisualBase _arrowVisual;
-    private TextField _textField;
-    private int _arrowVisualPropertyIndex;
-    private string _arrowImage;
-    private int _currentValue;
-    private int _minValue;
-    private int _maxValue;
-    private int _singleStep;
-    private bool _wrappingEnabled;
-    private string _fontFamily;
-    private string _fontStyle;
-    private int _pointSize;
-    private Color _textColor;
-    private Color _textBackgroundColor;
-    private int _maxTextLength;
-
-    // Called by DALi Builder if it finds a Spin control in a JSON file
-    static CustomView CreateInstance()
-    {
-      return new Spin();
-    }
-
-    // static constructor registers the control type (only runs once)
-    static Spin()
-    {
-      // ViewRegistry registers control type with DALi type registery
-      // also uses introspection to find any properties that need to be registered with type registry
-      ViewRegistry.Instance.Register(CreateInstance, typeof(Spin) );
-    }
-
-    public Spin() : base(typeof(Spin).Name, ViewWrapperImpl.CustomViewBehaviour.REQUIRES_KEYBOARD_NAVIGATION_SUPPORT | ViewWrapperImpl.CustomViewBehaviour.DISABLE_STYLE_CHANGE_SIGNALS)
-    {
-
-    }
-    public override void OnInitialize()
-    {
-      //Console.WriteLine ("[Spin]OnInitialize()!");
-
-      // Initialize the propertiesControl
-      _arrowImage = "/home/owner/apps_rw/NUISamples.TizenTV/res/images/arrow.png";
-      _textBackgroundColor = new Color(1.0f, 1.0f, 0.6f, 1.0f);
-      _currentValue = 0;
-      _minValue = 0;
-      _maxValue = 0;
-      _singleStep = 1;
-      _maxTextLength = 0;
-
-      // Create image visual for the arrow keys
-      _arrowVisualPropertyIndex = RegisterProperty("ArrowImage", new Tizen.NUI.Property.Value(_arrowImage), Tizen.NUI.Property.AccessMode.READ_WRITE);
-      _arrowVisual =  VisualFactory.Get().CreateVisual( _arrowImage, new Uint16Pair(150, 150) );
-      RegisterVisual( _arrowVisualPropertyIndex, _arrowVisual );
-
-      // Create a text field
-      _textField = new TextField();
-      _textField.ParentOrigin = NDalic.ParentOriginCenter;
-      _textField.AnchorPoint = NDalic.AnchorPointCenter;
-      _textField.WidthResizePolicy = "SIZE_RELATIVE_TO_PARENT";
-      _textField.HeightResizePolicy = "SIZE_RELATIVE_TO_PARENT";
-      _textField.SizeModeFactor = new Vector3( 1.0f, 0.45f, 1.0f );
-      _textField.PlaceholderText = "----";
-      _textField.BackgroundColor = _textBackgroundColor;
-      _textField.HorizontalAlignment = "Center";
-      _textField.VerticalAlignment = "Center";
-      _textField.SetKeyboardFocusable(true);
-      _textField.Name = "_textField";
-
-      this.Add(_textField);
-
-      _textField.KeyInputFocusGained += TextFieldKeyInputFocusGained;
-      _textField.KeyInputFocusLost += TextFieldKeyInputFocusLost;
-    }
-
-    public override Vector3 GetNaturalSize()
-    {
-        //Console.WriteLine ("[Spin]GetNaturalSize()!");
-
-      return new Vector3(150.0f, 150.0f, 0.0f);
-    }
-
-    public void TextFieldKeyInputFocusGained(object source, KeyInputFocusGainedEventArgs e)
-    {
-        //Console.WriteLine ("[Spin]TextFieldKeyInputFocusGained()!");
-
-      // Make sure when the current spin that takes input focus also takes the keyboard focus
-      // For example, when you tap the spin directly
-      FocusManager.Instance.SetCurrentFocusActor(_textField);
-    }
-
-    public void TextFieldKeyInputFocusLost(object source, KeyInputFocusLostEventArgs e)
-    {
-        //Console.WriteLine ("[Spin]TextFieldKeyInputFocusLost()!");
-      int previousValue = _currentValue;
-
-      // If the input value is invalid, change it back to the previous valid value
-      if(int.TryParse(_textField.Text, out _currentValue))
-      {
-        if (_currentValue < _minValue || _currentValue > _maxValue)
-        {
-          _currentValue = previousValue;
-        }
-      }
-      else
-      {
-        _currentValue = previousValue;
-      }
-
-      // Otherwise take the new value
-      this.Value = _currentValue;
-    }
-
-    public override Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled)
-    {
-      // Respond to Up/Down keys to change the value while keeping the current spin focused
-        //Console.WriteLine ("[Spin]GetNextKeyboardFocusableActor()!");
-
-      Actor nextFocusedActor = currentFocusedActor;
-      if (direction == View.KeyboardFocus.Direction.UP)
-      {
-        this.Value += this.Step;
-        nextFocusedActor = _textField;
-      }
-      else if (direction == View.KeyboardFocus.Direction.DOWN)
-      {
-        this.Value -= this.Step;
-        nextFocusedActor = _textField;
-      }
-      else
-      {
-        // Return a native empty handle as nothing can be focused in the left or right
-        nextFocusedActor = new Actor();
-        nextFocusedActor.Reset();
-      }
-
-      return nextFocusedActor;
-    }
-
-
-    [ScriptableProperty()]
-    public int Value
-    {
-      get
-      {
-        return _currentValue;
-      }
-      set
-      {
-
-        //Console.WriteLine ("[Spin]Value set to "  + value );
-        _currentValue = value;
-
-        // Make sure no invalid value is accepted
-        if (_currentValue < _minValue)
-        {
-          _currentValue = _minValue;
-        }
-
-        if (_currentValue > _maxValue)
-        {
-          _currentValue = _maxValue;
-        }
-
-        _textField.Text = _currentValue.ToString();
-      }
-    }
-    // MinValue property of type int:
-    [ScriptableProperty()]
-    public int MinValue
-    {
-      get
-      {
-        return _minValue;
-      }
-      set
-      {
-        _minValue = value;
-      }
-    }
-
-    // MaxValue property of type int:
-    [ScriptableProperty()]
-    public int MaxValue
-    {
-      get
-      {
-        return _maxValue;
-      }
-      set
-      {
-        _maxValue = value;
-      }
-    }
-
-    // Step property of type int:
-    [ScriptableProperty()]
-    public int Step
-    {
-      get
-      {
-        return _singleStep;
-      }
-      set
-      {
-        _singleStep = value;
-      }
-    }
-
-    // WrappingEnabled property of type bool:
-    [ScriptableProperty()]
-    public bool WrappingEnabled
-    {
-      get
-      {
-        return _wrappingEnabled;
-      }
-      set
-      {
-        _wrappingEnabled = value;
-      }
-    }
-
-    // TextPointSize property of type int:
-    [ScriptableProperty()]
-    public int TextPointSize
-    {
-      get
-      {
-        return _pointSize;
-      }
-      set
-      {
-        _pointSize = value;
-        _textField.PointSize = _pointSize;
-      }
-    }
-
-    // TextColor property of type Color:
-    [ScriptableProperty()]
-    public Color TextColor
-    {
-      get
-      {
-        return _textColor;
-      }
-      set
-      {
-          //Console.WriteLine ("[Spin]TextColor set to "  + value.R + "," + value.G + ","+ value.B);
-
-        _textColor = value;
-        _textField.TextColor = _textColor;
-      }
-    }
-
-    // MaxTextLength property of type int:
-    [ScriptableProperty()]
-    public int MaxTextLength
-    {
-      get
-      {
-        return _maxTextLength;
-      }
-      set
-      {
-        _maxTextLength = value;
-        _textField.MaxLength = _maxTextLength;
-      }
-    }
-
-    public TextField SpinText
-    {
-      get
-      {
-        return _textField;
-      }
-      set
-      {
-        _textField = value;
-      }
-    }
-
-    // Indicator property of type string:
-    public string IndicatorImage
-    {
-      get
-      {
-        return _arrowImage;
-      }
-      set
-      {
-        _arrowImage = value;
-        _arrowVisual =  VisualFactory.Get().CreateVisual( _arrowImage, new Uint16Pair(150, 150) );
-        RegisterVisual( _arrowVisualPropertyIndex, _arrowVisual );
-      }
-  }
-}
-}
index f21f891..e177b41 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class uintp : global::System.IDisposable {
+    internal class uintp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
index e812ca3..e5ec742 100755 (executable)
@@ -10,7 +10,7 @@
 
 namespace Tizen.NUI {
 
-public class ushortp : global::System.IDisposable {
+    internal class ushortp : global::System.IDisposable {
   private global::System.Runtime.InteropServices.HandleRef swigCPtr;
   protected bool swigCMemOwn;
 
diff --git a/src/Tizen.NUI/devel-src/visual-high-level/ImageVisual.cs b/src/Tizen.NUI/devel-src/visual-high-level/ImageVisual.cs
deleted file mode 100755 (executable)
index de1522b..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-/*\r
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Tizen.NUI;\r
-\r
-namespace Tizen.NUI\r
-{\r
-public class ImageVisual : VisualBase\r
-{\r
-    private VisualBase _imageVisual;\r
-    private Property.Map _imageProperty;\r
-    private string _imageUrl;\r
-    private string _fittingMode;\r
-    private string _samplingMode;\r
-    private int _desiredWidth;\r
-    private int _desiredHeight;\r
-    private bool _synchronousLoading;\r
-    private bool _borderOnly;\r
-    private Vector4 _pixelArea;\r
-    private string _wrapModeU;\r
-    private string _wrapModeV;\r
-\r
-    private Vector2 _imageVisualSize;\r
-    private Vector2 _imageVisualPosition;\r
-    private Vector4 _offsetSizeMode;\r
-    private Vector2 _parentSize;\r
-    private Tizen.NUI.AlignType _origin;\r
-    private Tizen.NUI.AlignType _anchorPoint;\r
-\r
-    public ImageVisual() : base()\r
-    {\r
-        //Initial the default transform map.\r
-        _offsetSizeMode = new Vector4( 1.0f, 1.0f, 1.0f, 1.0f ); //absolute\r
-        _origin = AlignType.TOP_BEGIN;\r
-        _anchorPoint = AlignType.TOP_BEGIN;\r
-\r
-        //Initial the image property map.\r
-        _imageProperty = new Property.Map();\r
-        _imageProperty.Insert( NDalic.VISUAL_PROPERTY_TYPE, new Property.Value( (int)VisualType.IMAGE ) );\r
-    }\r
-\r
-    public ImageVisual(string imageUrl)\r
-    {\r
-        //Initial the default transform map.\r
-        _offsetSizeMode = new Vector4( 1.0f, 1.0f, 1.0f, 1.0f ); //absolute\r
-        _origin = AlignType.TOP_BEGIN;\r
-        _anchorPoint = AlignType.TOP_BEGIN;\r
-\r
-        //Initial the image property map.\r
-        _imageUrl = imageUrl;\r
-        _imageProperty = new Property.Map();\r
-        _imageProperty.Insert( NDalic.VISUAL_PROPERTY_TYPE, new Property.Value( (int)VisualType.IMAGE ) );\r
-        _imageProperty.Insert( NDalic.IMAGE_VISUAL_URL, new Property.Value( _imageUrl ) );\r
-    }\r
-\r
-    public string Url\r
-    {\r
-        get\r
-        {\r
-            return _imageUrl;\r
-        }\r
-        set\r
-        {\r
-            _imageUrl = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_URL, new Property.Value( _imageUrl ) );\r
-        }\r
-    }\r
-\r
-    public string FittingMode\r
-    {\r
-        get\r
-        {\r
-            return _fittingMode;\r
-        }\r
-        set\r
-        {\r
-            _fittingMode = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_FITTING_MODE, new Property.Value( _fittingMode ) );\r
-        }\r
-    }\r
-\r
-    public string SamplingMode\r
-    {\r
-        get\r
-        {\r
-            return _samplingMode;\r
-        }\r
-        set\r
-        {\r
-            _samplingMode = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_SAMPLING_MODE, new Property.Value( _samplingMode ) );\r
-        }\r
-    }\r
-\r
-    public int DesiredWidth\r
-    {\r
-        get\r
-        {\r
-            return _desiredWidth;\r
-        }\r
-        set\r
-        {\r
-            _desiredWidth = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_DESIRED_WIDTH, new Property.Value( _desiredWidth ) );\r
-        }\r
-    }\r
-\r
-    public int DesiredHeight\r
-    {\r
-        get\r
-        {\r
-            return _desiredHeight;\r
-        }\r
-        set\r
-        {\r
-            _desiredHeight = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_DESIRED_HEIGHT, new Property.Value( _desiredHeight ) );\r
-        }\r
-    }\r
-\r
-    public bool SynchronousLoading\r
-    {\r
-        get\r
-        {\r
-            return _synchronousLoading;\r
-        }\r
-        set\r
-        {\r
-            _synchronousLoading = value;\r
-            _imageProperty.Insert( NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING, new Property.Value( _synchronousLoading ) );\r
-        }\r
-    }\r
-\r
-    public bool BorderOnly\r
-    {\r
-        get\r
-        {\r
-            return _borderOnly;\r
-        }\r
-        set\r
-        {\r
-            _borderOnly = value;\r
-             _imageProperty.Insert( NDalic.IMAGE_VISUAL_BORDER_ONLY, new Property.Value( _borderOnly ) );\r
-        }\r
-    }\r
-\r
-    public Vector4 PixelArea\r
-    {\r
-        get\r
-        {\r
-            return _pixelArea;\r
-        }\r
-        set\r
-        {\r
-            _pixelArea = value;\r
-             _imageProperty.Insert( NDalic.IMAGE_VISUAL_PIXEL_AREA, new Property.Value( _pixelArea ) );\r
-        }\r
-    }\r
-\r
-    public string WrapModeU\r
-    {\r
-        get\r
-        {\r
-            return _wrapModeU;\r
-        }\r
-        set\r
-        {\r
-            _wrapModeU = value;\r
-             _imageProperty.Insert( NDalic.IMAGE_VISUAL_WRAP_MODE_U, new Property.Value( _wrapModeU ) );\r
-        }\r
-    }\r
-\r
-    public string WrapModeV\r
-    {\r
-        get\r
-        {\r
-            return _wrapModeV;\r
-        }\r
-        set\r
-        {\r
-            _wrapModeV = value;\r
-             _imageProperty.Insert( NDalic.IMAGE_VISUAL_WRAP_MODE_V, new Property.Value( _wrapModeV ) );\r
-        }\r
-    }\r
-\r
-    public Vector2 Size\r
-    {\r
-        get\r
-        {\r
-            return _imageVisualSize;\r
-        }\r
-        set\r
-        {\r
-            _imageVisualSize = value;\r
-        }\r
-    }\r
-\r
-    public Vector2 Position\r
-    {\r
-        get\r
-        {\r
-            return _imageVisualPosition;\r
-        }\r
-        set\r
-        {\r
-            _imageVisualPosition = value;\r
-        }\r
-    }\r
-\r
-    public Vector4 OffsetSizeMode\r
-    {\r
-        get\r
-        {\r
-            return _offsetSizeMode;\r
-        }\r
-        set\r
-        {\r
-            _offsetSizeMode = value;\r
-        }\r
-    }\r
-\r
-    public Vector2 ParentSize\r
-    {\r
-        get\r
-        {\r
-            return _parentSize;\r
-        }\r
-        set\r
-        {\r
-            _parentSize = value;\r
-        }\r
-    }\r
-\r
-    public AlignType Origin\r
-    {\r
-        get\r
-        {\r
-            return _origin;\r
-        }\r
-        set\r
-        {\r
-            _origin = value;\r
-        }\r
-    }\r
-\r
-    public AlignType AnchorPoint\r
-    {\r
-        get\r
-        {\r
-            return _anchorPoint;\r
-        }\r
-        set\r
-        {\r
-            _anchorPoint = value;\r
-        }\r
-    }\r
-\r
-    public void Instantiate()\r
-    {\r
-        //\r
-        _imageVisual = VisualFactory.Get().CreateVisual( _imageProperty );\r
-\r
-        Property.Map imageVisualTransform = new Property.Map();\r
-        imageVisualTransform.Add( (int)VisualTransformPropertyType.SIZE, new Property.Value(_imageVisualSize) );\r
-        imageVisualTransform.Add( (int)VisualTransformPropertyType.OFFSET, new Property.Value(_imageVisualPosition) );\r
-        imageVisualTransform.Add( (int)VisualTransformPropertyType.OFFSET_SIZE_MODE, new Property.Value(_offsetSizeMode) );\r
-        imageVisualTransform.Add( (int)VisualTransformPropertyType.ORIGIN, new Property.Value((int)_origin) );\r
-        imageVisualTransform.Add( (int)VisualTransformPropertyType.ANCHOR_POINT, new Property.Value((int)_anchorPoint) );\r
-        _imageVisual.SetTransformAndSize( imageVisualTransform, _parentSize );\r
-    }\r
-}\r
-}
\ No newline at end of file
diff --git a/src/Tizen.NUI/devel-src/visual-high-level/TextVisual.cs b/src/Tizen.NUI/devel-src/visual-high-level/TextVisual.cs
deleted file mode 100755 (executable)
index c366d56..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-/*\r
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Tizen.NUI;\r
-\r
-namespace Tizen.NUI\r
-{\r
-    public class TextVisual : VisualCommon\r
-    {\r
-        private VisualBase _textVisual;\r
-        private Property.Map _textProperty;\r
-        private string _text;\r
-        private string _fontFamily;\r
-        //private Property.Map _fontStyle;\r
-        private string _fontStyle;\r
-        private float _pointSize;\r
-        private bool _multiLine;\r
-        private string _horizontalAlignment;\r
-        private string _verticalAlignment;\r
-        private Vector4 _textColor;\r
-        private bool _enableMarkup;\r
-\r
-        private Vector2 _imageVisualSize;\r
-        private Vector2 _imageVisualPosition;\r
-        private Vector4 _offsetSizeMode;\r
-        private Vector2 _parentSize;\r
-        private Tizen.NUI.AlignType _origin;\r
-        private Tizen.NUI.AlignType _anchorPoint;\r
-\r
-        public TextVisual() : base()\r
-        {\r
-            //Initial the default transform map.\r
-            _offsetSizeMode = new Vector4(1.0f, 1.0f, 1.0f, 1.0f); //absolute\r
-            _origin = AlignType.TOP_BEGIN;\r
-            _anchorPoint = AlignType.TOP_BEGIN;\r
-\r
-            //Initial the image property map.\r
-            _textProperty = new Property.Map();\r
-            _textProperty.Insert(NDalic.VISUAL_PROPERTY_TYPE, new Property.Value((int)VisualType.TEXT));\r
-        }\r
-\r
-        public TextVisual(string text)\r
-        {\r
-            //Initial the default transform map.\r
-            _offsetSizeMode = new Vector4(1.0f, 1.0f, 1.0f, 1.0f); //absolute\r
-            _origin = AlignType.TOP_BEGIN;\r
-            _anchorPoint = AlignType.TOP_BEGIN;\r
-\r
-            //Initial the image property map.\r
-            _text = text;\r
-            _textProperty = new Property.Map();\r
-            _textProperty.Insert(NDalic.VISUAL_PROPERTY_TYPE, new Property.Value((int)VisualType.TEXT));\r
-            _textProperty.Insert(NDalic.TEXT_VISUAL_TEXT, new Property.Value(_text));\r
-        }\r
-\r
-        public string Text\r
-        {\r
-            get\r
-            {\r
-                return _text;\r
-            }\r
-            set\r
-            {\r
-                _text = value;\r
-                _textProperty.Insert(NDalic.TEXT_VISUAL_TEXT, new Property.Value(_text));\r
-            }\r
-        }\r
-\r
-        public string FontFamily\r
-        {\r
-            get\r
-            {\r
-                return _fontFamily;\r
-            }\r
-            set\r
-            {\r
-                _fontFamily = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_FITTING_MODE, new Property.Value(_fontFamily));\r
-            }\r
-        }\r
-\r
-        public string FontStyle\r
-        {\r
-            get\r
-            {\r
-                return _fontStyle;\r
-            }\r
-            set\r
-            {\r
-                _fontStyle = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_SAMPLING_MODE, new Property.Value(_fontStyle));\r
-            }\r
-        }\r
-\r
-        public float PointSize\r
-        {\r
-            get\r
-            {\r
-                return _pointSize;\r
-            }\r
-            set\r
-            {\r
-                _pointSize = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_DESIRED_WIDTH, new Property.Value(_pointSize));\r
-            }\r
-        }\r
-\r
-        public bool MultiLine\r
-        {\r
-            get\r
-            {\r
-                return _multiLine;\r
-            }\r
-            set\r
-            {\r
-                _multiLine = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_DESIRED_HEIGHT, new Property.Value(_multiLine));\r
-            }\r
-        }\r
-\r
-        public string HorizontalAlignment\r
-        {\r
-            get\r
-            {\r
-                return _horizontalAlignment;\r
-            }\r
-            set\r
-            {\r
-                _horizontalAlignment = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING, new Property.Value(_horizontalAlignment));\r
-            }\r
-        }\r
-\r
-        public string VerticalAlignment\r
-        {\r
-            get\r
-            {\r
-                return _verticalAlignment;\r
-            }\r
-            set\r
-            {\r
-                _verticalAlignment = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_BORDER_ONLY, new Property.Value(_verticalAlignment));\r
-            }\r
-        }\r
-\r
-        public Vector4 TextColor\r
-        {\r
-            get\r
-            {\r
-                return _textColor;\r
-            }\r
-            set\r
-            {\r
-                _textColor = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_PIXEL_AREA, new Property.Value(_textColor));\r
-            }\r
-        }\r
-\r
-        public bool EnableMarkup\r
-        {\r
-            get\r
-            {\r
-                return _enableMarkup;\r
-            }\r
-            set\r
-            {\r
-                _enableMarkup = value;\r
-                _textProperty.Insert(NDalic.IMAGE_VISUAL_WRAP_MODE_U, new Property.Value(_enableMarkup));\r
-            }\r
-        }\r
-\r
-\r
-\r
-        public void Instantiate()\r
-        {\r
-            //\r
-            _textVisual = VisualFactory.Get().CreateVisual(_textProperty);\r
-\r
-            Property.Map imageVisualTransform = new Property.Map();\r
-            imageVisualTransform.Add((int)VisualTransformPropertyType.SIZE, new Property.Value(_imageVisualSize));\r
-            imageVisualTransform.Add((int)VisualTransformPropertyType.OFFSET, new Property.Value(_imageVisualPosition));\r
-            imageVisualTransform.Add((int)VisualTransformPropertyType.OFFSET_SIZE_MODE, new Property.Value(_offsetSizeMode));\r
-            imageVisualTransform.Add((int)VisualTransformPropertyType.ORIGIN, new Property.Value((int)_origin));\r
-            imageVisualTransform.Add((int)VisualTransformPropertyType.ANCHOR_POINT, new Property.Value((int)_anchorPoint));\r
-            _textVisual.SetTransformAndSize(imageVisualTransform, _parentSize);\r
-        }\r
-    }\r
-}
\ No newline at end of file
diff --git a/src/Tizen.NUI/devel-src/visual-high-level/VisualCommon.cs b/src/Tizen.NUI/devel-src/visual-high-level/VisualCommon.cs
deleted file mode 100755 (executable)
index 6fb88f8..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-/*\r
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Tizen.NUI;\r
-\r
-namespace Tizen.NUI\r
-{\r
-public class VisualCommon : VisualBase\r
-{\r
-    private Vector2 _visualSize;\r
-    private Vector2 _visualPosition;\r
-    private Vector4 _visualOffsetSizeMode;\r
-    private Vector2 _visualParentSize;\r
-    private AlignType _visualOrigin;\r
-    private AlignType _visualAnchorPoint;\r
-\r
-    public VisualCommon()\r
-    {\r
-        //\r
-    }\r
-\r
-    public Vector2 Size\r
-    {\r
-        get\r
-        {\r
-            return _visualSize;\r
-        }\r
-        set\r
-        {\r
-            _visualSize = value;\r
-        }\r
-    }\r
-\r
-    public Vector2 Position\r
-    {\r
-        get\r
-        {\r
-            return _visualPosition;\r
-        }\r
-        set\r
-        {\r
-            _visualPosition = value;\r
-        }\r
-    }\r
-\r
-    public Vector4 OffsetSizeMode\r
-    {\r
-        get\r
-        {\r
-            return _visualOffsetSizeMode;\r
-        }\r
-        set\r
-        {\r
-            _visualOffsetSizeMode = value;\r
-        }\r
-    }\r
-\r
-    public Vector2 ParentSize\r
-    {\r
-        get\r
-        {\r
-            return _visualParentSize;\r
-        }\r
-        set\r
-        {\r
-            _visualParentSize = value;\r
-        }\r
-    }\r
-\r
-    public AlignType Origin\r
-    {\r
-        get\r
-        {\r
-            return _visualOrigin;\r
-        }\r
-        set\r
-        {\r
-            _visualOrigin = value;\r
-        }\r
-    }\r
-\r
-    public AlignType AnchorPoint\r
-    {\r
-        get\r
-        {\r
-            return _visualAnchorPoint;\r
-        }\r
-        set\r
-        {\r
-            _visualAnchorPoint = value;\r
-        }\r
-    }\r
-\r
-}\r
-\r
-    public enum AlignType\r
-    {\r
-            TOP_BEGIN = 0,\r
-            TOP_CENTER,\r
-            TOP_END,\r
-            CENTER_BEGIN,\r
-            CENTER,\r
-            CENTER_END,\r
-            BOTTOM_BEGIN,\r
-            BOTTOM_CENTER,\r
-            BOTTOM_END\r
-        }\r
-\r
-}
\ No newline at end of file
diff --git a/src/Tizen.NUI/devel-src/visual-high-level/VisualView.cs b/src/Tizen.NUI/devel-src/visual-high-level/VisualView.cs
deleted file mode 100755 (executable)
index 9a96fdc..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*\r
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-using System;\r
-using System.Runtime.InteropServices;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using Tizen.NUI;\r
-\r
-namespace Tizen.NUI\r
-{\r
-public class VisualView : CustomView\r
-{\r
-    //private LinkedList<VisualBase> _visualList = null;\r
-    private Dictionary<int, VisualBase> _visualDictionary = null;\r
-\r
-    static CustomView CreateInstance()\r
-    {\r
-      return new VisualView();\r
-    }\r
-\r
-    // static constructor registers the control type (only runs once)\r
-    static VisualView()\r
-    {\r
-      // ViewRegistry registers control type with DALi type registery\r
-      // also uses introspection to find any properties that need to be registered with type registry\r
-      ViewRegistry.Instance.Register(CreateInstance, typeof(VisualView) );\r
-    }\r
-\r
-    public VisualView() : base(typeof(VisualView).Name, ViewWrapperImpl.CustomViewBehaviour.REQUIRES_KEYBOARD_NAVIGATION_SUPPORT | ViewWrapperImpl.CustomViewBehaviour.DISABLE_STYLE_CHANGE_SIGNALS)\r
-    {\r
-    }\r
-\r
-    public override void OnInitialize()\r
-    {\r
-      //Initialize empty\r
-      _visualDictionary = new Dictionary<int, VisualBase>();\r
-    }\r
-\r
-    //\r
-    public void AddVisual( VisualBase visual )\r
-    {\r
-        //_visualDictionary.Add( visual );\r
-        string visualViewProperty = "visualViewProperty" + _visualDictionary.Count;\r
-        Console.WriteLine ("--------------visualViewProperty name: "  + visualViewProperty );\r
-\r
-        int visualViewPropertyIndex = RegisterProperty( visualViewProperty, new Tizen.NUI.Property.Value(visualViewProperty), Tizen.NUI.Property.AccessMode.READ_WRITE);\r
-        _visualDictionary.Add( visualViewPropertyIndex, visual );\r
-\r
-        RegisterVisual( visualViewPropertyIndex, visual );\r
-    }\r
-\r
-    public void RemoveVisual( VisualBase visual )\r
-    {\r
-        int foundIndex = -1;\r
-\r
-        foreach (var item in _visualDictionary)\r
-        {\r
-            if (item.Value == visual) \r
-            {\r
-                foundIndex = item.Key;\r
-                EnableVisual(foundIndex, false);\r
-                UnregisterVisual(foundIndex);\r
-                _visualDictionary.Remove(foundIndex);\r
-            }\r
-        }\r
-    }\r
-\r
-    public int NumOfVisual()\r
-    {\r
-        return _visualDictionary.Count;\r
-    }\r
-\r
-    public void DisposeAllVisual()\r
-    {\r
-        //\r
-    }\r
-}\r
-}
\ No newline at end of file