projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Fix role setting
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
alignment
/
alignment-impl.h
diff --git
a/dali-toolkit/internal/controls/alignment/alignment-impl.h
b/dali-toolkit/internal/controls/alignment/alignment-impl.h
index
83f5301
..
64d352a
100644
(file)
--- a/
dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/
dali-toolkit/internal/controls/alignment/alignment-impl.h
@@
-20,7
+20,8
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// 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
{
namespace Dali
{
@@
-82,9
+83,14
@@
public:
private: // From Control
/**
private: // From Control
/**
+ * @copydoc Control::OnInitialize()
+ */
+ virtual void OnInitialize() override;
+
+ /**
* @copydoc Control::OnRelayout()
*/
* @copydoc Control::OnRelayout()
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
private:
private: