X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscrollable.cpp;h=cbad7380ea3295c5e34d17f8ce6754ce08190286;hb=b3aff14cae6b3af637e75171422c16661878ba8e;hp=21f9615fcfb084d6b5e3b949b4a9afa9802c94f9;hpb=1b1e10a3f4e486553200d8ddeb57d953c2284579;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp index 21f9615..cbad738 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,11 +26,6 @@ namespace Dali namespace Toolkit { -const std::string Scrollable::SCROLL_RELATIVE_POSITION_PROPERTY_NAME( "scroll-relative-position" ); -const std::string Scrollable::SCROLL_POSITION_MIN_PROPERTY_NAME( "scroll-position-min" ); -const std::string Scrollable::SCROLL_POSITION_MAX_PROPERTY_NAME( "scroll-position-max" ); -const std::string Scrollable::SCROLL_DIRECTION_PROPERTY_NAME( "scroll-direction" ); - Scrollable::Scrollable() { } @@ -84,11 +79,6 @@ Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal() return GetImpl(*this).ScrollCompletedSignal(); } -Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal() -{ - return GetImpl(*this).ScrollClampedSignal(); -} - bool Scrollable::IsScrollComponentEnabled(Scrollable::ScrollComponentType indicator) const { return GetImpl(*this).IsScrollComponentEnabled(indicator);