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
Merge "(Vector) Change event processing" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ControlWrapper.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
index
2b43a89
..
5390b5c
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
@@
-110,14
+110,14
@@
struct TestCustomControl : public Toolkit::Internal::ControlWrapper
virtual void OnInitialize( const char* name ) {}
// From Toolkit::Internal::ControlWrapper
virtual void OnInitialize( const char* name ) {}
// From Toolkit::Internal::ControlWrapper
- virtual void OnS
tag
eConnection( int depth )
+ virtual void OnS
cen
eConnection( int depth )
{
mDepth = depth;
{
mDepth = depth;
- Control::OnS
tag
eConnection(depth);
+ Control::OnS
cen
eConnection(depth);
}
}
- virtual void OnS
tag
eDisconnection()
+ virtual void OnS
cen
eDisconnection()
{
{
- Control::OnS
tag
eDisconnection();
+ Control::OnS
cen
eDisconnection();
}
virtual void OnChildAdd( Actor& child )
{
}
virtual void OnChildAdd( Actor& child )
{
@@
-141,10
+141,6
@@
struct TestCustomControl : public Toolkit::Internal::ControlWrapper
mTargetSize = targetSize;
Control::OnSizeAnimation( animation, targetSize );
}
mTargetSize = targetSize;
Control::OnSizeAnimation( animation, targetSize );
}
- virtual bool OnTouchEvent( const TouchEvent& event )
- {
- return true;
- }
virtual bool OnHoverEvent( const HoverEvent& event )
{
return true;
virtual bool OnHoverEvent( const HoverEvent& event )
{
return true;
@@
-425,7
+421,7
@@
int UtcDaliControlWrapperRegisterVisualToSelf(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- Test::ObjectDestructionTracker objectDestructionTracker;
+ Test::ObjectDestructionTracker objectDestructionTracker
( application.GetCore().GetObjectRegistry() )
;
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
@@
-461,7
+457,7
@@
int UtcDaliControlWrapperRegisterVisualWithDepthIndexToSelf(void)
{
ToolkitTestApplication application;
{
ToolkitTestApplication application;
- Test::ObjectDestructionTracker objectDestructionTracker;
+ Test::ObjectDestructionTracker objectDestructionTracker
( application.GetCore().GetObjectRegistry() )
;
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
@@
-749,7
+745,7
@@
int UtcDaliControlWrapperAnimateVisual(void)
tet_infoline("Test that the control wrapper's visuals can be animated by name when registered");
ToolkitTestApplication application;
tet_infoline("Test that the control wrapper's visuals can be animated by name when registered");
ToolkitTestApplication application;
- Test::ObjectDestructionTracker objectDestructionTracker;
+ Test::ObjectDestructionTracker objectDestructionTracker
( application.GetCore().GetObjectRegistry() )
;
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );
{
Impl::TestCustomControl* controlWrapperImpl = new ::Impl::TestCustomControl( Toolkit::Internal::ControlWrapper::CONTROL_BEHAVIOUR_DEFAULT );