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
(Automated Tests) Sync with core tests
[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
7e102f5
..
6fcc10d
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
@@
-56,6
+56,17
@@
void DummyControlImpl::CustomSlot1( Actor actor )
mCustomSlot1Called = true;
}
mCustomSlot1Called = true;
}
+namespace {
+
+BaseHandle Create()
+{
+ return DummyControlImpl::New();
+}
+
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::DummyControl, Toolkit::Control, Create );
+DALI_TYPE_REGISTRATION_END()
+}
+
DummyControl DummyControlImpl::New()
{
IntrusivePtr< DummyControlImpl > impl = new DummyControlImpl;
DummyControl DummyControlImpl::New()
{
IntrusivePtr< DummyControlImpl > impl = new DummyControlImpl;
@@
-70,19
+81,18
@@
DummyControlImpl::DummyControlImpl()
{
}
{
}
-
DummyControlImpl::~DummyControlImpl()
{
}
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 )
@@
-105,9
+115,9
@@
bool DummyControlImpl::IsVisualEnabled( Property::Index index )
return Control::IsVisualEnabled( index );
}
return Control::IsVisualEnabled( index );
}
-A
ctor DummyControlImpl::GetPlacementActor( Property::Index index
)
+A
nimation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition
)
{
{
- return Control::
GetPlacementActor( index
);
+ return Control::
CreateTransition( transition
);
}
DummyControl DummyControlImplOverride::New()
}
DummyControl DummyControlImplOverride::New()