Move virtual destructor position to its original

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I0a42615395e88cc08c68b7447224b823e90ca66a

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 62d087b..be76939 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -61,6 +61,13 @@ namespace Internal
  */
 class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface
 {
  */
 class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface
 {

+protected:
+  /**
+   * @brief Virtual destructor.
+   * @SINCE_1_0.0
+   */
+  virtual ~Control();
+

 public:
 
   class Extension; ///< Forward declare future extension interface
 public:
 
   class Extension; ///< Forward declare future extension interface


@@ -514,12 +521,6 @@ protected: // Helpers for deriving classes
   Control( ControlBehaviour behaviourFlags );
 
   /**
   Control( ControlBehaviour behaviourFlags );
 
   /**

-   * @brief Virtual destructor.
-   * @SINCE_1_0.0
-   */
-  virtual ~Control();
-
-  /**

    * @brief Second phase initialization.
    * @SINCE_1_0.0
    */
    * @brief Second phase initialization.
    * @SINCE_1_0.0
    */

diff --git a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.cpp b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.cpp
index 5bab6a1..7d9695f 100644 (file)
--- a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.cpp
+++ b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.cpp
@@ -133,6 +133,16 @@ std::string KeyboardFocusManagerWrapper::GetDirectionName(  Toolkit::Control::Ke
       return "down";
       break;
     }
       return "down";
       break;
     }

+    case Dali::Toolkit::Control::KeyboardFocus::PAGE_UP:
+    {
+      return "pageUp";
+      break;
+    }
+    case Dali::Toolkit::Control::KeyboardFocus::PAGE_DOWN:
+    {
+      return "pageDown";
+      break;
+    }

   }
   return "unknown direction";
 }
   }
   return "unknown direction";
 }