Changed to use SetFocusable() instead of SetActivationEnabled().

Change-Id: Iec721c4b514fa2769e712b94aa93a60fc3146b97
Signed-off-by: clone <ingyou.park@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ContextMenu.cpp b/src/ui/controls/FUiCtrl_ContextMenu.cpp
index a95f4f7..9eb07ce 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenu.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenu.cpp
@@ -133,13 +133,6 @@ _ContextMenu::~_ContextMenu(void)
        RemoveAllAccessibilityElement();
 }
 
-
-bool
-_ContextMenu::IsActivatedOnOpen(void) const
-{
-       return false;
-}
-
 _ContextMenu*
 _ContextMenu::CreateContextMenuN(const FloatPoint& point, enum ContextMenuCoreStyle style, enum ContextMenuCoreAlign contextMenuAlign)
 {
@@ -151,7 +144,7 @@ _ContextMenu::CreateContextMenuN(const FloatPoint& point, enum ContextMenuCoreSt
        r = pContextMenu->CreateRootVisualElement();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pContextMenu->SetActivationEnabled(false);
+       pContextMenu->SetFocusable(false);
 
        r = pContextMenu->Initialize();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to Initialize.", GetErrorMessage(r));

diff --git a/src/ui/inc/FUiCtrl_ContextMenu.h b/src/ui/inc/FUiCtrl_ContextMenu.h
index 7c6e9e9..da6bf96 100644 (file)
--- a/src/ui/inc/FUiCtrl_ContextMenu.h
+++ b/src/ui/inc/FUiCtrl_ContextMenu.h
@@ -203,7 +203,6 @@ public:
        virtual void OnChangeLayout(_ControlOrientation orientation);
        virtual void OnOwnerChanged(_Control* pOldOwner);
 
-       virtual bool IsActivatedOnOpen(void) const;
        Tizen::Ui::_AccessibilityElement* GetAccessibilityElement(const int mainIndex) const;
        void AddAccessibilityElement(const _AccessibilityElement& element);