[dali_1.0.1] Merge branch 'tizen'

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

diff --git a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 9843ae6..8f03f8c 100644 (file)
--- a/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/optional/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -40,7 +40,7 @@ namespace Internal
  * ToolBar is a control to create a tool bar.
  * @see Dali::Toolkit::ToolBar for more details.
  */
-class ToolBar : public ControlImpl
+class ToolBar : public Control
 {
 public:
 
@@ -65,7 +65,7 @@ public:
    */
   void RemoveControl( Dali::Actor control );
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
@@ -76,7 +76,7 @@ private: // From ControlImpl
    * 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 Toolkit::ControlImpl::OnControlChildAdd()
+   * @see Control::OnControlChildAdd()
    */
   virtual void OnControlChildAdd(Actor& child);