From 106dc963c1567df659b886271eec0735e90d63c8 Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Fri, 16 Dec 2016 14:42:45 +0900 Subject: [PATCH] Move virtual destructor position to its original Signed-off-by: suhyung Eom Change-Id: I0a42615395e88cc08c68b7447224b823e90ca66a --- dali-toolkit/public-api/controls/control-impl.h | 13 +++++++------ .../focus-manager/keyboard-focus-manager-wrapper.cpp | 10 ++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 62d087b..be76939 100644 --- 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 { +protected: + /** + * @brief Virtual destructor. + * @SINCE_1_0.0 + */ + virtual ~Control(); + public: class Extension; ///< Forward declare future extension interface @@ -514,12 +521,6 @@ protected: // Helpers for deriving classes Control( ControlBehaviour behaviourFlags ); /** - * @brief Virtual destructor. - * @SINCE_1_0.0 - */ - virtual ~Control(); - - /** * @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 --- 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; } + case Dali::Toolkit::Control::KeyboardFocus::PAGE_UP: + { + return "pageUp"; + break; + } + case Dali::Toolkit::Control::KeyboardFocus::PAGE_DOWN: + { + return "pageDown"; + break; + } } return "unknown direction"; } -- 2.7.4