Remove deprecated APIs in Tizen 3.0

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor-enumerations.h

diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h
index a60e8c7..7b82148 100644 (file)
--- a/dali/public-api/actors/actor-enumerations.h
+++ b/dali/public-api/actors/actor-enumerations.h
@@ -41,19 +41,6 @@ enum ColorMode
 };
 
 /**
- * @DEPRECATED_1_1.24 Use SetInheritPosition instead
- * @brief Enumeration for Actor position inheritance mode.
- * @SINCE_1_0.0
- */
-enum PositionInheritanceMode
-{
-  INHERIT_PARENT_POSITION,                 ///< Actor will inherit its parent position. This is the default @SINCE_1_0.0
-  USE_PARENT_POSITION,                     ///< Actor will copy its parent position. This is useful if many actors are stacked together in the same place. This option ignores parent origin and anchor point. @SINCE_1_0.0
-  USE_PARENT_POSITION_PLUS_LOCAL_POSITION, ///< Actor will copy its parent position and add local position. This is useful if many actors are stacked together in the same place with an offset.  This option ignores parent origin and anchor point. @SINCE_1_0.0
-  DONT_INHERIT_POSITION                    ///< Actor will not inherit position. Local position is treated as world position. This is useful if a constraint is used to override local position or if an actor is positioned globally. This option ignores parent origin, anchor point and local position. @SINCE_1_0.0
-};
-
-/**
  * @brief Enumeration for layout Dimensions.
  * @SINCE_1_0.0
  */
@@ -175,7 +162,6 @@ enum Type
  */
 namespace ClippingMode
 {
-
 /**
  * @brief Enumeration for ClippingMode types.
  * @SINCE_1_2_5
@@ -183,7 +169,8 @@ namespace ClippingMode
 enum Type
 {
   DISABLED,                     ///< This Actor will not clip its children. @SINCE_1_2_5
-  CLIP_CHILDREN,                ///< This Actor will clip all children to within its boundaries (the actor will also be visible itself). @SINCE_1_2_5
+  CLIP_CHILDREN,                ///< This Actor will clip itself and all children to within the pixel areas of this actors renderers. @SINCE_1_2_5
+  CLIP_TO_BOUNDING_BOX          ///< This Actor will clip itself and all children to within a screen-aligned rectangle encompassing its boundaries. @SINCE_1_2.61
 };
 
 } // namespace ClippingMode