Revert "Defect fix SetFocusControl / Check window enable state"

This reverts commit 2c2ccbc4518f2c7a6f6a8cfefbfcb0b10ee473dc

Change-Id: I0accd42dc34812cfba2a66c3442f8df06472d6e7

diff --git a/src/ui/FUi_FocusManagerImpl.cpp b/src/ui/FUi_FocusManagerImpl.cpp
index 51d01f5..13f1ff1 100644 (file)
--- a/src/ui/FUi_FocusManagerImpl.cpp
+++ b/src/ui/FUi_FocusManagerImpl.cpp
@@ -262,11 +262,6 @@ void
 _FocusManagerImpl::StartFocusTraversal(_Control* pControl, FocusDirection focusDirection)
 {
        _Window* pTop = pControl->GetRootWindow();
-       bool isWindowEnabled = pTop->IsEnabled();
-       if (!isWindowEnabled)
-       {
-               return;
-       }
        if (pTop)
        {
                _Control* pFocusTraversalControl = pTop->GetFocusTraversalControl(pControl);

diff --git a/src/ui/controls/FUiCtrl_Frame.cpp b/src/ui/controls/FUiCtrl_Frame.cpp
index af15a84..89d7376 100644 (file)
--- a/src/ui/controls/FUiCtrl_Frame.cpp
+++ b/src/ui/controls/FUiCtrl_Frame.cpp
@@ -816,7 +816,6 @@ _Frame::SetFocusControl(const _Control* pControl , bool on)
        SysAssert(pControlMgr);
        _Form* pForm = null;
        _Form* pCurrentForm = GetCurrentForm();
-       _Frame* pFrame = null;
        const _Control* pTempControl = pControl;
        bool isCurrentForm = false;
 
@@ -826,15 +825,7 @@ _Frame::SetFocusControl(const _Control* pControl , bool on)
 
                if (pForm)
                {
-                       pFrame = dynamic_cast<_Frame*>(pForm->GetParent());
-                       if (pFrame)
-                       {
-                               break;
-                       }
-                       else
-                       {
-                               pTempControl = pTempControl->GetParent();
-                       }
+                       break;
                }
                else
                {
@@ -912,22 +903,13 @@ _Frame::SetFocusTraversalControl(_Control* pControl)
 {
        _Form* pForm = null;
        _Control* pTempControl = pControl;
-       _Frame* pFrame = null;
        while(pTempControl)
        {
                pForm = dynamic_cast<_Form*>(const_cast<_Control*>(pTempControl));
 
                if (pForm)
                {
-                       pFrame = dynamic_cast<_Frame*>(pForm->GetParent());
-                       if (pFrame)
-                       {
-                               break;
-                       }
-                       else
-                       {
-                               pTempControl = pTempControl->GetParent();
-                       }
+                       break;
                }
                else
                {