X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=372cfdb883959db7f0738c980339b74598480d28;hp=3afa39786d0aeca3b53a6f34d6141259f3388772;hb=6e1c172b801e44992f243e9ebf908ce3beeb6e84;hpb=129430611d13fed94f333b0429af19cc61001eb1

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
old mode 100755
new mode 100644
index 3afa397..372cfdb
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -386,7 +386,7 @@ bool Control::OnAccessibilityPan(PanGesture gesture)
   return false; // Accessibility pan gesture is not handled by default
 }
 
-bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent)
+bool Control::OnAccessibilityTouch(const TouchData& touchData)
 {
   return false; // Accessibility touch event is not handled by default
 }
@@ -554,9 +554,9 @@ void Control::EmitKeyInputFocusSignal( bool focusGained )
   }
 }
 
-void Control::OnStageConnection( int depth )
+void Control::OnSceneConnection( int depth )
 {
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n",  mImpl->mVisuals.Size() );
+  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnSceneConnection number of registered visuals(%d)\n",  mImpl->mVisuals.Size() );
 
   Actor self( Self() );
 
@@ -565,22 +565,22 @@ void Control::OnStageConnection( int depth )
     // Check whether the visual is empty and enabled
     if( (*iter)->visual && (*iter)->enabled )
     {
-      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection Setting visual(%d) on stage\n", (*iter)->index );
-      Toolkit::GetImplementation((*iter)->visual).SetOnStage( self );
+      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnSceneConnection Setting visual(%d) on scene\n", (*iter)->index );
+      Toolkit::GetImplementation((*iter)->visual).SetOnScene( self );
     }
   }
 
   // The clipping renderer is only created if required.
   CreateClippingRenderer( *this );
 
-  // Request to be laid out when the control is connected to the Stage.
+  // Request to be laid out when the control is connected to the Scene.
   // Signal that a Relayout may be needed
 }
 
 
-void Control::OnStageDisconnection()
+void Control::OnSceneDisconnection()
 {
-  mImpl->OnStageDisconnection();
+  mImpl->OnSceneDisconnection();
 }
 
 void Control::OnKeyInputFocusGained()
@@ -604,7 +604,7 @@ void Control::OnChildRemove(Actor& child)
 void Control::OnPropertySet( Property::Index index, Property::Value propertyValue )
 {
   // If the clipping mode has been set, we may need to create a renderer.
-  // Only do this if we are already on-stage as the OnStageConnection will handle the off-stage clipping controls.
+  // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls.
   if( ( index == Actor::Property::CLIPPING_MODE ) && Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
   {
     // Note: This method will handle whether creation of the renderer is required.
@@ -627,11 +627,6 @@ void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
   // @todo size negotiate background to new size, animate as well?
 }
 
-bool Control::OnTouchEvent(const TouchEvent& event)
-{
-  return false; // Do not consume
-}
-
 bool Control::OnHoverEvent(const HoverEvent& event)
 {
   return false; // Do not consume