[dali_1.4.33] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-window.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 4c95ad7..f2fc19a 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -23,14 +23,16 @@
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
+#include <dali/integration-api/scene.h>
 
 namespace Dali
 {
 
 class Actor;
 class Layer;
-class KeyEvent;
+struct KeyEvent;
 class TouchData;
+struct WheelEvent;
 
 typedef Dali::Rect<int> PositionSize;
 
@@ -48,26 +50,35 @@ public:
 
   static Window New(PositionSize windowPosition, const std::string& name, bool isTransparent = false);
   static Window New(PositionSize windowPosition, const std::string& name, const std::string& className, bool isTransparent = false);
+
   Window();
   ~Window();
   Window(const Window& handle);
   Window& operator=(const Window& rhs);
   Layer GetRootLayer() const;
 
+  Integration::Scene GetScene();
+  Integration::RenderSurface& GetRenderSurface();
+
 public:
   explicit Window( Internal::Adaptor::Window* window );
 };
 
 namespace DevelWindow
 {
-
+typedef Signal< void () > EventProcessingFinishedSignalType;
 typedef Signal< void (const KeyEvent&) > KeyEventSignalType;
+typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
 typedef Signal< void (const TouchData&) > TouchSignalType;
+typedef Signal< void (const WheelEvent&) > WheelEventSignalType;
 
 Dali::Window Get( Actor actor );
+
+EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window );
 KeyEventSignalType& KeyEventSignal( Dali::Window window );
+KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
 TouchSignalType& TouchSignal( Dali::Window window );
-
+WheelEventSignalType& WheelEventSignal( Window window );
 }
 
 } // namespace Dali