Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / scroll-component-impl.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
index 4e17af6..1543367 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_TOOLKIT_SCROLL_COMPONENT_IMPL_H__
 #define __DALI_TOOLKIT_SCROLL_COMPONENT_IMPL_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) 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.
+ * 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 <dali-toolkit/public-api/controls/scrollable/scroll-component.h>
@@ -37,7 +38,7 @@ typedef IntrusivePtr<ScrollComponentImpl> ScrollComponentPtr;
  * Base class for scroll component implementations.
  * Scroll-components such as scroll bars, indicators etc. are connected to scrollable containers via ScrollConnector.
  */
-class ScrollComponentImpl : public ControlImpl
+class DALI_IMPORT_API ScrollComponentImpl : public Internal::Control
 {
 public:
 
@@ -82,10 +83,10 @@ protected:
 private:
 
   // Undefined
-  ScrollComponentImpl(const ScrollComponentImpl&);
+  DALI_INTERNAL ScrollComponentImpl(const ScrollComponentImpl&);
 
   // Undefined
-  ScrollComponentImpl& operator=(const ScrollComponentImpl& rhs);
+  DALI_INTERNAL ScrollComponentImpl& operator=(const ScrollComponentImpl& rhs);
 
 protected: