X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=capi%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscroll-bar%2Fscroll-bar.h;h=d67b9c0094e93c20751709ac624a79c747a58355;hb=1866777184b30ae37eff224fac158220ccfb386d;hp=4e150cdfc92f98d9fbe2397b2fcb6cb3d1eec991;hpb=1f49cc894b0c8c769f4b34f3a0e7084ce686b664;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index 4e150cd..d67b9c0 100755 --- a/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -1,21 +1,22 @@ #ifndef __DALI_TOOLKIT_SCROLL_BAR_H__ #define __DALI_TOOLKIT_SCROLL_BAR_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // INTERNAL INCLUDES #include @@ -82,10 +83,11 @@ public: ScrollBar& operator=( const ScrollBar& scrollBar ); /** - * @brief Virtual destructor. - * Dali::Object derived classes typically do not contain member data. + * @brief Destructor + * + * This is non-virtual since derived Handle types must not contain data or virtual methods. */ - virtual ~ScrollBar(); + ~ScrollBar(); /** * @brief Create an initialized ScrollBar