diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp --- a/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Tue May 25 12:22:04 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamShootingModeContainer.cpp Wed Jun 09 09:21:41 2010 +0300 @@ -498,7 +498,7 @@ // TInt CCamShootingModeContainer::CountComponentControls() const { - return 1; + return CCamContainerBase::CountComponentControls() + 1; } // --------------------------------------------------------- @@ -506,9 +506,14 @@ // Returns the requested component control // --------------------------------------------------------- // -CCoeControl* CCamShootingModeContainer::ComponentControl( TInt /*aIndex*/ ) const +CCoeControl* CCamShootingModeContainer::ComponentControl( TInt aIndex ) const { - return iListBox; + CCoeControl* control = CCamContainerBase::ComponentControl( aIndex ); + if( control == NULL ) + { + control = iListBox; + } + return control; } // --------------------------------------------------------- @@ -587,7 +592,7 @@ if ( iController.UiConfigManagerPtr() && iController.UiConfigManagerPtr()->IsAutoFocusSupported() ) { - if( aType == EEventKeyDown && IsShutterKeyL( aKeyEvent, aType ) ) + if( aType == EEventKey && IsShutterKeyL( aKeyEvent, aType ) ) { TKeyResponse response = iListBox->OfferKeyEventL( aKeyEvent, aType ); if( UserSceneHighlighted() ) @@ -601,7 +606,7 @@ return response; } } - else if( aType == EEventKeyDown && IsCaptureKeyL( aKeyEvent, aType ) ) + else if( aType == EEventKey && IsCaptureKeyL( aKeyEvent, aType ) ) { TKeyResponse response = iListBox->OfferKeyEventL( aKeyEvent, aType ); if( UserSceneHighlighted() )