Remove dependency to std::vector and property::value from property notification API

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / navigation-frame / navigation-control.h

diff --git a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
index 7ebaf8d..00cab60 100644 (file)
--- a/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
+++ b/dali-toolkit/public-api/controls/navigation-frame/navigation-control.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_NAVIGATION_CONTROL_H__
 
 /*
- * 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.
@@ -19,6 +19,7 @@
  */
 
 // INTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-function.h>
 #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>
@@ -73,17 +74,17 @@ class NavigationControl;
  *                 | +-+        +-----+  +-----+        +-+ |
  *                 | +-+        +-----+  +-----+        +-+ |  tool bar
  *                 +----------------------------------------+
+ *
+ * Actions
+ * | %Action Name      | %NavigationControl method called |
+ * |-------------------|----------------------------------|
+ * | push              | %PushItem()                      |
+ * | pop               | %PopItem()                       |
  */
-
 class DALI_IMPORT_API NavigationControl : public Control
 {
 
 public:
-  //Action Names
-  static const char* const ACTION_PUSH;
-  static const char* const ACTION_POP;
-
-public:
 
   /**
    * Create a NavigationControl handle; this can be initialize with NavigationControl::New().