1.1 --- a/epoc32/include/mw/aknstyluspopupmenu.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/aknstyluspopupmenu.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  * All rights reserved.
     1.6  * This component and the accompanying materials are made available
     1.7 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +* under the terms of "Eclipse Public License v1.0"
     1.9  * which accompanies this distribution, and is available
    1.10 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  *
    1.13  * Initial Contributors:
    1.14  * Nokia Corporation - initial contribution.
    1.15 @@ -22,6 +22,7 @@
    1.16  
    1.17  #include <e32base.h>
    1.18  #include <coecobs.h> // MCoeControlObserver
    1.19 +#include <babitflags.h>
    1.20  
    1.21  class CAknPreviewPopUpController;
    1.22  class CAknStylusPopUpMenuContent;
    1.23 @@ -141,12 +142,21 @@
    1.24       * @param aPosType  Position type e.g. left-top corner or right-top corner  
    1.25       */
    1.26      IMPORT_C void SetPosition( const TPoint& aPoint, TPositionType aPosType );    
    1.27 -    
    1.28 +
    1.29      /**
    1.30       * Tells the popup menu to recalculate its position. This can be used e.g.
    1.31       * after layout transition.
    1.32       */
    1.33      void UpdatePosition();
    1.34 +
    1.35 +    /**
    1.36 +     * Removes all menu items.
    1.37 +     * 
    1.38 +     * @internal
    1.39 +     * @since s60 v5.2
    1.40 +     */
    1.41 +    void Clear();
    1.42 +
    1.43  // from base class CCoeControl
    1.44  
    1.45      /**
    1.46 @@ -167,12 +177,6 @@
    1.47      IMPORT_C void HandleControlEventL( CCoeControl* aControl,
    1.48                                         TCoeEvent aEventType );
    1.49  
    1.50 -public:
    1.51 -
    1.52 -    /**
    1.53 -     * Resets timer that hides popup.
    1.54 -     */
    1.55 -    void ResetTimer(); 
    1.56  
    1.57  private:
    1.58  
    1.59 @@ -193,6 +197,21 @@
    1.60       */
    1.61      void ConstructL();
    1.62  
    1.63 +    /**
    1.64 +     * Starts the CIdle
    1.65 +     */
    1.66 +    void StartControllerIdleL();
    1.67 +    
    1.68 +    /**
    1.69 +     * CIdle callback function 
    1.70 +     */
    1.71 +    static TInt ControllerCallBack( TAny* aThis );
    1.72 +    
    1.73 +    /**
    1.74 +     * Removes the controller
    1.75 +     */
    1.76 +    void RemoveController();
    1.77 +    
    1.78  private: // data
    1.79  
    1.80      /**
    1.81 @@ -227,6 +246,26 @@
    1.82       */
    1.83      CAknPreviewPopUpController* iPreviewPopup;
    1.84      
    1.85 +    /**
    1.86 +     * An idle time active object 
    1.87 +     * Own
    1.88 +     */
    1.89 +    CIdle* iControllerIdle;
    1.90 +    
    1.91 +    /**
    1.92 +     * Position type
    1.93 +     */
    1.94 +    TInt iPositionType;
    1.95 +
    1.96 +    /**
    1.97 +     * Internal flags.
    1.98 +     */
    1.99 +    TBitFlags iFlags;
   1.100 +    
   1.101 +    /**
   1.102 +     * Used to track if object has been deleted while calling client callback.
   1.103 +     */
   1.104 +    TBool* iIsDeleted;
   1.105      };
   1.106  
   1.107