uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp
branchRCL_3
changeset 72 a5e7a4f63858
parent 64 85902f042028
--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp	Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp	Wed Oct 13 14:50:15 2010 +0300
@@ -426,7 +426,14 @@
     {
     if ( aControl && aEventType == EEventStateChanged )
         {
-        HidePreviewPopup();
+        if ( iPreviewPopup )
+            {
+            iPreviewPopup->HidePopUp();
+            }
+        if ( iController )
+            {
+            iController->HidePopUp();
+            }
 
         if ( iMenuObserver )
             {
@@ -456,14 +463,20 @@
         }
     else if ( aControl && aEventType == EEventRequestExit )
         {
-        HidePreviewPopup();
+        if ( iPreviewPopup )
+            {
+            iPreviewPopup->HidePopUp();
+            }
+
+        if ( iController )
+            {
+            iController->HidePopUp();
+            }      
 
         StartControllerIdleL();
         }
     else if ( aControl && aEventType == EEventRequestCancel )
         {
-        HidePreviewPopup();
-
         if ( iMenuObserver )
             {
             TBool isAlreadySet = iFlags.IsSet( EIdleDisabled );
@@ -506,20 +519,6 @@
         }
     }
 
-
-// ---------------------------------------------------------------------------
-// CAknStylusPopUpMenu::HideMenu
-// ---------------------------------------------------------------------------
-//
-void CAknStylusPopUpMenu::HideMenu()
-    {
-    if ( iController )
-        {
-        iController->HidePopUp();
-        }
-    }
-
-
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenu::StartControllerIdleL
 // -----------------------------------------------------------------------------
@@ -574,20 +573,3 @@
     {
     static_cast<CAknStylusPopUpMenu*>( aParam )->iIsDeleted = NULL;
     }
-
-// -----------------------------------------------------------------------------
-// Hide Preview Popups
-// -----------------------------------------------------------------------------
-//
-void CAknStylusPopUpMenu::HidePreviewPopup()
-    {
-    if ( iPreviewPopup )
-        {
-        iPreviewPopup->HidePopUp();
-        }
-
-    if ( iController )
-        {
-        iController->HidePopUp();
-        }
-    }