X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fflex-container%2Fflex-container-impl.h;h=a4cb2691480dbb13564d6f137f01c42cc8f773ba;hp=71fec8e9dd9f75a3294f69813a13c7ea16bbe864;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=314c314b2b44e77d5f9b48056c83bc9f33f58130

diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
index 71fec8e..a4cb269 100755
--- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
+++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
-#define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H
+#define DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_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.
@@ -24,10 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/flex-container/flex-container.h>
-extern "C"
-{
-#include <dali-toolkit/third-party/facebook-flexbox/layout.h>
-}
+#include <dali-toolkit/third-party/yoga/Yoga.h>
 
 namespace Dali
 {
@@ -39,7 +36,7 @@ namespace Internal
 {
 
 /**
- * FlexContainer is a custom control for laying out actors in a flexbox layout
+ * FlexContainer is a custom control for laying out actors in a Flexbox layout
  * @see Dali::Toolkit:FlexContainer for more details
  */
 class FlexContainer : public Control
@@ -52,7 +49,7 @@ public:
   struct FlexItemNode
   {
     WeakHandle< Dali::Actor > actor;      ///< Actor handle of the flex item
-    css_node_t* node;                     ///< The style properties and layout information
+    YGNodeRef node;                     ///< The style properties and layout information
   };
 
   typedef std::vector< FlexItemNode > FlexItemNodeContainer;
@@ -274,4 +271,4 @@ inline const Toolkit::Internal::FlexContainer& GetImpl( const Toolkit::FlexConta
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
+#endif // DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H