Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master

[platform/core/uifw/dali-toolkit.git] / plugins / dali-sharp / sharp / internal / ScrollBar.cs

diff --git a/plugins/dali-sharp/sharp/internal/ScrollBar.cs b/plugins/dali-sharp/sharp/internal/ScrollBar.cs
index 28662d2..c12976d 100644 (file)
--- a/plugins/dali-sharp/sharp/internal/ScrollBar.cs
+++ b/plugins/dali-sharp/sharp/internal/ScrollBar.cs
@@ -256,18 +256,18 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs
     return ret;
   }
 
-  public void SetScrollPropertySource(Handle handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) {
-    NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Handle.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
+  public void SetScrollPropertySource(Animatable handle, int propertyScrollPosition, int propertyMinScrollPosition, int propertyMaxScrollPosition, int propertyScrollContentSize) {
+    NDalicPINVOKE.ScrollBar_SetScrollPropertySource(swigCPtr, Animatable.getCPtr(handle), propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public void SetScrollIndicator(Actor indicator) {
-    NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, Actor.getCPtr(indicator));
+  public void SetScrollIndicator(View indicator) {
+    NDalicPINVOKE.ScrollBar_SetScrollIndicator(swigCPtr, View.getCPtr(indicator));
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
 
-  public Actor GetScrollIndicator() {
-    Actor ret = new Actor(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
+  public View GetScrollIndicator() {
+    View ret = new View(NDalicPINVOKE.ScrollBar_GetScrollIndicator(swigCPtr), true);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
     return ret;
   }