diff -r c8caa15ef882 -r e6a66db4e9d0 XDMSettingsUI/src/XDMPluginContainer.cpp --- a/XDMSettingsUI/src/XDMPluginContainer.cpp Tue Feb 02 01:05:17 2010 +0200 +++ b/XDMSettingsUI/src/XDMPluginContainer.cpp Fri Mar 19 09:37:41 2010 +0200 @@ -102,9 +102,6 @@ SetRect( aRect ); ActivateL(); - iEikMenuBar = new ( ELeave ) CEikMenuBar(); - iEikMenuBar->ConstructL( this, NULL, R_GS_XDM_SETTINGS_MAIN_MENUBAR ); - #ifdef _DEBUG RDebug::Print( _L( "[CXDMPluginContainer] Construct done" ) ); #endif @@ -123,8 +120,6 @@ { delete iMainList; } - - delete iEikMenuBar; } // --------------------------------------------------------------------------- @@ -203,19 +198,16 @@ if (iMainList) { // if cancel key is pressed and list is not empty, invoke deletion - if ((aKeyEvent.iCode == EKeyBackspace ) && (aType == EEventKey) && - iEikMenuBar->ItemSpecificCommandsEnabled() ) + if ((aKeyEvent.iCode == EKeyBackspace ) && (aType == EEventKey) ) { if(!IsListEmpty()) DeleteSetProcedureL(); CXDMPlugin* iTempView = static_cast (iView); - iTempView->UpdateMskL(); + iTempView->UpdateMSK(); return EKeyWasConsumed; } else - { return iMainList->OfferKeyEventL (aKeyEvent, aType); - } } return EKeyWasNotConsumed; } @@ -228,7 +220,7 @@ { // if the Select Key has been pressed if ((aListBoxEvent == MEikListBoxObserver::EEventEnterKeyPressed) || - (aListBoxEvent == MEikListBoxObserver::EEventItemSingleClicked)) + (aListBoxEvent == MEikListBoxObserver::EEventItemDoubleClicked)) { EditCurrentItemL(); }