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=0b257a1e6473af2feaa1bdeaefc1a4ab459f3cdc;hp=5d6623925c6ebd0b54a9fbaea97a3aa52cfa170e;hb=ca99959003c0445d5afb437e2be26361dff51623;hpb=ef15505c94dffeb0639c91d9d3cd374918c21c4f 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 5d66239..0b257a1 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 @@ -90,8 +90,8 @@ public: static DummyControl New(); public: - inline void EnableGestureDetection(Gesture::Type type) { Internal::Control::EnableGestureDetection(type); } - inline void DisableGestureDetection(Gesture::Type type) { Internal::Control::DisableGestureDetection(type); } + inline void EnableGestureDetection(GestureType::Value type) { Internal::Control::EnableGestureDetection(type); } + inline void DisableGestureDetection(GestureType::Value type) { Internal::Control::DisableGestureDetection(type); } inline PinchGestureDetector GetPinchGestureDetector() const { return Internal::Control::GetPinchGestureDetector(); } inline PanGestureDetector GetPanGestureDetector() const { return Internal::Control::GetPanGestureDetector(); } inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); } @@ -154,7 +154,6 @@ private: // From Internal::Control virtual void OnInitialize(); virtual bool OnAccessibilityActivated(); - virtual bool OnAccessibilityTouch( const TouchEvent& touch ); virtual bool OnAccessibilityValueChange( bool isIncrease ); virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); @@ -163,6 +162,7 @@ private: // From Internal::Control virtual void OnTap(const TapGesture& tap); virtual void OnLongPress(const LongPressGesture& longPress); virtual Vector3 GetNaturalSize(); + virtual bool OnKeyEvent(const KeyEvent& event); private: // From CustomActorImpl @@ -172,9 +172,6 @@ private: // From CustomActorImpl virtual void OnChildRemove(Actor& child); virtual void OnSizeSet(const Vector3& targetSize); virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); - virtual bool OnHoverEvent(const HoverEvent& event); - virtual bool OnWheelEvent(const WheelEvent& event); - virtual bool OnKeyEvent(const KeyEvent& event); virtual void OnKeyInputFocusGained(); virtual void OnKeyInputFocusLost(); virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); @@ -186,7 +183,6 @@ public: bool initializeCalled; bool activatedCalled; - bool onAccTouchedCalled; bool onAccValueChangeCalled; bool themeChangeCalled; bool fontChangeCalled;