--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Tue May 25 12:22:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp Wed Jun 09 09:21:41 2010 +0300
@@ -415,7 +415,7 @@
//
TInt CCamUserSceneSetupContainer::CountComponentControls() const
{
- return 1;
+ return CCamContainerBase::CountComponentControls() + 1;
}
// ---------------------------------------------------------
@@ -425,15 +425,21 @@
CCoeControl* CCamUserSceneSetupContainer::ComponentControl
( TInt aIndex ) const
{
+ CCoeControl* control = CCamContainerBase::ComponentControl( aIndex );
+ if( control )
+ return control;
switch( aIndex )
{
- case 0:
- return iUserSceneSetupList;
+ case 1:
+ {
+ control = iUserSceneSetupList;
+ }
+ break;
default:
- return NULL;
+ break;
}
- // Should never get here
+ return control;
}
// ---------------------------------------------------------------------------
@@ -445,7 +451,7 @@
const TKeyEvent& aKeyEvent,
TEventCode aType )
{
- if ( aType == EEventKeyDown &&
+ if ( aType == EEventKey &&
( aKeyEvent.iScanCode == EStdKeyEnter ||
aKeyEvent.iScanCode == EStdKeyNkpEnter ) )
{