equal
deleted
inserted
replaced
590 GfxTransEffect::Deregister( this ); |
590 GfxTransEffect::Deregister( this ); |
591 } |
591 } |
592 |
592 |
593 iEikonEnv->EikAppUi()->RemoveFromStack(this); |
593 iEikonEnv->EikAppUi()->RemoveFromStack(this); |
594 |
594 |
595 AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL ); |
595 TRAP_IGNORE(AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL )); |
596 |
596 |
597 if (iMenuBar) |
597 if (iMenuBar) |
598 { |
598 { |
599 iEikonEnv->EikAppUi()->RemoveFromStack(iMenuBar); |
599 iEikonEnv->EikAppUi()->RemoveFromStack(iMenuBar); |
600 delete iMenuBar; |
600 delete iMenuBar; |
919 else |
919 else |
920 { |
920 { |
921 iCba = CEikButtonGroupContainer::NewL( CEikButtonGroupContainer::ECba, |
921 iCba = CEikButtonGroupContainer::NewL( CEikButtonGroupContainer::ECba, |
922 CEikButtonGroupContainer::EHorizontal, |
922 CEikButtonGroupContainer::EHorizontal, |
923 this, resourceId, *this, CEikButtonGroupContainer::EIsEmbedded | |
923 this, resourceId, *this, CEikButtonGroupContainer::EIsEmbedded | |
924 CEikButtonGroupContainer::EAddToStack ); |
924 CEikButtonGroupContainer::EAddToStack | |
|
925 CEikButtonGroupContainer::EAlwaysShown ); |
925 } |
926 } |
926 |
927 |
927 iExtension->CreateBackgroundContextL(); |
928 iExtension->CreateBackgroundContextL(); |
928 |
929 |
929 if ( iExtension->iEmbeddedSoftkeys ) |
930 if ( iExtension->iEmbeddedSoftkeys ) |