X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.h;h=2d6b98192b11f9643cc2498e51401b5096fc1ebd;hp=933943ec0d0f6ec0b9402fde2406f85ea5f1f9f5;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 933943e..2d6b981 100644
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
-#define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
+#ifndef DALI_TOOLKIT_INTERNAL_TOOL_BAR_H
+#define DALI_TOOLKIT_INTERNAL_TOOL_BAR_H
 
 /*
- * Copyright (c) 2014 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.
@@ -19,12 +19,12 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/tool-bar/tool-bar.h>
 #include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
 
 namespace Dali
 {
@@ -52,17 +52,12 @@ public:
   static Toolkit::ToolBar New();
 
   /**
-   * @copydoc Dali::Toolkit::View::SetBackground()
-   */
-  void SetBackground( Actor background );
-
-  /**
-   * @copydoc Dali::Toolkit::View::AddControl()
+   * @copydoc Dali::Toolkit::ToolBar::AddControl()
    */
   void AddControl( Dali::Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding );
 
   /**
-   * @copydoc Dali::Toolkit::View::RemoveControl()
+   * @copydoc Dali::Toolkit::ToolBar::RemoveControl()
    */
   void RemoveControl( Dali::Actor control );
 
@@ -77,15 +72,9 @@ private: // From Control
    * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group).
    * @param child The control to be added.
    *
-   * @see Control::OnControlChildAdd()
-   */
-  virtual void OnControlChildAdd(Actor& child);
-
-  /**
-   *
-   * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+   * @see Control::OnChildAdd()
    */
-  virtual void OnControlSizeSet( const Vector3& targetSize );
+  virtual void OnChildAdd(Actor& child);
 
 private:
   /**
@@ -135,8 +124,6 @@ private:
   float              mRightRelativeSpace;       ///< Relative space between center and right groups of controls.
   float              mAccumulatedRelativeSpace; ///< Stores the total percentage space used by controls.
   bool               mInitializing;             ///< Allows the use of Actor's API to add controls.
-  Vector3            mToolBarSize;              ///< The size of tool bar
-  Actor              mBackground;               ///< The background of the tool bar
 
   std::map<Actor/*control*/,Toolkit::Alignment> mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view.
 };
@@ -168,4 +155,4 @@ inline const Toolkit::Internal::ToolBar& GetImpl( const Toolkit::ToolBar& toolBa
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
+#endif // DALI_TOOLKIT_INTERNAL_TOOL_BAR_H