[dali_1.0.16] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / public-api / controls / tool-bar / tool-bar.h

diff --git a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
index 6fc2e61..1bbb0d1 100644 (file)
--- a/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
+++ b/optional/dali-toolkit/public-api/controls/tool-bar/tool-bar.h
@@ -22,10 +22,9 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/alignment/alignment.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -44,7 +43,7 @@ class ToolBar;
  * is not forbidden, it adds controls on the left group with a size of 10% of the total tool bar size.
  * Dali::Actor::Remove() method does nothing.
  */
-class ToolBar : public Control
+class DALI_IMPORT_API ToolBar : public Control
 {
 public:
   static const Toolkit::Alignment::Padding DEFAULT_PADDING; ///< Default padding space between controls. By default all values are set to 0.
@@ -68,9 +67,11 @@ public:
   ToolBar& operator=( const ToolBar& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~ToolBar();
+  ~ToolBar();
 
   /**
    * Create an initialized ToolBar.
@@ -116,13 +117,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  ToolBar( Internal::ToolBar& implementation );
+  DALI_INTERNAL ToolBar( Internal::ToolBar& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  ToolBar( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL ToolBar( Dali::Internal::CustomActor* internal );
 };
 
 } // namespace Toolkit