X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.h;h=872403322453ecfd4451692f863956c0ef6c9705;hb=1fe6286be11679b2f5c14a60636ae9cb486570e4;hp=ec7b893f52d91b4af4dbbfa74d17bd50bccef28b;hpb=ca99959003c0445d5afb437e2be26361dff51623;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index ec7b893..8724033 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -546,24 +546,24 @@ private: // private overridden functions from CustomActorImpl and Controls
   /**
    * @copydoc Dali::CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&)
    */
-  virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
+  void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override;
 
   /**
    * @copydoc CustomActorImpl::OnSizeSet(const Vector3&)
    */
-  virtual void OnSizeSet( const Vector3& size );
+  void OnSizeSet( const Vector3& size ) override;
 
   /**
    * From CustomActorImpl; called after a child has been added to the owning actor.
    * @param[in] child The child which has been added.
    */
-  virtual void OnChildAdd(Actor& child);
+  void OnChildAdd(Actor& child) override;
 
   /**
    * From CustomActorImpl; called shortly before a child is removed from the owning actor.
    * @param[in] child The child being removed.
    */
-  virtual void OnChildRemove(Actor& child);
+  void OnChildRemove(Actor& child) override;
 
   /**
    * Called after a wheelEvent is received by the owning actor.
@@ -576,27 +576,27 @@ private: // private overridden functions from CustomActorImpl and Controls
   /**
    * @copydoc Toolkit::Control::OnInitialize()
    */
-  virtual void OnInitialize();
+  void OnInitialize() override;
 
   /**
    * @copydoc CustomActorImpl::OnSceneConnection()
    */
-  virtual void OnSceneConnection( int depth );
+  void OnSceneConnection( int depth ) override;
 
   /**
    * @copydoc CustomActorImpl::OnSceneDisconnection()
    */
-  virtual void OnSceneDisconnection();
+  void OnSceneDisconnection() override;
 
   /**
    * @copydoc Toolkit::Control::OnAccessibilityPan()
    */
-  virtual bool OnAccessibilityPan(PanGesture gesture);
+  bool OnAccessibilityPan(PanGesture gesture) override;
 
   /**
    * @copydoc Toolkit::Scrollable::EnableScrollOvershoot()
    */
-  virtual void EnableScrollOvershoot(bool enable);
+  void EnableScrollOvershoot(bool enable) override;
 
 private:
 
@@ -801,6 +801,12 @@ private:
   void SetInternalConstraints();
 
 protected:
+  struct AccessibleImpl : public Scrollable::AccessibleImpl
+  {
+    using Scrollable::AccessibleImpl::AccessibleImpl;
+
+    void EnsureChildVisible(Actor child) override;
+  };
 
   /**
    * Construct a new ScrollView.
@@ -820,7 +826,7 @@ private:
    *
    * @param[in] child The actor to be unbound.
    */
-  virtual void FindAndUnbindActor(Actor child);
+  void FindAndUnbindActor(Actor child) override;
 
   /**
    * Gets position property.