uifw/AvKon/src/AknPreviewPopUp.cpp
branchRCL_3
changeset 15 08e69e956a8c
parent 10 9f56a4e1b8ab
child 18 0aa5fbdfbc30
--- a/uifw/AvKon/src/AknPreviewPopUp.cpp	Mon Mar 15 12:41:34 2010 +0200
+++ b/uifw/AvKon/src/AknPreviewPopUp.cpp	Wed Mar 31 21:59:52 2010 +0300
@@ -67,8 +67,7 @@
     : iContent( aContent ),
       iController( aController ),
       iFlags( aStyle ),
-      iAllowUpEvent(EFalse),
-      iIsDeleted(0)
+      iAllowUpEvent(EFalse)
     {
     GfxTransEffect::Register( this, KGfxPreviewPopupControlUid );
     }
@@ -81,12 +80,6 @@
     {
     AKNTASHOOK_REMOVE();
     
-    if( iIsDeleted )
-        {
-    	*iIsDeleted = ETrue ;
-        iIsDeleted = 0 ;
-        }
-
     GfxTransEffect::Deregister( this );
 
     if ( CapturesPointer() )
@@ -516,9 +509,6 @@
 //
 void CAknPreviewPopUp::HandlePointerEventL( const TPointerEvent& aPointerEvent )
     {
-	TBool isDelete = EFalse; 
-	iIsDeleted = &isDelete;
-	
     if ( AknLayoutUtils::PenEnabled() )
         {
         iCloseMenu = EFalse;
@@ -532,10 +522,6 @@
             {
             iAllowUpEvent = ETrue;
             CCoeControl::HandlePointerEventL( aPointerEvent );
-            if( isDelete )
-            	{
-            	return;
-            	}
             if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) && aPointerEvent.iType == TPointerEvent::EButton1Up && IsVisible() )
                 {
             	  // if pointer up is already redirected to the content, but the popup is still visible,
@@ -607,10 +593,6 @@
                     (aPointerEvent.iType == TPointerEvent::EButton1Up && iAllowUpEvent ) )
                     {
                     CCoeControl::HandlePointerEventL( aPointerEvent );
-                    if( isDelete )
-                    	{
-                    	return;
-                    	}
                     }
                 }
             else
@@ -619,10 +601,6 @@
                     aPointerEvent.iType == TPointerEvent::EButtonRepeat )
                     {
                     CCoeControl::HandlePointerEventL( aPointerEvent );
-                    if( isDelete )
-                    	{
-                    	return;
-                    	}
                     }
                 }
                 
@@ -632,8 +610,6 @@
             iAllowUpEvent = EFalse;
             }
         }
-    
-    iIsDeleted = 0;
     }
     
 // -----------------------------------------------------------------------------