X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ControlWrapper.cpp;h=e60505d9e79315d8acf7ac44df1d440ce919910d;hb=23ef2e29789ebe7ba3c6af903fb0f55c782e39cc;hp=120f6b0888f2770ea425486130bb09b885640080;hpb=3a149435d12d2c957b698eea779a80b71228b471;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 120f6b0..e60505d 100644 --- 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 OnStageConnection( int depth ) + virtual void OnSceneConnection( int depth ) { mDepth = depth; - Control::OnStageConnection(depth); + Control::OnSceneConnection(depth); } - virtual void OnStageDisconnection() + virtual void OnSceneDisconnection() { - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } virtual void OnChildAdd( Actor& child ) { @@ -127,7 +127,7 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper { Control::OnChildRemove(child); } - virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) + virtual void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) { Control::OnPropertySet(index, propertyValue); } @@ -141,10 +141,6 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper mTargetSize = targetSize; Control::OnSizeAnimation( animation, targetSize ); } - virtual bool OnTouchEvent( const TouchEvent& event ) - { - return true; - } virtual bool OnHoverEvent( const HoverEvent& event ) { return true;