#ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
#define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include <dali/dali.h>
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// EXTERNAL INCLUDES
+#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
{
* 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:
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 );
-private: // From ControlImpl
+private: // From Control
/**
* @copydoc Toolkit::Control::OnInitialize()
* 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()
- */
- virtual void OnControlChildAdd(Actor& child);
-
- /**
- * Called when the tool-bar is relaid out.
- * @param[in] size The size allocated.
- * @param[in/out] container the container to put actors not handled.
+ * @see Control::OnChildAdd()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnChildAdd(Actor& child);
private:
/**