1.1 --- a/epoc32/include/mw/eikcapc.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/eikcapc.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 1997-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 @@ -35,6 +35,7 @@
    1.16  #include <eikdpage.h>
    1.17  
    1.18  #include <AknControl.h>
    1.19 +#include <aknsconstants.h>
    1.20  
    1.21  class CEikImage ;
    1.22  class CEikDialogPage;
    1.23 @@ -308,6 +309,13 @@
    1.24       */
    1.25  	IMPORT_C void SetPointerEventObserver(MPointerEventObserver *aObserver);
    1.26  	MPointerEventObserver *PointerEventObserver() const;
    1.27 +	
    1.28 +    /** Sets the captionedcontrol to be currently focused or not.
    1.29 +     * @param aSelected whether captionedcontrol is focused
    1.30 +     * @param aRedraw whether redraw is needed or not
    1.31 +     */    
    1.32 +    void SetCurrent(TBool aSelected, TBool aRedraw );
    1.33 +    
    1.34  protected:
    1.35      TRect ViewRect() const;
    1.36      TRect EditRect() const;
    1.37 @@ -378,11 +386,11 @@
    1.38      void DoFormCaptionSettingsL(const TDesC& aText);
    1.39  private:
    1.40      static void FormLayoutControlBitmap(CEikImage* aBitmap, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines);
    1.41 -    static void FormLayoutControlEdwin(CEikEdwin* aEdwin, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused);
    1.42 -    static void FormLayoutControlLabel(CEikLabel* aSlider, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aLayoutWithBitmap, TBool aIsFocused, TInt aIconCount);
    1.43 -    static void FormLayoutControlMfne(CEikMfne* aMfne,  const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused );
    1.44 -    static void FormLayoutControlPopfield(CAknPopupField* aPopfield, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused);
    1.45 -    static void FormLayoutControlSecretEditor(CEikSecretEditor* aSecretEd, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused );
    1.46 +    void FormLayoutControlEdwin(CEikEdwin* aEdwin, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused);
    1.47 +    void FormLayoutControlLabel(CEikLabel* aSlider, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aLayoutWithBitmap, TBool aIsFocused, TInt aIconCount);
    1.48 +    void FormLayoutControlMfne(CEikMfne* aMfne,  const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused );
    1.49 +    void FormLayoutControlPopfield(CAknPopupField* aPopfield, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused);
    1.50 +    void FormLayoutControlSecretEditor(CEikSecretEditor* aSecretEd, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent, TBool aIsFocused );
    1.51      static void FormLayoutControlSlider(CAknSlider* aSlider, const TRect& aParent, TBool aIsEditable, TBool aSingleLayout, TInt aNumberOfLines, TBool aBitmapPresent);
    1.52      static void ConvertViewRectToEditRect(TRect& aRect);
    1.53      static void ConvertEditRectToViewRect(TRect& aRect);
    1.54 @@ -418,6 +426,14 @@
    1.55      void DrawAsFormInEditMode( const TRect& aRect ) const;
    1.56      void DrawAsFormInViewMode( const TRect& aRect ) const;
    1.57      void DrawAsFormUnFocusedLine( const TRect& aRect ) const;
    1.58 +    
    1.59 +    /**
    1.60 +     * Returns correct text color index.
    1.61 +     *
    1.62 +     * @since S60 5.2
    1.63 +     * @return Text color index.
    1.64 +     */
    1.65 +    TAknsQsnTextColorsIndex TextColorIndex() const;
    1.66  
    1.67  public:
    1.68      CCoeControl* iControl;