Remove deprecated APIs in Tizen 3.0

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

diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h
index 3d1e002..3db29be 100644 (file)
--- a/dali/public-api/actors/layer.h
+++ b/dali/public-api/actors/layer.h
@@ -2,7 +2,7 @@
 #define DALI_LAYER_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <cstdint> // uint32_t
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/actors/actor.h>
@@ -43,7 +46,7 @@ class Layer;
  * @SINCE_1_0.0
  * @see Dali::Layer::SetClippingBox()
  */
-typedef Rect<int> ClippingBox;
+typedef Rect<int32_t> ClippingBox;
 
 /**
  * @brief Layers provide a mechanism for overlaying groups of actors on top of each other.
@@ -58,10 +61,10 @@ typedef Rect<int> ClippingBox;
  * need for it based on the layer's contents; actors in lower layers cannot
  * obscure actors in higher layers.
  *
- * A layer has either LAYER_2D or LAYER_3D mode. LAYER_2D has better
+ * A layer has either LAYER_UI or LAYER_3D mode. LAYER_UI has better
  * performance, the depth test is disabled, and a child actor hides its
  * parent actor.  LAYER_3D uses the depth test, thus a close actor hides a
- * farther one.  LAYER_2D is the default mode and recommended for general
+ * farther one.  LAYER_UI is the default mode and recommended for general
  * cases.  See Layer::Behavior and SetBehavior() for more information.
  *
  * Layer is a type of Actor, thus can have parent or children actors.  A
@@ -80,7 +83,7 @@ typedef Rect<int> ClippingBox;
  * | lowerToBottom   | @ref LowerToBottom() |
  * @SINCE_1_0.0
  */
-class DALI_IMPORT_API Layer : public Actor
+class DALI_CORE_API Layer : public Actor
 {
 public:
 
@@ -101,7 +104,7 @@ public:
     enum
     {
       CLIPPING_ENABLE = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "clippingEnable",   type bool @SINCE_1_0.0
-      CLIPPING_BOX,                                                 ///< name "clippingBox",      type Rect<int> @SINCE_1_0.0
+      CLIPPING_BOX,                                                 ///< name "clippingBox",      type Rect<int32_t> @SINCE_1_0.0
       BEHAVIOR,                                                     ///< name "behavior",         type String @SINCE_1_0.0
     };
   };
@@ -115,14 +118,6 @@ public:
   enum Behavior
   {
     /**
-     * @DEPRECATED_1_1.45, use LAYER_UI instead
-     * @brief UI control rendering mode.
-     * @SINCE_1_0.0
-     * @see LAYER_UI
-     */
-    LAYER_2D,
-
-    /**
      * @brief UI control rendering mode (default mode).
      *
      * This mode is designed for UI controls that can overlap. In this
@@ -152,7 +147,7 @@ public:
      *
      * @SINCE_1_1.45
      */
-    LAYER_UI = LAYER_2D,
+    LAYER_UI,
 
     /**
      * @brief Layer will use depth test.
@@ -263,7 +258,7 @@ public:
    * @pre Layer is on the stage.
    * If layer is not added to the stage, returns 0.
    */
-  unsigned int GetDepth() const;
+  uint32_t GetDepth() const;
 
   /**
    * @brief Increments the depth of the layer.
@@ -391,7 +386,7 @@ public:
    * @param[in] width The width of the box
    * @param[in] height The height of the box
    */
-  void SetClippingBox(int x, int y, int width, int height);
+  void SetClippingBox(int32_t x, int32_t y, int32_t width, int32_t height);
 
   /**
    * @brief Sets the clipping box of a layer in window coordinates.