X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.h;h=ed68e1570edb96baa8918c1ccb8d428176a28251;hp=8e522a24cbde066df11342a54dcc4fecfc445f72;hb=refs%2Fchanges%2F99%2F210399%2F9;hpb=4365dab5fd64788ab0c1215ac6f14619cfb9a67d

diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index 8e522a2..ed68e15 100644
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_CONTROL_H__
-#define __DALI_TOOLKIT_CONTROL_H__
+#ifndef DALI_TOOLKIT_CONTROL_H
+#define DALI_TOOLKIT_CONTROL_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/actors/custom-actor.h>
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/public-api/events/long-press-gesture-detector.h>
 #include <dali/public-api/events/pan-gesture-detector.h>
 #include <dali/public-api/events/pinch-gesture-detector.h>
@@ -72,7 +72,7 @@ class Control;
  * |------------------------|----------------------------------------------------|
  * | accessibilityActivated | %OnAccessibilityActivated()                        |
  */
-class DALI_IMPORT_API Control : public CustomActor
+class DALI_TOOLKIT_API Control : public CustomActor
 {
 public:
 
@@ -107,26 +107,8 @@ public:
        */
       STYLE_NAME = PROPERTY_START_INDEX,
 
-      /**
-       * @DEPRECATED_1_1.3
-       * @brief The background color of the control.
-       *
-       * Mutually exclusive with BACKGROUND_IMAGE & BACKGROUND.
-       * @details Name "backgroundColor", type Property::VECTOR4.
-       * @see Toolkit::Control::SetStyleName()
-       * @SINCE_1_0.0
-       */
-      BACKGROUND_COLOR,
-
-      /**
-       * @DEPRECATED_1_1.3
-       * @brief The background image of the control.
-       *
-       * Mutually exclusive with BACKGROUND_COLOR & BACKGROUND.
-       * @details Name "backgroundImage", type Property::MAP.
-       * @SINCE_1_0.0
-       */
-      BACKGROUND_IMAGE,
+      RESERVED_PROPERTY_01, ///< Reserved index for a removed property.
+      RESERVED_PROPERTY_02, ///< Reserved index for a removed property.
 
       /**
        * @brief Receives key events to the control.
@@ -139,7 +121,6 @@ public:
       /**
        * @brief The background of the control.
        *
-       * Mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE.
        * @details Name "background", type Property::MAP or std::string for URL or Property::VECTOR4 for Color.
        * @SINCE_1_1.3
        */
@@ -362,26 +343,6 @@ public:
   void SetBackgroundColor( const Vector4& color );
 
   /**
-   * @DEPRECATED_1_1.3
-   *
-   * @brief Retrieves the background color of the control.
-   *
-   * @SINCE_1_0.0
-   * @return The background color of the control
-   */
-  Vector4 GetBackgroundColor() const DALI_DEPRECATED_API;
-
-  /**
-   * @DEPRECATED_1_2_8, use Property::BACKGROUND instead
-   *
-   * @brief Sets an image as the background of the control.
-   *
-   * @SINCE_1_0.0
-   * @param[in] image The image to set as the background
-   */
-  void SetBackgroundImage( Image image ) DALI_DEPRECATED_API;
-
-  /**
    * @brief Clears the background.
    * @SINCE_1_0.0
    */
@@ -572,4 +533,4 @@ public: // Templates for Deriving Classes
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_CONTROL_H__
+#endif // DALI_TOOLKIT_CONTROL_H