--- a/uifw/AvKon/inc/akndiscreetpopupdrawer.h	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AvKon/inc/akndiscreetpopupdrawer.h	Wed Sep 01 12:16:19 2010 +0100
@@ -123,24 +123,12 @@
     TRect LayoutPopup();
 
     /**
-     * Provides popup bitmap.
-     * Does not transfer ownership.
-     *
-     * @param aSize Requested popup bitmap size.
-     * @return Popup bitmap.
+     * Draws popup to given graphics context.
+     * 
+     * @param aGc Graphics context.
+     * @param aRect Rectangle where popup is drawn to.
      */
-    CFbsBitmap* PopupBitmap( const TSize& aSize );
-
-    /**
-     * Provides transparent mask for a bitmap.
-     * Does not transfer ownership.
-     *
-     * @param aSize Bitmap size.
-     * @param aAlpha Alpha factor.
-     * @return Transparent mask.
-     */
-    CFbsBitmap* TransparentMask( const TSize& aSize, 
-                                 const TInt& aAlpha );
+    void Draw( CWindowGc& aGc, const TRect& aRect ) const;
 
 private:
 
@@ -162,25 +150,11 @@
                      const TInt& aMaskId );
 
     /**
-     * Creates popup bitmap.
-     *
-     * @param aRect Popup rect.
-     */
-    void CreatePopupBitmapL( const TRect& aRect );
-    
-    /**
-     * Creates transparent mask for popup bitmap.
-     *
-     * @param aRect Popup rect.
-     */
-    void CreateTransparentMaskL( const TRect& aRect );
-
-    /**
      * Draws the texts.
      *
-     * @param aGc Bitmap graphics context.
+     * @param aGc Graphics context.
      */
-    void DrawTexts( CFbsBitGc* aGc );
+    void DrawTexts( CWindowGc* aGc ) const;
 
     /**
      * Resolves popup layout type.
@@ -192,7 +166,7 @@
      *
      * @return Control eikon env.
      */
-    CEikonEnv* EikonEnv();
+    CEikonEnv* EikonEnv() const;
 
     /**
      * Returns ETrue if title text needs wrapping.
@@ -210,14 +184,14 @@
     /**
      * Draws aText to aGc (in bidi enabled text rect location).
      *
-     * @param aGc Bitmap graphics context.
+     * @param aGc Graphics context.
      * @param aTextData Text data.
      * @param aText Text to be drawn.
      */
-    static void DrawBidiEnabledText(
-            CFbsBitGc* aGc,
-            TAknDiscreetPopupTextData& aTextData,
-            const TDesC& aText );
+    void DrawBidiEnabledText(
+            CWindowGc* aGc,
+            const TAknDiscreetPopupTextData& aTextData,
+            const TDesC& aText ) const;
 
     /**
      * Creates icon of given parameters.
@@ -317,18 +291,6 @@
     CGulIcon* iIcon;
 
     /**
-     * Popup bitmap.
-     * Own.
-     */
-    mutable CFbsBitmap* iPopupBitmap;
-
-    /**
-     * Transparent mask for popup bitmap.
-     * Own.
-     */
-    mutable CFbsBitmap* iTransparentMask;
-
-    /**
      * Popup layout type.
      */
     TInt iPopupLayoutType;