From 2813e3e49e24ed47225a08ba23fec48bd1016ed6 Mon Sep 17 00:00:00 2001 From: "huiyu,eun" Date: Tue, 12 Sep 2017 09:58:27 +0900 Subject: [PATCH] [Tizen] Fix build warnings: use the new keyword warning CS0108, hides inherited member. user the new keyword if hiding was intended. Conflicts: Tizen.NUI/src/public/BaseComponents/CustomView.cs Tizen.NUI/src/public/KeyFrames.cs Tizen.NUI/src/public/Property.cs Change-Id: I6d2e78406176ee0228dac02cf8dd24ff70a397e8 Signed-off-by: huiyu,eun --- Tizen.NUI/src/internal/Alignment.cs | 2 +- Tizen.NUI/src/internal/Any.cs | 4 +- Tizen.NUI/src/internal/Application.cs | 2 +- Tizen.NUI/src/internal/Camera.cs | 2 +- Tizen.NUI/src/internal/ItemView.cs | 2 +- Tizen.NUI/src/internal/Model3dView.cs | 2 +- Tizen.NUI/src/internal/PageTurnView.cs | 2 +- Tizen.NUI/src/internal/Ruler.cs | 2 +- Tizen.NUI/src/internal/RulerPtr.cs | 2 +- Tizen.NUI/src/internal/ViewWrapperImpl.cs | 62 +++++++++++----------- Tizen.NUI/src/public/BaseComponents/CustomView.cs | 16 +++--- .../src/public/BaseComponents/FlexContainer.cs | 2 +- Tizen.NUI/src/public/BaseComponents/ImageView.cs | 4 +- Tizen.NUI/src/public/BaseComponents/Scrollable.cs | 2 +- Tizen.NUI/src/public/BaseComponents/TableView.cs | 2 +- Tizen.NUI/src/public/BaseComponents/TextEditor.cs | 2 +- Tizen.NUI/src/public/BaseComponents/TextField.cs | 2 +- Tizen.NUI/src/public/BaseComponents/TextLabel.cs | 2 +- Tizen.NUI/src/public/BaseComponents/VideoView.cs | 2 +- Tizen.NUI/src/public/Geometry.cs | 2 +- Tizen.NUI/src/public/KeyFrames.cs | 4 +- Tizen.NUI/src/public/Property.cs | 4 +- Tizen.NUI/src/public/UIComponents/Button.cs | 2 +- Tizen.NUI/src/public/UIComponents/Popup.cs | 2 +- Tizen.NUI/src/public/UIComponents/ProgressBar.cs | 2 +- Tizen.NUI/src/public/UIComponents/PushButton.cs | 4 +- Tizen.NUI/src/public/UIComponents/ScrollBar.cs | 2 +- Tizen.NUI/src/public/UIComponents/ScrollView.cs | 2 +- Tizen.NUI/src/public/UIComponents/Slider.cs | 2 +- Tizen.NUI/src/public/UIComponents/ToggleButton.cs | 2 +- Tizen.NUI/src/public/VisualMaps.cs | 2 +- Tizen.NUI/src/public/WidgetView.cs | 2 +- 32 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Tizen.NUI/src/internal/Alignment.cs b/Tizen.NUI/src/internal/Alignment.cs index c49d4f7..7108b1a 100755 --- a/Tizen.NUI/src/internal/Alignment.cs +++ b/Tizen.NUI/src/internal/Alignment.cs @@ -67,7 +67,7 @@ namespace Tizen.NUI - public class Padding : global::System.IDisposable + public new class Padding : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/Tizen.NUI/src/internal/Any.cs b/Tizen.NUI/src/internal/Any.cs index 0bc189d..8b6e5a5 100755 --- a/Tizen.NUI/src/internal/Any.cs +++ b/Tizen.NUI/src/internal/Any.cs @@ -122,7 +122,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_std__type_info GetType() + public new SWIGTYPE_p_std__type_info GetType() { SWIGTYPE_p_std__type_info ret = new SWIGTYPE_p_std__type_info(NDalicPINVOKE.Any_GetType(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -222,7 +222,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_std__type_info GetType() + public new SWIGTYPE_p_std__type_info GetType() { SWIGTYPE_p_std__type_info ret = new SWIGTYPE_p_std__type_info(NDalicPINVOKE.Any_AnyContainerBase_GetType(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/internal/Application.cs b/Tizen.NUI/src/internal/Application.cs index 8d224b7..3f4df22 100755 --- a/Tizen.NUI/src/internal/Application.cs +++ b/Tizen.NUI/src/internal/Application.cs @@ -671,7 +671,7 @@ namespace Tizen.NUI * (in the type of NUIApplicationResetEventHandler-DaliEventHandler) * provided by the user. Reset signal is emitted when application is reset */ - public event DaliEventHandler Reset + public new event DaliEventHandler Reset { add { diff --git a/Tizen.NUI/src/internal/Camera.cs b/Tizen.NUI/src/internal/Camera.cs index f91fcfb..7cfe070 100755 --- a/Tizen.NUI/src/internal/Camera.cs +++ b/Tizen.NUI/src/internal/Camera.cs @@ -204,7 +204,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public CameraType GetType() + public new CameraType GetType() { CameraType ret = (CameraType)NDalicPINVOKE.CameraActor_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/internal/ItemView.cs b/Tizen.NUI/src/internal/ItemView.cs index ad354db..5a2c375 100755 --- a/Tizen.NUI/src/internal/ItemView.cs +++ b/Tizen.NUI/src/internal/ItemView.cs @@ -83,7 +83,7 @@ namespace Tizen.NUI } } - public class Property + public new class Property { public static readonly int LAYOUT = NDalicManualPINVOKE.ItemView_Property_LAYOUT_get(); public static readonly int MINIMUM_SWIPE_SPEED = NDalicPINVOKE.ItemView_Property_MINIMUM_SWIPE_SPEED_get(); diff --git a/Tizen.NUI/src/internal/Model3dView.cs b/Tizen.NUI/src/internal/Model3dView.cs index cb053aa..1732b09 100755 --- a/Tizen.NUI/src/internal/Model3dView.cs +++ b/Tizen.NUI/src/internal/Model3dView.cs @@ -65,7 +65,7 @@ namespace Tizen.NUI base.Dispose(type); } - public class Property : global::System.IDisposable + public new class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/Tizen.NUI/src/internal/PageTurnView.cs b/Tizen.NUI/src/internal/PageTurnView.cs index 9a2ebbe..e9008f5 100755 --- a/Tizen.NUI/src/internal/PageTurnView.cs +++ b/Tizen.NUI/src/internal/PageTurnView.cs @@ -412,7 +412,7 @@ namespace Tizen.NUI } - public class Property : global::System.IDisposable + public new class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/Tizen.NUI/src/internal/Ruler.cs b/Tizen.NUI/src/internal/Ruler.cs index ce8e8e7..61080fe 100755 --- a/Tizen.NUI/src/internal/Ruler.cs +++ b/Tizen.NUI/src/internal/Ruler.cs @@ -98,7 +98,7 @@ namespace Tizen.NUI return ret; } - public Ruler.RulerType GetType() + public new Ruler.RulerType GetType() { Ruler.RulerType ret = (Ruler.RulerType)NDalicPINVOKE.Ruler_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/internal/RulerPtr.cs b/Tizen.NUI/src/internal/RulerPtr.cs index 548642e..cd2de6a 100755 --- a/Tizen.NUI/src/internal/RulerPtr.cs +++ b/Tizen.NUI/src/internal/RulerPtr.cs @@ -207,7 +207,7 @@ namespace Tizen.NUI return ret; } - public Ruler.RulerType GetType() + public new Ruler.RulerType GetType() { Ruler.RulerType ret = (Ruler.RulerType)NDalicPINVOKE.RulerPtr_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/internal/ViewWrapperImpl.cs b/Tizen.NUI/src/internal/ViewWrapperImpl.cs index 361ce7e..db0728a 100755 --- a/Tizen.NUI/src/internal/ViewWrapperImpl.cs +++ b/Tizen.NUI/src/internal/ViewWrapperImpl.cs @@ -59,44 +59,44 @@ namespace Tizen.NUI public delegate void OnTapDelegate(TapGesture tap); public delegate void OnLongPressDelegate(LongPressGesture longPress); - public OnStageConnectionDelegate OnStageConnection; - public OnStageDisconnectionDelegate OnStageDisconnection; - public OnChildAddDelegate OnChildAdd; - public OnChildRemoveDelegate OnChildRemove; - public OnPropertySetDelegate OnPropertySet; - public OnSizeSetDelegate OnSizeSet; - public OnSizeAnimationDelegate OnSizeAnimation; + public new OnStageConnectionDelegate OnStageConnection; + public new OnStageDisconnectionDelegate OnStageDisconnection; + public new OnChildAddDelegate OnChildAdd; + public new OnChildRemoveDelegate OnChildRemove; + public new OnPropertySetDelegate OnPropertySet; + public new OnSizeSetDelegate OnSizeSet; + public new OnSizeAnimationDelegate OnSizeAnimation; public OnTouchDelegate OnTouch; public OnHoverDelegate OnHover; public OnKeyDelegate OnKey; public OnWheelDelegate OnWheel; - public OnRelayoutDelegate OnRelayout; - public OnSetResizePolicyDelegate OnSetResizePolicy; - public GetNaturalSizeDelegate GetNaturalSize; - public CalculateChildSizeDelegate CalculateChildSize; - public GetHeightForWidthDelegate GetHeightForWidth; - public GetWidthForHeightDelegate GetWidthForHeight; + public new OnRelayoutDelegate OnRelayout; + public new OnSetResizePolicyDelegate OnSetResizePolicy; + public new GetNaturalSizeDelegate GetNaturalSize; + public new CalculateChildSizeDelegate CalculateChildSize; + public new GetHeightForWidthDelegate GetHeightForWidth; + public new GetWidthForHeightDelegate GetWidthForHeight; public RelayoutDependentOnChildrenDimensionDelegate RelayoutDependentOnChildrenDimension; - public RelayoutDependentOnChildrenDelegate RelayoutDependentOnChildren; - public OnCalculateRelayoutSizeDelegate OnCalculateRelayoutSize; - public OnLayoutNegotiatedDelegate OnLayoutNegotiated; - public OnControlChildAddDelegate OnControlChildAdd; - public OnControlChildRemoveDelegate OnControlChildRemove; - public OnStyleChangeDelegate OnStyleChange; - public OnAccessibilityActivatedDelegate OnAccessibilityActivated; - public OnAccessibilityPanDelegate OnAccessibilityPan; - public OnAccessibilityTouchDelegate OnAccessibilityTouch; - public OnAccessibilityValueChangeDelegate OnAccessibilityValueChange; - public OnAccessibilityZoomDelegate OnAccessibilityZoom; + public new RelayoutDependentOnChildrenDelegate RelayoutDependentOnChildren; + public new OnCalculateRelayoutSizeDelegate OnCalculateRelayoutSize; + public new OnLayoutNegotiatedDelegate OnLayoutNegotiated; + public new OnControlChildAddDelegate OnControlChildAdd; + public new OnControlChildRemoveDelegate OnControlChildRemove; + public new OnStyleChangeDelegate OnStyleChange; + public new OnAccessibilityActivatedDelegate OnAccessibilityActivated; + public new OnAccessibilityPanDelegate OnAccessibilityPan; + public new OnAccessibilityTouchDelegate OnAccessibilityTouch; + public new OnAccessibilityValueChangeDelegate OnAccessibilityValueChange; + public new OnAccessibilityZoomDelegate OnAccessibilityZoom; public OnFocusGainedDelegate OnFocusGained; public OnFocusLostDelegate OnFocusLost; - public GetNextFocusableViewDelegate GetNextFocusableView; - public OnFocusChangeCommittedDelegate OnFocusChangeCommitted; - public OnKeyboardEnterDelegate OnKeyboardEnter; - public OnPinchDelegate OnPinch; - public OnPanDelegate OnPan; - public OnTapDelegate OnTap; - public OnLongPressDelegate OnLongPress; + public new GetNextFocusableViewDelegate GetNextFocusableView; + public new OnFocusChangeCommittedDelegate OnFocusChangeCommitted; + public new OnKeyboardEnterDelegate OnKeyboardEnter; + public new OnPinchDelegate OnPinch; + public new OnPanDelegate OnPan; + public new OnTapDelegate OnTap; + public new OnLongPressDelegate OnLongPress; internal ViewWrapperImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapperImpl_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/Tizen.NUI/src/public/BaseComponents/CustomView.cs index 169e598..85fe1c6 100755 --- a/Tizen.NUI/src/public/BaseComponents/CustomView.cs +++ b/Tizen.NUI/src/public/BaseComponents/CustomView.cs @@ -480,8 +480,8 @@ namespace Tizen.NUI.BaseComponents /// /// Returns the natural size of the view. /// - /// The view's natural size. - public virtual Size2D GetNaturalSize() + /// The view's natural size + public new virtual Size2D GetNaturalSize() { return new Size2D(0, 0); } @@ -501,9 +501,9 @@ namespace Tizen.NUI.BaseComponents /// This method is called during size negotiation when a height is required for a given width.
/// Derived classes should override this if they wish to customize the height returned.
/// - /// The width to use. - /// The height based on the width. - public virtual float GetHeightForWidth(float width) + /// Width to use + /// The height based on the width + public new virtual float GetHeightForWidth(float width) { return viewWrapperImpl.GetHeightForWidthBase(width); } @@ -512,9 +512,9 @@ namespace Tizen.NUI.BaseComponents /// This method is called during size negotiation when a width is required for a given height.
/// Derived classes should override this if they wish to customize the width returned.
/// - /// The height to use. - /// The width based on the width. - public virtual float GetWidthForHeight(float height) + /// Height to use + /// The width based on the width + public new virtual float GetWidthForHeight(float height) { return viewWrapperImpl.GetWidthForHeightBase(height); } diff --git a/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs b/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs index 34ccd06..c4c87fe 100755 --- a/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs +++ b/Tizen.NUI/src/public/BaseComponents/FlexContainer.cs @@ -68,7 +68,7 @@ namespace Tizen.NUI.BaseComponents } - internal class Property + internal new class Property { internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get(); internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/Tizen.NUI/src/public/BaseComponents/ImageView.cs index b8cf4cd..a5c6202 100755 --- a/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -146,7 +146,7 @@ namespace Tizen.NUI.BaseComponents base.Dispose(type); } - internal class Property + internal new class Property { internal static readonly int RESOURCE_URL = NDalicPINVOKE.ImageView_Property_RESOURCE_URL_get(); internal static readonly int IMAGE = NDalicPINVOKE.ImageView_Property_IMAGE_get(); @@ -216,7 +216,7 @@ namespace Tizen.NUI.BaseComponents /// Most resources are only loaded when the control is placed on the stage.
/// True if the resources are loaded and ready, false otherwise.
/// - public bool IsResourceReady() + public new bool IsResourceReady() { bool ret = NDalicPINVOKE.IsResourceReady(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) diff --git a/Tizen.NUI/src/public/BaseComponents/Scrollable.cs b/Tizen.NUI/src/public/BaseComponents/Scrollable.cs index 3803986..0499a70 100755 --- a/Tizen.NUI/src/public/BaseComponents/Scrollable.cs +++ b/Tizen.NUI/src/public/BaseComponents/Scrollable.cs @@ -301,7 +301,7 @@ namespace Tizen.NUI.BaseComponents } - public class Property + public new class Property { public static readonly int OVERSHOOT_EFFECT_COLOR = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get(); public static readonly int OVERSHOOT_ANIMATION_SPEED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/TableView.cs b/Tizen.NUI/src/public/BaseComponents/TableView.cs index b40f847..0766f75 100755 --- a/Tizen.NUI/src/public/BaseComponents/TableView.cs +++ b/Tizen.NUI/src/public/BaseComponents/TableView.cs @@ -71,7 +71,7 @@ namespace Tizen.NUI.BaseComponents } - internal class Property + internal new class Property { internal static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get(); internal static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 42024c8..17185e7 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -237,7 +237,7 @@ namespace Tizen.NUI.BaseComponents } } - internal class Property + internal new class Property { internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/TextField.cs b/Tizen.NUI/src/public/BaseComponents/TextField.cs index 82843b6..898ea8d 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -221,7 +221,7 @@ namespace Tizen.NUI.BaseComponents } - internal class Property + internal new class Property { internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextField_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextField_Property_TEXT_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index de01b8e..32ca8f3 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -74,7 +74,7 @@ namespace Tizen.NUI.BaseComponents base.Dispose(type); } - internal class Property + internal new class Property { internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextLabel_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextLabel_Property_TEXT_get(); diff --git a/Tizen.NUI/src/public/BaseComponents/VideoView.cs b/Tizen.NUI/src/public/BaseComponents/VideoView.cs index 9659756..a70d5cb 100755 --- a/Tizen.NUI/src/public/BaseComponents/VideoView.cs +++ b/Tizen.NUI/src/public/BaseComponents/VideoView.cs @@ -144,7 +144,7 @@ namespace Tizen.NUI.BaseComponents } } - internal class Property + internal new class Property { internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get(); internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get(); diff --git a/Tizen.NUI/src/public/Geometry.cs b/Tizen.NUI/src/public/Geometry.cs index 4752be2..b65ad88 100755 --- a/Tizen.NUI/src/public/Geometry.cs +++ b/Tizen.NUI/src/public/Geometry.cs @@ -101,7 +101,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Geometry.Type GetType() + public new Geometry.Type GetType() { Geometry.Type ret = (Geometry.Type)NDalicPINVOKE.Geometry_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/KeyFrames.cs b/Tizen.NUI/src/public/KeyFrames.cs index afc6db6..39d86ef 100755 --- a/Tizen.NUI/src/public/KeyFrames.cs +++ b/Tizen.NUI/src/public/KeyFrames.cs @@ -113,8 +113,8 @@ namespace Tizen.NUI /// /// Gets the type of the key frame. /// - /// The key frame property type. - public PropertyType GetType() + /// The key frame property type + public new PropertyType GetType() { PropertyType ret = (PropertyType)NDalicPINVOKE.KeyFrames_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Property.cs b/Tizen.NUI/src/public/Property.cs index 35c1ca2..702c8bc 100755 --- a/Tizen.NUI/src/public/Property.cs +++ b/Tizen.NUI/src/public/Property.cs @@ -1439,8 +1439,8 @@ namespace Tizen.NUI /// /// Queries the type of this property value. /// - /// The type ID. - public PropertyType GetType() + /// The type ID + public new PropertyType GetType() { PropertyType ret = (PropertyType)NDalicPINVOKE.Property_Value_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/UIComponents/Button.cs b/Tizen.NUI/src/public/UIComponents/Button.cs index 71e0b6f..1cffbcc 100755 --- a/Tizen.NUI/src/public/UIComponents/Button.cs +++ b/Tizen.NUI/src/public/UIComponents/Button.cs @@ -523,7 +523,7 @@ namespace Tizen.NUI.UIComponents } } - internal class Property + internal new class Property { internal static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get(); internal static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get(); diff --git a/Tizen.NUI/src/public/UIComponents/Popup.cs b/Tizen.NUI/src/public/UIComponents/Popup.cs index 3241f49..55e5b70 100755 --- a/Tizen.NUI/src/public/UIComponents/Popup.cs +++ b/Tizen.NUI/src/public/UIComponents/Popup.cs @@ -340,7 +340,7 @@ namespace Tizen.NUI.UIComponents } } - internal class Property + internal new class Property { internal static readonly int TITLE = NDalicPINVOKE.Popup_Property_TITLE_get(); internal static readonly int CONTENT = NDalicPINVOKE.Popup_Property_CONTENT_get(); diff --git a/Tizen.NUI/src/public/UIComponents/ProgressBar.cs b/Tizen.NUI/src/public/UIComponents/ProgressBar.cs index a1f2377..43191d5 100755 --- a/Tizen.NUI/src/public/UIComponents/ProgressBar.cs +++ b/Tizen.NUI/src/public/UIComponents/ProgressBar.cs @@ -171,7 +171,7 @@ namespace Tizen.NUI.UIComponents } } - internal class Property + internal new class Property { 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(); diff --git a/Tizen.NUI/src/public/UIComponents/PushButton.cs b/Tizen.NUI/src/public/UIComponents/PushButton.cs index 6d4079a..d587b67 100755 --- a/Tizen.NUI/src/public/UIComponents/PushButton.cs +++ b/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -72,7 +72,7 @@ namespace Tizen.NUI.UIComponents } - internal class Property + internal new class Property { internal static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get(); internal static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get(); @@ -173,7 +173,7 @@ namespace Tizen.NUI.UIComponents } } [Obsolete("Please do not use! this will be deprecated")] - public Vector4 LabelPadding + public new Vector4 LabelPadding { get { diff --git a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 0687957..32844d9 100755 --- a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -197,7 +197,7 @@ namespace Tizen.NUI.UIComponents } - internal class Property + internal new class Property { 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(); diff --git a/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/Tizen.NUI/src/public/UIComponents/ScrollView.cs index a545c16..ea6acdc 100755 --- a/Tizen.NUI/src/public/UIComponents/ScrollView.cs +++ b/Tizen.NUI/src/public/UIComponents/ScrollView.cs @@ -297,7 +297,7 @@ namespace Tizen.NUI } - public class Property + public new class Property { public static readonly int WRAP_ENABLED = NDalicPINVOKE.ScrollView_Property_WRAP_ENABLED_get(); public static readonly int PANNING_ENABLED = NDalicPINVOKE.ScrollView_Property_PANNING_ENABLED_get(); diff --git a/Tizen.NUI/src/public/UIComponents/Slider.cs b/Tizen.NUI/src/public/UIComponents/Slider.cs index a83fff4..928646d 100755 --- a/Tizen.NUI/src/public/UIComponents/Slider.cs +++ b/Tizen.NUI/src/public/UIComponents/Slider.cs @@ -356,7 +356,7 @@ namespace Tizen.NUI.UIComponents return ret; } - internal class Property : global::System.IDisposable + internal new class Property : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/Tizen.NUI/src/public/UIComponents/ToggleButton.cs b/Tizen.NUI/src/public/UIComponents/ToggleButton.cs index fe3eef4..a861e95 100755 --- a/Tizen.NUI/src/public/UIComponents/ToggleButton.cs +++ b/Tizen.NUI/src/public/UIComponents/ToggleButton.cs @@ -65,7 +65,7 @@ namespace Tizen.NUI base.Dispose(type); } - public class Property + public new class Property { public static readonly int STATE_VISUALS = NDalicPINVOKE.ToggleButton_Property_STATE_VISUALS_get(); public static readonly int TOOLTIPS = NDalicPINVOKE.ToggleButton_Property_TOOLTIPS_get(); diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs index 07a3873..a6f99f0 100755 --- a/Tizen.NUI/src/public/VisualMaps.cs +++ b/Tizen.NUI/src/public/VisualMaps.cs @@ -1615,7 +1615,7 @@ namespace Tizen.NUI /// Applies to all shapes.
/// Optional. /// - public Color MixColor + public new Color MixColor { get { diff --git a/Tizen.NUI/src/public/WidgetView.cs b/Tizen.NUI/src/public/WidgetView.cs index 9f95d7a..26c716f 100755 --- a/Tizen.NUI/src/public/WidgetView.cs +++ b/Tizen.NUI/src/public/WidgetView.cs @@ -81,7 +81,7 @@ namespace Tizen.NUI base.Dispose(); } - internal class Property + internal new class Property { internal static readonly int WIDGET_ID = NDalicManualPINVOKE.WidgetView_Property_WIDGET_ID_get(); internal static readonly int INSTANCE_ID = NDalicManualPINVOKE.WidgetView_Property_INSTANCE_ID_get(); -- 2.7.4