projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Enhance texteditor background drawing performance" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
index
e18809a
..
8bcb3c0
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
@@
-115,6
+115,11
@@
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSig
return mScene.WheelEventSignal();
}
return mScene.WheelEventSignal();
}
+Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+ return mScene.WheelEventGeneratedSignal();
+}
+
Integration::Scene SceneHolder::GetScene()
{
return mScene;
Integration::Scene SceneHolder::GetScene()
{
return mScene;
@@
-235,6
+240,11
@@
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
return GetImplementation( *this ).WheelEventSignal();
}
return GetImplementation( *this ).WheelEventSignal();
}
+SceneHolder::WheelEventGeneratedSignalType& SceneHolder::WheelEventGeneratedSignal()
+{
+ return GetImplementation( *this ).WheelEventGeneratedSignal();
+}
+
} // Integration
} // Dali
} // Integration
} // Dali