X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fnavigation-frame%2Fnavigation-control.h;h=5b3fa6d2ed642a2befbeb70e4832e3252327e3b3;hb=42eeffaa69044c2236996eb543416486ae92335c;hp=6275e43e5dcce4d4c804b4e5754e6636d4b26652;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
index 6275e43..5b3fa6d 100644
--- a/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
+++ b/optional/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
@@ -1,31 +1,29 @@
 #ifndef __DALI_TOOLKIT_NAVIGATION_CONTROL_H__
 #define __DALI_TOOLKIT_NAVIGATION_CONTROL_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.
-//
-
-// EXTERNAL INCLUDES
-#include <boost/function.hpp>
+/*
+ * 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 <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/page.h>
 #include <dali-toolkit/public-api/controls/navigation-frame/navigation-bar-style.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 
 namespace Toolkit
@@ -77,7 +75,7 @@ class NavigationControl;
  *                 +----------------------------------------+
  */
 
-class NavigationControl : public Control
+class DALI_IMPORT_API NavigationControl : public Control
 {
 
 public:
@@ -104,9 +102,11 @@ public:
   NavigationControl& operator=( const NavigationControl& handle );
 
   /**
-   * virtual Destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~NavigationControl();
+  ~NavigationControl();
 
   /**
    * Create an initialized NavigationControl.
@@ -229,13 +229,13 @@ public: // Not intended for application developers
    * Creates a handle using the Toolkit::Internal implementation.
    * @param[in]  implementation  The Control implementation.
    */
-  NavigationControl( Internal::NavigationControl& implementation );
+  DALI_INTERNAL NavigationControl( Internal::NavigationControl& implementation );
 
   /**
    * Allows the creation of this Control from an Internal::CustomActor pointer.
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  NavigationControl( Dali::Internal::CustomActor* internal );
+  explicit DALI_INTERNAL NavigationControl( Dali::Internal::CustomActor* internal );
 
 }; // class NavigationControl