diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mw/eikccpu.h --- a/epoc32/include/mw/eikccpu.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/mw/eikccpu.h Wed Mar 31 12:33:34 2010 +0100 @@ -2,9 +2,9 @@ * Copyright (c) 2002-2006 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available -* 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 +* under the terms of "Eclipse Public License v1.0" * which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html". +* at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: * Nokia Corporation - initial contribution. @@ -206,9 +206,10 @@ IMPORT_C void ProcessCommandL(TInt aCommandId); private: - void UpdateCBALabelsL(); - TBool UpdateCBALabelL(TInt aPosition, TInt aCommandId, TInt aTextResId); - void SetEmphasis(CCoeControl* aMenuControl,TBool aEmphasis); + void UpdateCBALabelsL(); + TBool UpdateCBALabelL(TInt aPosition, TInt aCommandId, TInt aTextResId); + void SetEmphasis(CCoeControl* aMenuControl,TBool aEmphasis); + void DeleteCBAL(); private: /** @@ -216,14 +217,16 @@ */ IMPORT_C void* ExtensionInterface( TUid aInterface ); private: - TBitFlags iFlags; - - // Owned - CEikButtonGroupContainer* iCba; + TBitFlags iFlags; + TBool isCbaEmded; + // Owned + CEikButtonGroupContainer* iCba; + // Not owned CEikMenuBar* iMenu; MEikCcpuEditor* iEditor; + CEikButtonGroupContainer* iDialogCba; }; #endif // EIKCCPU_H