Remove deprecated APIs in Tizen 3.0

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

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 97756b0..d0c2f98 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -30,6 +30,8 @@
 #include <dali/public-api/object/property-index-ranges.h>
 #include <dali/public-api/signals/dali-signal.h>
 
+#undef SIZE_WIDTH // Defined in later versions of cstdint but is used in this header
+
 namespace Dali
 {
 /**
@@ -296,7 +298,6 @@ public:
       INHERIT_ORIENTATION,                                ///< name "inheritOrientation",    type bool        @SINCE_1_0.0
       INHERIT_SCALE,                                      ///< name "inheritScale",          type bool        @SINCE_1_0.0
       COLOR_MODE,                                         ///< name "colorMode",             type std::string @SINCE_1_0.0
-      POSITION_INHERITANCE,                               ///< name "positionInheritance",   type std::string @DEPRECATED_1_1.24 Use INHERIT_POSITION instead
       DRAW_MODE,                                          ///< name "drawMode",              type std::string @SINCE_1_0.0
       SIZE_MODE_FACTOR,                                   ///< name "sizeModeFactor",        type Vector3     @SINCE_1_0.0
       WIDTH_RESIZE_POLICY,                                ///< name "widthResizePolicy",     type String      @SINCE_1_0.0
@@ -655,6 +656,7 @@ public:
    * @return The actor's target size
    * @pre The actor has been initialized.
    * @note This return is the value that was set using SetSize or the target size of an animation.
+   *       It may not match the current value in some cases, i.e. when the animation is progressing or the maximum or minimum size is set.
    */
   Vector3 GetTargetSize() const;
 
@@ -781,19 +783,6 @@ public:
   Vector3 GetCurrentWorldPosition() const;
 
   /**
-   * @DEPRECATED_1_1.24 Use SetInheritPosition instead
-   * @brief Sets the actors position inheritance mode.
-   *
-   * The default is to inherit.
-   * Switching this off means that using SetPosition() sets the actor's world position.
-   * @SINCE_1_0.0
-   * @param[in] mode to use
-   * @pre The Actor has been initialized.
-   * @see PositionInheritanceMode
-   */
-  void SetPositionInheritanceMode( PositionInheritanceMode mode ) DALI_DEPRECATED_API;
-
-  /**
    * @brief Sets whether a child actor inherits it's parent's position.
    *
    * Default is to inherit.
@@ -809,16 +798,6 @@ public:
   }
 
   /**
-   * @DEPRECATED_1_1.24 Use IsPositionInherited
-   * @brief Returns the actors position inheritance mode.
-   *
-   * @SINCE_1_0.0
-   * @return Return the position inheritance mode
-   * @pre The Actor has been initialized.
-   */
-  PositionInheritanceMode GetPositionInheritanceMode() const DALI_DEPRECATED_API;
-
-  /**
    * @brief Returns whether the actor inherits its parent's position.
    *
    * @SINCE_1_1.24