Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / integration-api / scene-holder.cpp

diff --git a/dali/integration-api/scene-holder.cpp b/dali/integration-api/scene-holder.cpp
index ca5e4f4..7a232b9 100644 (file)
--- a/dali/integration-api/scene-holder.cpp
+++ b/dali/integration-api/scene-holder.cpp
@@ -83,6 +83,11 @@ Vector4 SceneHolder::GetBackgroundColor() const
   return GetImplementation(*this).GetBackgroundColor();
 }
 
+Any SceneHolder::GetNativeHandle() const
+{
+  return GetImplementation(*this).GetNativeHandle();
+}
+
 void SceneHolder::FeedTouchPoint( Dali::TouchPoint& point, int timeStamp )
 {
   Integration::Point convertedPoint( point );
@@ -101,6 +106,31 @@ void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent )
   GetImplementation(*this).FeedKeyEvent( convertedEvent );
 }
 
+SceneHolder SceneHolder::Get( Actor actor )
+{
+  return Internal::Adaptor::SceneHolder::Get( actor );
+}
+
+SceneHolder::KeyEventSignalType& SceneHolder::KeyEventSignal()
+{
+  return GetImplementation(*this).KeyEventSignal();
+}
+
+SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
+{
+  return GetImplementation(*this).KeyEventGeneratedSignal();
+}
+
+SceneHolder::TouchSignalType& SceneHolder::TouchSignal()
+{
+  return GetImplementation(*this).TouchSignal();
+}
+
+SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
+{
+  return GetImplementation(*this).WheelEventSignal();
+}
+
 }// Integration
 
 } // Dali