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
Remove incorrect placement actor from the RegisterVisual API
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
index
a100a1f
..
a71f953
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
@@
-74,14
+74,14
@@
DummyControlImpl::~DummyControlImpl()
{
}
{
}
-void DummyControlImpl::RegisterVisual( Property::Index index,
Actor placementActor,
Toolkit::Visual::Base visual )
+void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual )
{
{
- Control::RegisterVisual( index,
placementActor,
visual );
+ Control::RegisterVisual( index, visual );
}
}
-void DummyControlImpl::RegisterVisual( Property::Index index,
Actor placementActor,
Toolkit::Visual::Base visual, bool enabled )
+void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual, bool enabled )
{
{
- Control::RegisterVisual( index,
placementActor,
visual, enabled );
+ Control::RegisterVisual( index, visual, enabled );
}
void DummyControlImpl::UnregisterVisual( Property::Index index )
}
void DummyControlImpl::UnregisterVisual( Property::Index index )
@@
-104,11
+104,6
@@
bool DummyControlImpl::IsVisualEnabled( Property::Index index )
return Control::IsVisualEnabled( index );
}
return Control::IsVisualEnabled( index );
}
-Actor DummyControlImpl::GetPlacementActor( Property::Index index )
-{
- return Control::GetPlacementActor( index );
-}
-
Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition )
{
return Control::CreateTransition( transition );
Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition )
{
return Control::CreateTransition( transition );