Revert "[Tizen] Change the API macros for layout"

This reverts commit 6ae5497d0b0d6f94d43261b2d527a4f590ee6fe2.

diff --git a/dali-toolkit/devel-api/layouting/hbox-layout.h b/dali-toolkit/devel-api/layouting/hbox-layout.h
index b62e716..7634b37 100644 (file)
--- a/dali-toolkit/devel-api/layouting/hbox-layout.h
+++ b/dali-toolkit/devel-api/layouting/hbox-layout.h
@@ -22,7 +22,6 @@
 #include <dali-toolkit/devel-api/layouting/layout-group.h>
 #include <dali-toolkit/devel-api/layouting/layout-size.h>
 #include <dali-toolkit/public-api/toolkit-property-index-ranges.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -38,7 +37,7 @@ class HboxLayout;
  * This class implements a horizontal box layout, automatically handling
  * right to left or left to right direction change.
  */
-class DALI_TOOLKIT_API HboxLayout : public LayoutGroup
+class DALI_IMPORT_API HboxLayout : public LayoutGroup
 {
 public:
 

diff --git a/dali-toolkit/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h
index fe955a4..db5cc5b 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-controller.h
+++ b/dali-toolkit/devel-api/layouting/layout-controller.h
@@ -36,7 +36,7 @@ class LayoutController;
  * @brief Controls the process of layouting the control tree. It provides methods to enable
  * controls to re-layout and internal systems to separately measure and layout controls.
  */
-class DALI_TOOLKIT_API LayoutController : public BaseHandle
+class DALI_IMPORT_API LayoutController : public BaseHandle
 {
 public:
   /**

diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.h b/dali-toolkit/devel-api/layouting/layout-group-impl.h
index f827c30..025950c 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-group-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-group-impl.h
@@ -54,8 +54,8 @@ using LayoutGroupPtr = IntrusivePtr<LayoutGroup>;
  * OnLayout should use it's own layout parameters and the measured children's size to determine the children's
  * position and size; it should then call Layout() on the child layout to layout the child and it's hierarchy.
  */
-class DALI_TOOLKIT_API LayoutGroup : public LayoutItem,
-                                     public ConnectionTracker
+class DALI_IMPORT_API LayoutGroup : public LayoutItem,
+                                    public ConnectionTracker
 {
 public:
   /**

diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h
index 2660f99..c6b777b 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-group.h
+++ b/dali-toolkit/devel-api/layouting/layout-group.h
@@ -22,7 +22,6 @@
 #include <dali-toolkit/devel-api/toolkit-property-index-ranges.h>
 #include <dali-toolkit/devel-api/layouting/layout-item.h>
 #include <dali-toolkit/devel-api/layouting/measure-spec.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -50,7 +49,7 @@ class LayoutGroup;
  * To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body.
  *
  */
-class DALI_TOOLKIT_API LayoutGroup : public LayoutItem
+class DALI_IMPORT_API LayoutGroup : public LayoutItem
 {
 public:
   using LayoutId = unsigned int;

diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h
index 0fe7df9..e91e7f9 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h
@@ -44,8 +44,8 @@ using LayoutItemPtr = IntrusivePtr<LayoutItem>;
 /**
  * Base class for layouts.
  */
-class DALI_TOOLKIT_API LayoutItem : public BaseObject,
-                                    public LayoutParent
+class DALI_IMPORT_API LayoutItem : public BaseObject,
+                                   public LayoutParent
 {
 public:
   /**

diff --git a/dali-toolkit/devel-api/layouting/layout-item.h b/dali-toolkit/devel-api/layouting/layout-item.h
index bfe776f..3bb96bb 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-item.h
+++ b/dali-toolkit/devel-api/layouting/layout-item.h
@@ -24,7 +24,6 @@
 #include <dali/public-api/object/property-index-ranges.h>
 #include <dali-toolkit/devel-api/layouting/child-layout-data.h>
 #include <dali-toolkit/devel-api/layouting/measure-spec.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -43,7 +42,7 @@ using LayoutId = unsigned int;
  * Base class for layouts. It is used to layout a control (or visual).
  * It can be laid out by a LayoutGroup.
  */
-class DALI_TOOLKIT_API LayoutItem : public BaseHandle
+class DALI_IMPORT_API LayoutItem : public BaseHandle
 {
 public:
 

diff --git a/dali-toolkit/devel-api/layouting/layout-parent-impl.h b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
index a6d76c3..392a2ab 100644 (file)
--- a/dali-toolkit/devel-api/layouting/layout-parent-impl.h
+++ b/dali-toolkit/devel-api/layouting/layout-parent-impl.h
@@ -17,8 +17,6 @@
  * limitations under the License.
  */
 
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
 namespace Dali
 {
 namespace Toolkit
@@ -32,7 +30,7 @@ namespace Internal
  * Needed to prevent circular inheritance - most LayoutBases have a parent,
  * but parenting is provided by LayoutGroup, which is a sub-class of LayoutBase.
  */
-class DALI_TOOLKIT_API LayoutParent
+class DALI_IMPORT_API LayoutParent
 {
 public:
   /**

diff --git a/dali-toolkit/devel-api/layouting/measure-spec.h b/dali-toolkit/devel-api/layouting/measure-spec.h
index 04c4d01..92a03f2 100644 (file)
--- a/dali-toolkit/devel-api/layouting/measure-spec.h
+++ b/dali-toolkit/devel-api/layouting/measure-spec.h
@@ -19,7 +19,6 @@
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/devel-api/layouting/layout-length.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 #include <sstream>
 
@@ -33,7 +32,7 @@ namespace Toolkit
  * how to be measured. For instance, it may measure a child with an exact width and an unspecified
  * height in order to determine height for width.
  */
-class DALI_TOOLKIT_API MeasureSpec
+class DALI_IMPORT_API MeasureSpec
 {
 public:
   using IntType = LayoutLength::IntType;

diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h
index 4acdd70..3e38a1e 100644 (file)
--- a/dali-toolkit/devel-api/layouting/measured-size.h
+++ b/dali-toolkit/devel-api/layouting/measured-size.h
@@ -19,7 +19,6 @@
 
 #include <dali/public-api/common/dali-common.h>
 #include <dali-toolkit/devel-api/layouting/layout-length.h>
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -29,7 +28,7 @@ namespace Toolkit
 /**
  * Class that encodes a measurement and a measure state, which is set if the measured size is too small.
  */
-class DALI_TOOLKIT_API MeasuredSize
+class DALI_IMPORT_API MeasuredSize
 {
 public:
 

diff --git a/dali-toolkit/devel-api/layouting/vbox-layout.h b/dali-toolkit/devel-api/layouting/vbox-layout.h
index 220872e..f04a4bd 100644 (file)
--- a/dali-toolkit/devel-api/layouting/vbox-layout.h
+++ b/dali-toolkit/devel-api/layouting/vbox-layout.h
@@ -36,7 +36,7 @@ class VboxLayout;
  * This class implements a vertical box layout, automatically handling
  * right to left or left to right direction change.
  */
-class DALI_TOOLKIT_API VboxLayout : public LayoutGroup
+class DALI_IMPORT_API VboxLayout : public LayoutGroup
 {
 public: