X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ControlWrapper.cpp;h=5390b5c9bb76fd2ceeaa13a407dd90afcec53065;hp=120f6b0888f2770ea425486130bb09b885640080;hb=ef15505c94dffeb0639c91d9d3cd374918c21c4f;hpb=66ce47c95a809f1e6d7131c886d9de2ab5f306b6 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index 120f6b0..5390b5c 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 ) { @@ -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;