-#ifndef __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
-#define __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_ALIGNMENT_H
+#define DALI_TOOLKIT_INTERNAL_ALIGNMENT_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.
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
namespace Dali
{
private: // From Control
/**
+ * @copydoc Control::OnInitialize()
+ */
+ virtual void OnInitialize() override;
+
+ /**
* @copydoc Control::OnRelayout()
*/
- virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+ void OnRelayout( const Vector2& size, RelayoutContainer& container ) override;
private:
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__
+#endif // DALI_TOOLKIT_INTERNAL_ALIGNMENT_H