rollback UnlockInputEvent

Change-Id: I9d1a934ef960997675bac5176e9c1b326fc26f86

diff --git a/src/ui/controls/FUiCtrl_ContextMenu.cpp b/src/ui/controls/FUiCtrl_ContextMenu.cpp
index 53f460c..7091652 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenu.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenu.cpp
@@ -1344,12 +1344,6 @@ _ContextMenu::OnOwnerChanged(_Control* pOldOwner)
 }
 
 void
-_ContextMenu::OnNativeWindowActivated(void)
-{
-       GetOwner()->UnlockInputEvent();
-}
-
-void
 _ContextMenu::OnTouchCaptureGained(void)
 {
        if (__style == CONTEXT_MENU_CORE_STYLE_LIST)

diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp
index 3983cc1..e955536 100644 (file)
--- a/src/ui/controls/FUiCtrl_OptionMenu.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp
@@ -1364,12 +1364,6 @@ _OptionMenu::OnOwnerChanged(_Control* pOldOwner)
        }
 }
 
-void
-_OptionMenu::OnNativeWindowActivated(void)
-{
-       GetOwner()->UnlockInputEvent();
-}
-
 _AccessibilityElement*
 _OptionMenu::GetAccessibilityElement(const int mainIndex) const
 {

diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
index 19a71ba..b9d3e06 100644 (file)
--- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp
+++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp
@@ -801,12 +801,6 @@ _ProgressPopup::OnBoundsChanged(void)
 }
 
 void
-_ProgressPopup::OnNativeWindowActivated(void)
-{
-       GetOwner()->UnlockInputEvent();
-}
-
-void
 _ProgressPopup::OnVisibleStateChanged(void)
 {
        _Window::OnVisibleStateChanged();

diff --git a/src/ui/inc/FUiCtrl_ContextMenu.h b/src/ui/inc/FUiCtrl_ContextMenu.h
index 5ed7f85..cf2f497 100644 (file)
--- a/src/ui/inc/FUiCtrl_ContextMenu.h
+++ b/src/ui/inc/FUiCtrl_ContextMenu.h
@@ -204,7 +204,6 @@ public:
        virtual void OnVisibleStateChanged(void);
        virtual void OnChangeLayout(_ControlRotation rotation);
        virtual void OnOwnerChanged(_Control* pOldOwner);
-       virtual void OnNativeWindowActivated(void);
        virtual void OnTouchCaptureGained(void);
        virtual void OnTouchCaptureLost(void);
 

diff --git a/src/ui/inc/FUiCtrl_OptionMenu.h b/src/ui/inc/FUiCtrl_OptionMenu.h
index 2938535..c32c22c 100644 (file)
--- a/src/ui/inc/FUiCtrl_OptionMenu.h
+++ b/src/ui/inc/FUiCtrl_OptionMenu.h
@@ -180,7 +180,6 @@ public:
 
        virtual void OnChangeLayout(_ControlRotation rotation);
        virtual void OnOwnerChanged(_Control* pOldOwner);
-       virtual void OnNativeWindowActivated(void);
        void OnActivated(void);
        void OnDeactivated(void);
 

diff --git a/src/ui/inc/FUiCtrl_ProgressPopup.h b/src/ui/inc/FUiCtrl_ProgressPopup.h
index 6c90bee..15b4843 100644 (file)
--- a/src/ui/inc/FUiCtrl_ProgressPopup.h
+++ b/src/ui/inc/FUiCtrl_ProgressPopup.h
@@ -82,7 +82,6 @@ public:
        virtual bool OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo);
 
        virtual void OnBoundsChanged(void);
-       virtual void OnNativeWindowActivated(void);
 
        // Touch Event Listener
        virtual bool OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo);