X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.h;h=0538199b20cc5e651567bcedf7f086a4b1b9466e;hp=13d34a4abea5190e3e2319670d596bcb9b4ec5f1;hb=bbadd47482d25851dd26a0d2bf7d57c2a20a6fc9;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index 13d34a4..0538199 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@ -38,7 +38,7 @@ public:
 
   DummyControl();
   DummyControl(const DummyControl& control);
-  virtual ~DummyControl();
+  ~DummyControl();
 
   static DummyControl New( bool override = false );
 
@@ -47,14 +47,6 @@ public:
 
   DummyControl& operator=(const DummyControl& control);
 
-  // Used to test signal connections
-  void CustomSlot1( Actor actor, const Vector3& value );
-
-public:
-
-  bool mCustomSlot1Called;
-  Vector3 mCustomSlot1Value;
-
 public: // Not intended for application developers
 
   DummyControl( DummyControlImpl& implementation );
@@ -79,6 +71,11 @@ public:
   inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
   inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }
 
+  // Used to test signal connections
+  void CustomSlot1( Actor actor );
+
+  bool mCustomSlot1Called;
+
 protected:
 
   DummyControlImpl();
@@ -105,23 +102,24 @@ private:
 private: // From Internal::Control
 
   virtual void OnInitialize();
-  virtual void OnThemeChange( StyleManager styleManager );
-  virtual void OnFontChange(bool defaultFontChange, bool defaultFontSizeChange);
-  virtual void OnPinch(PinchGesture pinch);
-  virtual void OnPan(PanGesture pan);
-  virtual void OnTap(TapGesture tap);
-  virtual void OnLongPress(LongPressGesture longPress);
+  virtual bool OnAccessibilityActivated();
+  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
+  virtual void OnPinch(const PinchGesture& pinch);
+  virtual void OnPan(const PanGesture& pan);
+  virtual void OnTap(const TapGesture& tap);
+  virtual void OnLongPress(const LongPressGesture& longPress);
 
 private: // From CustomActorImpl
 
-  virtual void OnStageConnection();
+  virtual void OnStageConnection( int depth );
   virtual void OnStageDisconnection();
   virtual void OnChildAdd(Actor& child);
   virtual void OnChildRemove(Actor& child);
   virtual void OnSizeSet(const Vector3& targetSize);
   virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
   virtual bool OnTouchEvent(const TouchEvent& event);
-  virtual bool OnMouseWheelEvent(const MouseWheelEvent& event);
+  virtual bool OnHoverEvent(const HoverEvent& event);
+  virtual bool OnWheelEvent(const WheelEvent& event);
   virtual bool OnKeyEvent(const KeyEvent& event);
   virtual void OnKeyInputFocusGained();
   virtual void OnKeyInputFocusLost();
@@ -129,6 +127,7 @@ private: // From CustomActorImpl
 public:
 
   bool initializeCalled;
+  bool activatedCalled;
   bool themeChangeCalled;
   bool fontChangeCalled;
   bool pinchCalled;
@@ -142,7 +141,8 @@ public:
   bool sizeSetCalled;
   bool sizeAnimationCalled;
   bool touchEventCalled;
-  bool mouseWheelEventCalled;
+  bool hoverEventCalled;
+  bool wheelEventCalled;
   bool keyEventCalled;
   bool keyInputFocusGained;
   bool keyInputFocusLost;