[dali_1.0.7] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / scroll-bar / scroll-bar-impl.h

diff --git a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index fb6786c..dee5479 100755 (executable)
--- a/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/base/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -48,7 +48,7 @@ public:
   // Properties
   enum
   {
-    SCROLLBAR_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    SCROLLBAR_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
     SCROLLBAR_PROPERTY_END_INDEX = SCROLLBAR_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
@@ -78,21 +78,11 @@ public:
   void OnScrollConnectorSet( Toolkit::ScrollConnector connector );
 
   /**
-   * @copydoc Toolkit::ScrollBar::SetBackgroundImage()
-   */
-  void SetBackgroundImage( Image image, const Vector4& border );
-
-  /**
    * @copydoc Toolkit::ScrollBar::SetIndicatorImage()
    */
   void SetIndicatorImage( Image image );
 
   /**
-   * @copydoc Toolkit::ScrollBar::SetIndicatorImage()
-   */
-  void SetIndicatorImage( Image image, const Vector4& border );
-
-  /**
    * @copydoc Toolkit::ScrollBar::GetScrollIndicator()
    */
   Actor GetScrollIndicator();