diff -r 53c8aa5d97a3 -r 8f559c47d7fd camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp --- a/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Tue May 25 12:22:04 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamInfoListBoxContainer.cpp Wed Jun 09 09:21:41 2010 +0300 @@ -312,7 +312,7 @@ // TInt CCamInfoListBoxContainer::CountComponentControls() const { - return 1; + return CCamContainerBase::CountComponentControls() + 1; } // --------------------------------------------------------- @@ -320,9 +320,14 @@ // Returns the requested component control // --------------------------------------------------------- // -CCoeControl* CCamInfoListBoxContainer::ComponentControl( TInt /*aIndex*/ ) const +CCoeControl* CCamInfoListBoxContainer::ComponentControl( TInt aIndex ) const { - return iListBox; + CCoeControl* control = CCamContainerBase::ComponentControl( aIndex ); + if( control == NULL) + { + control = iListBox; + } + return control; } // --------------------------------------------------------- @@ -411,7 +416,7 @@ // If the Ok button or shutter key is pressed, select the current item if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || - ( aType == EEventKeyDown && + ( aType == EEventKey && ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) { TKeyResponse response = iListBox->OfferKeyEventL( aKeyEvent, aType );