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 <huiyu.eun@samsung.com>
- public class Padding : global::System.IDisposable
+ public new class Padding : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
protected bool swigCMemOwn;
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();
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();
* (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
+ public new event DaliEventHandler<object, NUIApplicationResetEventArgs> Reset
{
add
{
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();
}
}
- 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();
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;
}
- public class Property : global::System.IDisposable
+ public new class Property : global::System.IDisposable
{
private global::System.Runtime.InteropServices.HandleRef swigCPtr;
protected bool swigCMemOwn;
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();
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();
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)
{
/// <summary>
/// Returns the natural size of the view.
/// </summary>
- /// <returns>The view's natural size.</returns>
- public virtual Size2D GetNaturalSize()
+ /// <returns>The view's natural size</returns>
+ public new virtual Size2D GetNaturalSize()
{
return new Size2D(0, 0);
}
/// This method is called during size negotiation when a height is required for a given width.<br>
/// Derived classes should override this if they wish to customize the height returned.<br>
/// </summary>
- /// <param name="width">The width to use.</param>
- /// <returns>The height based on the width.</returns>
- public virtual float GetHeightForWidth(float width)
+ /// <param name="width">Width to use</param>
+ /// <returns>The height based on the width</returns>
+ public new virtual float GetHeightForWidth(float width)
{
return viewWrapperImpl.GetHeightForWidthBase(width);
}
/// This method is called during size negotiation when a width is required for a given height.<br>
/// Derived classes should override this if they wish to customize the width returned.<br>
/// </summary>
- /// <param name="height">The height to use.</param>
- /// <returns>The width based on the width.</returns>
- public virtual float GetWidthForHeight(float height)
+ /// <param name="height">Height to use</param>
+ /// <returns>The width based on the width</returns>
+ public new virtual float GetWidthForHeight(float height)
{
return viewWrapperImpl.GetWidthForHeightBase(height);
}
}
- 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();
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();
/// Most resources are only loaded when the control is placed on the stage.<br>
/// True if the resources are loaded and ready, false otherwise.<br>
/// </summary>
- public bool IsResourceReady()
+ public new bool IsResourceReady()
{
bool ret = NDalicPINVOKE.IsResourceReady(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending)
}
- 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();
}
- 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();
}
}
- 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();
}
- 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();
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();
}
}
- 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();
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();
/// <summary>
/// Gets the type of the key frame.
/// </summary>
- /// <returns>The key frame property type.</returns>
- public PropertyType GetType()
+ /// <returns>The key frame property type</returns>
+ public new PropertyType GetType()
{
PropertyType ret = (PropertyType)NDalicPINVOKE.KeyFrames_GetType(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
/// <summary>
/// Queries the type of this property value.
/// </summary>
- /// <returns>The type ID.</returns>
- public PropertyType GetType()
+ /// <returns>The type ID</returns>
+ public new PropertyType GetType()
{
PropertyType ret = (PropertyType)NDalicPINVOKE.Property_Value_GetType(swigCPtr);
if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
}
}
- 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();
}
}
- 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();
}
}
- 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();
}
- 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();
}
}
[Obsolete("Please do not use! this will be deprecated")]
- public Vector4 LabelPadding
+ public new Vector4 LabelPadding
{
get
{
}
- 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();
}
- 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();
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;
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();
/// Applies to all shapes.<br>
/// Optional.
/// </summary>
- public Color MixColor
+ public new Color MixColor
{
get
{
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();
projects / platform / core / csapi / nui.git / commitdiff