Merge "Changes after TouchedSignal changes" into devel/master

[platform/core/uifw/dali-toolkit.git] / docs / content / programming-guide / creating-custom-controls.md

diff --git a/docs/content/programming-guide/creating-custom-controls.md b/docs/content/programming-guide/creating-custom-controls.md
index da7e857..d3f6302 100644 (file)
--- a/docs/content/programming-guide/creating-custom-controls.md
+++ b/docs/content/programming-guide/creating-custom-controls.md
@@ -187,7 +187,7 @@ ________________________________________________________________________________
 
 ### Touch, Hover & Wheel Events {#creating-controls-events}
 
-+ A **touch** is when any touch occurs within the bounds of the custom actor. Connect to Dali::Actor::TouchSignal().
++ A **touch event** is when any touch occurs within the bounds of the custom actor. Connect to Dali::Actor::TouchedSignal().
 + A **hover event** is when a pointer moves within the bounds of a custom actor (e.g. mouse pointer or hover pointer).
 + A **wheel event** is when the mouse wheel (or similar) is moved while hovering over an actor (via a mouse pointer or hover pointer).
  
@@ -387,29 +387,29 @@ Avoid adding or removing the child again within these methods.
  
 ___________________________________________________________________________________________________
 
-### Stage Connection {#creating-controls-stage}
+### Scene Connection {#creating-controls-scene}
 
-Methods are provided that can be overridden if notification is required when our control is connected to or disconnected from the stage.
+Methods are provided that can be overridden if notification is required when our control is connected to or disconnected from the scene.
 An up call to the Control class is necessary if these methods are overridden.
  
 ~~~{.cpp}
 // C++
-void Internal::MyUIControl::OnStageConnection( int depth )
+void Internal::MyUIControl::OnSceneConnection( int depth )
 {
-  // Do any other operations required upon stage connection
+  // Do any other operations required upon scene connection
 
   // Up call to Control at the end
-  Control::OnStageConnection( depth );
+  Control::OnSceneConnection( depth );
 }
 ~~~
 ~~~{.cpp}
 // C++
-void Internal::MyUIControl::OnStageDisconnection()
+void Internal::MyUIControl::OnSceneDisconnection()
 {
-  // Do any other operations required upon stage disconnection
+  // Do any other operations required upon scene disconnection
 
   // Up call to Control at the end
-  Control::OnStageDisconnection();
+  Control::OnSceneDisconnection();
 }
 ~~~